diff options
| author | alexvru <alexvru@ydb.tech> | 2023-03-28 10:35:30 +0300 |
|---|---|---|
| committer | alexvru <alexvru@ydb.tech> | 2023-03-28 10:35:30 +0300 |
| commit | a2f9b2f93862e68c7b57afc968ba8dd79f7b66d2 (patch) | |
| tree | 9463befaf93926a44dceca61f3b6492a5a2b3761 | |
| parent | 644c7dcd6b33f971c52f89782dcc1f791c1dc2d1 (diff) | |
| download | ydb-a2f9b2f93862e68c7b57afc968ba8dd79f7b66d2.tar.gz | |
Fix decommit initiation bug
| -rw-r--r-- | ydb/core/mind/bscontroller/register_node.cpp | 2 | ||||
| -rw-r--r-- | ydb/core/mind/bscontroller/virtual_group.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ydb/core/mind/bscontroller/register_node.cpp b/ydb/core/mind/bscontroller/register_node.cpp index 04c04afecad..c956e0e5222 100644 --- a/ydb/core/mind/bscontroller/register_node.cpp +++ b/ydb/core/mind/bscontroller/register_node.cpp @@ -176,7 +176,7 @@ public: updateIsSuccessful = false; auto& nodeInfo = Self->GetNode(nodeId); Self->EraseKnownDrivesOnDisconnected(&nodeInfo); - STLOG(PRI_ERROR, BS_CONTROLLER, BSCTXRN04, + STLOG(PRI_ERROR, BS_CONTROLLER, BSCTXRN00, "Error during UpdateDevicesInfo after receiving TEvControllerRegisterNode", (TExError, e.what())); } diff --git a/ydb/core/mind/bscontroller/virtual_group.cpp b/ydb/core/mind/bscontroller/virtual_group.cpp index 96a22c9b027..4d6ddc86e88 100644 --- a/ydb/core/mind/bscontroller/virtual_group.cpp +++ b/ydb/core/mind/bscontroller/virtual_group.cpp @@ -210,7 +210,7 @@ namespace NKikimr::NBsController { Callback(*group); group->CalculateGroupStatus(); TString error; - if (State->Changed() && !Self->CommitConfigUpdates(*State, false, false, false, txc, &error)) { + if (State->Changed() && !Self->CommitConfigUpdates(*State, true, true, true, txc, &error)) { STLOG(PRI_ERROR, BS_CONTROLLER, BSCVG08, "failed to commit update", (VirtualGroupId, Machine->GroupId), (Error, error)); State->Rollback(); @@ -513,8 +513,8 @@ namespace NKikimr::NBsController { State.emplace(*Self, Self->HostRecords, TActivationContext::Now()); Action(*State); TString error; - if (State->Changed() && !Self->CommitConfigUpdates(*State, false, false, false, txc, &error)) { - STLOG(PRI_INFO, BS_CONTROLLER, BSCVGxx, "failed to commit update", (Error, error)); + if (State->Changed() && !Self->CommitConfigUpdates(*State, true, true, true, txc, &error)) { + STLOG(PRI_INFO, BS_CONTROLLER, BSCVG09, "failed to commit update", (Error, error)); State->Rollback(); State.reset(); } @@ -540,7 +540,7 @@ namespace NKikimr::NBsController { group->Topology = std::make_shared<TBlobStorageGroupInfo::TTopology>(group->Topology->GType, 0, 0, 0); } - STLOG(PRI_INFO, BS_CONTROLLER, BSCVGxx, "decommission update processed", (Status, Status), + STLOG(PRI_INFO, BS_CONTROLLER, BSCVG10, "decommission update processed", (Status, Status), (ErrorReason, ErrorReason)); } @@ -560,7 +560,7 @@ namespace NKikimr::NBsController { } }; - STLOG(PRI_INFO, BS_CONTROLLER, BSCVGxx, "TEvControllerGroupDecommittedNotify received", (Msg, ev->Get()->Record)); + STLOG(PRI_INFO, BS_CONTROLLER, BSCVG11, "TEvControllerGroupDecommittedNotify received", (Msg, ev->Get()->Record)); Execute(new TTxDecommitGroup(this, ev)); } |