Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump slack-sdk from 3.26.2 to 3.27.1 in /tools/base #1134

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions source/common/http/conn_pool_grid.cc
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ void ConnectivityGrid::WrapperCallbacks::cancelAllPendingAttempts(

absl::optional<ConnectivityGrid::StreamCreationResult>
ConnectivityGrid::WrapperCallbacks::tryAnotherConnection() {
if (grid_.destroying_) {
return {};
}
absl::optional<PoolIterator> next_pool = grid_.nextPool(current_);
if (!next_pool.has_value()) {
// If there are no other pools to try, return an empty optional.
Expand Down Expand Up @@ -236,10 +239,10 @@ ConnectivityGrid::ConnectivityGrid(
ConnectivityGrid::~ConnectivityGrid() {
// Ignore idle callbacks while the pools are destroyed below.
destroying_ = true;
// Callbacks might have pending streams registered with the pools, so cancel and delete
// the callback before deleting the pools.
wrapped_callbacks_.clear();
// Make sure to clear the pools (which deletes all active connections, and
// signals callers) before deleting callbacks.
pools_.clear();
wrapped_callbacks_.clear();
}

void ConnectivityGrid::deleteIsPending() {
Expand Down
11 changes: 7 additions & 4 deletions tools/base/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,9 @@ google-apitools==0.5.32 \
google-auth[aiohttp]==2.27.0 \
--hash=sha256:8e4bad367015430ff253fe49d500fdc3396c1a434db5740828c728e45bcce245 \
--hash=sha256:e863a56ccc2d8efa83df7a80272601e43487fa9a728a376205c86c26aaefa821
# via gsutil
# via
# google-auth
# gsutil
google-reauth==0.1.1 \
--hash=sha256:cb39074488d74c8853074dde47368bbf8f739d4a4338b89aab696c895b6d8368 \
--hash=sha256:f9f6852a55c2c5453d581cd01f3d1278e86147c03d008409800390a834235892
Expand Down Expand Up @@ -1061,6 +1063,7 @@ pyjwt[crypto]==2.8.0 \
# via
# gidgethub
# pygithub
# pyjwt
pylsqpack==0.3.18 \
--hash=sha256:005ddce84bdcbf5c3cf99f764504208e1aa0a91a8331bf47108f2708f2a315e6 \
--hash=sha256:06e1bbe47514b83cd03158e5558ef8cc44f578169c1820098be9f3cc4137f16a \
Expand Down Expand Up @@ -1217,9 +1220,9 @@ six==1.16.0 \
# pyu2f
# sphinxcontrib-httpdomain
# thrift
slack-sdk==3.26.2 \
--hash=sha256:a10e8ee69ca17d274989d0c2bbecb875f19898da3052d8d57de0898a00b1ab52 \
--hash=sha256:bcdac5e688fa50e9357ecd00b803b6a8bad766aa614d35d8dc0636f40adc48bf
slack-sdk==3.27.1 \
--hash=sha256:85d86b34d807c26c8bb33c1569ec0985876f06ae4a2692afba765b7a5490d28c \
--hash=sha256:c108e509160cf1324c5c8b1f47ca52fb5e287021b8caf9f4ec78ad737ab7b1d9
# via -r requirements.in
smmap==5.0.1 \
--hash=sha256:dceeb6c0028fdb6734471eb07c0cd2aae706ccaecab45965ee83f11c8d3b1f62 \
Expand Down