Skip to content

Commit 99de01f

Browse files
committed
Fixed BackoffTimeout_ overflow (#15874)
1 parent 931b6d2 commit 99de01f

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/api/protos/draft/fq.proto

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,16 @@ message ServiceAccountAuth {
431431
string id = 1 [(Ydb.length).le = 1024];
432432
}
433433

434+
message TokenAuth {
435+
string token = 1 [(Ydb.length).le = 1024, (Ydb.sensitive) = true];
436+
}
437+
434438
message IamAuth {
435439
oneof identity {
436440
CurrentIAMTokenAuth current_iam = 1;
437441
ServiceAccountAuth service_account = 2;
438442
NoneAuth none = 3;
443+
TokenAuth token = 4;
439444
}
440445
}
441446

src/api/protos/draft/ydb_maintenance.proto

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ message MaintenanceTaskResult {
182182
repeated ActionGroupStates action_group_states = 2;
183183
// Try again after this deadline. Specified if there are no performed actions.
184184
optional google.protobuf.Timestamp retry_after = 3;
185+
// The time when the mainteance task was created.
186+
google.protobuf.Timestamp create_time = 4;
187+
// The last time when the mainteance task was refreshed. Initially equals to create_time.
188+
google.protobuf.Timestamp last_refresh_time = 5;
185189
}
186190

187191
message MaintenanceTaskResponse {
@@ -197,6 +201,10 @@ message GetMaintenanceTaskRequest {
197201
message GetMaintenanceTaskResult {
198202
MaintenanceTaskOptions task_options = 1;
199203
repeated ActionGroupStates action_group_states = 2;
204+
// The time when the mainteance task was created.
205+
google.protobuf.Timestamp create_time = 3;
206+
// The last time when the mainteance task was refreshed. Initially equals to create_time.
207+
google.protobuf.Timestamp last_refresh_time = 4;
200208
}
201209

202210
message GetMaintenanceTaskResponse {

src/client/iam/common/iam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ class TGrpcIamCredentialsProvider : public ICredentialsProvider {
126126

127127
RequestInflight_ = false;
128128
sleepDuration = std::min(BackoffTimeout_, BACKOFF_MAX);
129-
BackoffTimeout_ *= 2;
129+
BackoffTimeout_ = std::min(BackoffTimeout_ * 2, BACKOFF_MAX);
130130
}
131131

132132
Sleep(sleepDuration);

0 commit comments

Comments
 (0)