mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-28 04:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

s3: Don't rearm credential timers when credentials are not refreshed

Browse Source 
The update_credentials_and_rearm() may get "empty" credentials from
_creds_provider_chain.get_aws_credentials() -- it doesn't throw, but
returns default-initialized value. In that case the expires_at will be
set to time_point::min, and it's probably not a good idea to arm the
refresh timer and, even worse idea, to subtract 1h from it.

Fixes #29056

Signed-off-by: Pavel Emelyanov <xemul@scylladb.com>

Closes scylladb/scylladb#29057

(cherry picked from commit 961fc9e041)

Closes scylladb/scylladb#29158
This commit is contained in:
Pavel Emelyanov
2026-03-16 10:53:21 +03:00
committed by Avi Kivity
parent c93c037d39
commit c42799fb01
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/s3/client.cc
View File

@@ -161,8 +161,10 @@ shared_ptr<client> client::make(std::string ep, std::string region, std::string
future<> client::update_credentials_and_rearm() {
_credentials = co_await _creds_provider_chain.get_aws_credentials();
_creds_invalidation_timer.rearm(_credentials.expires_at);
_creds_update_timer.rearm(_credentials.expires_at - 1h);
if (_credentials) {
_creds_invalidation_timer.rearm(_credentials.expires_at);
_creds_update_timer.rearm(_credentials.expires_at - 1h);
}
}
future<> client::authorize(http::request& req) {