Review fixes

ydb-platform · Jan 28, 2025 · c686e07 · c686e07
1 parent 44ea4ba
commit c686e07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 29 deletions.
diff --git a/cloud/blockstore/libs/storage/volume/model/helpers.cpp b/cloud/blockstore/libs/storage/volume/model/helpers.cpp
@@ -232,35 +232,26 @@ bool RowHasFreshDevices(
     return false;
 }
 
-void RemoveLaggingDevicesFromMeta(
+void UpdateLaggingDevicesAfterMetaUpdate(
     NProto::TVolumeMeta& meta,
-    const TVector<TString>& laggingDeviceIds)
+    const TVector<TString>& removedLaggingDeviceIds)
 {
-    auto& agents = *meta.MutableLaggingAgentsInfo()->MutableAgents();
-    for (auto& agent: agents) {
-        EraseIf(
-            *agent.MutableDevices(),
-            [&laggingDeviceIds](const NProto::TLaggingDevice& laggingDevice)
+    auto& laggingAgents = *meta.MutableLaggingAgentsInfo()->MutableAgents();
+    for (auto& agent: laggingAgents) {
+        const bool laggingDevicesWereRemoved = AllOf(
+            agent.GetDevices(),
+            [&removedLaggingDeviceIds](
+                const NProto::TLaggingDevice& laggingDevice)
             {
                 return !!FindPtr(
-                    laggingDeviceIds,
+                    removedLaggingDeviceIds,
                     laggingDevice.GetDeviceUUID());
             });
-    }
-    EraseIf(
-        agents,
-        [](const NProto::TLaggingAgent& laggingAgent)
-        { return laggingAgent.GetDevices().empty(); });
-    if (agents.empty()) {
-        meta.MutableLaggingAgentsInfo()->Clear();
-    }
-}
 
-void UpdateLaggingDevicesAfterMetaUpdate(NProto::TVolumeMeta& meta)
-{
-    auto& laggingAgents = *meta.MutableLaggingAgentsInfo()->MutableAgents();
-    for (auto& agent: laggingAgents) {
         agent.ClearDevices();
+        if (laggingDevicesWereRemoved) {
+            continue;
+        }
 
         auto replicaIndex = FindReplicaIndexByAgentId(meta, agent.GetAgentId());
         if (!replicaIndex) {

diff --git a/cloud/blockstore/libs/storage/volume/model/helpers.h b/cloud/blockstore/libs/storage/volume/model/helpers.h
@@ -30,10 +30,8 @@ namespace NCloud::NBlockStore::NStorage {
     const google::protobuf::RepeatedPtrField<NProto::TLaggingDevice>&
         alreadyLagging);
 
-void RemoveLaggingDevicesFromMeta(
+void UpdateLaggingDevicesAfterMetaUpdate(
     NProto::TVolumeMeta& meta,
-    const TVector<TString>& laggingDeviceIds);
-
-void UpdateLaggingDevicesAfterMetaUpdate(NProto::TVolumeMeta& meta);
+    const TVector<TString>& removedLaggingDeviceIds);
 
 }   // namespace NCloud::NBlockStore::NStorage
diff --git a/cloud/blockstore/libs/storage/volume/volume_actor_allocatedisk.cpp b/cloud/blockstore/libs/storage/volume/volume_actor_allocatedisk.cpp
@@ -159,8 +159,7 @@ NProto::TVolumeMeta CreateNewMeta(
     newMeta.SetIOMode(args.IOMode);
     newMeta.SetIOModeTs(args.IOModeTs.MicroSeconds());
     newMeta.SetMuteIOErrors(args.MuteIOErrors);
-    RemoveLaggingDevicesFromMeta(newMeta, args.RemovedLaggingDeviceIds);
-    UpdateLaggingDevicesAfterMetaUpdate(newMeta);
+    UpdateLaggingDevicesAfterMetaUpdate(newMeta, args.RemovedLaggingDeviceIds);
 
     return newMeta;
 }

diff --git a/cloud/blockstore/libs/storage/volume/volume_actor_updateconfig.cpp b/cloud/blockstore/libs/storage/volume/volume_actor_updateconfig.cpp
@@ -246,10 +246,9 @@ void TVolumeActor::FinishUpdateVolumeConfig(const TActorContext& ctx)
     if (State) {
         newMeta.MutableLaggingAgentsInfo()->CopyFrom(
             State->GetMeta().GetLaggingAgentsInfo());
-        RemoveLaggingDevicesFromMeta(
+        UpdateLaggingDevicesAfterMetaUpdate(
             newMeta,
             UnfinishedUpdateVolumeConfig.RemovedLaggingDeviceIds);
-        UpdateLaggingDevicesAfterMetaUpdate(newMeta);
     }
 
     UnfinishedUpdateVolumeConfig.Devices = {};