Skip to content

Commit 5740aa3

Browse files
authored
Fix BS_QUEUE death (merge from main #14081) (#14109)
1 parent 3eb61c8 commit 5740aa3

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ydb/core/blobstorage/backpressure/queue_backpressure_client.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,7 @@ class TVDiskBackpressureClientActor : public TActorBootstrapped<TVDiskBackpressu
462462
QLOG_NOTICE_S("BSQ96", "connection lost status# " << NKikimrProto::EReplyStatus_Name(status)
463463
<< " errorReason# " << errorReason << " timeout# " << timeout);
464464
ctx.Send(BlobStorageProxy, new TEvProxyQueueState(VDiskId, QueueId, false, false, nullptr));
465-
Queue.DrainQueue(status, TStringBuilder() << "BS_QUEUE: " << errorReason, ctx);
466-
DrainStatus(status, ctx);
467-
DrainAssimilate(status, errorReason, ctx);
465+
Drain(ctx, status, errorReason);
468466
break;
469467
}
470468
State = EState::INITIAL;
@@ -476,6 +474,12 @@ class TVDiskBackpressureClientActor : public TActorBootstrapped<TVDiskBackpressu
476474
}
477475
}
478476

477+
void Drain(const TActorContext& ctx, NKikimrProto::EReplyStatus status, const TString& errorReason) {
478+
Queue.DrainQueue(status, TStringBuilder() << "BS_QUEUE: " << errorReason, ctx);
479+
DrainStatus(status, ctx);
480+
DrainAssimilate(status, errorReason, ctx);
481+
}
482+
479483
void HandleConnected(TEvInterconnect::TEvNodeConnected::TPtr ev, const TActorContext& ctx) {
480484
if (ev->Get()->NodeId == RemoteVDisk.NodeId()) {
481485
Y_ABORT_UNLESS(!SessionId || SessionId == ev->Sender, "SessionId# %s Sender# %s", SessionId.ToString().data(),
@@ -789,6 +793,7 @@ class TVDiskBackpressureClientActor : public TActorBootstrapped<TVDiskBackpressu
789793
RegisterActorInUniversalScheduler(SelfId(), nullptr, ctx.ExecutorThread.ActorSystem);
790794
}
791795
Unsubscribe(RemoteVDisk.NodeId(), ctx);
796+
Drain(ctx, NKikimrProto::ERROR, "BS_QUEUE terminated");
792797
return TActor::Die(ctx);
793798
}
794799

0 commit comments

Comments
 (0)