issue-2725: rename config flag

ydb-platform · Jan 23, 2025 · 69b4a20 · 69b4a20
1 parent 9874208
commit 69b4a20
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/cloud/blockstore/config/storage.proto b/cloud/blockstore/config/storage.proto
@@ -1103,5 +1103,5 @@ message TStorageServiceConfig
     optional uint32 ForcedCompactionRangeCountPerRun = 401;
 
     // Enabling direct sending AcquireDevices to disk agent.
-    optional bool UseDirectAcquireReleaseDevicesSending = 402;
+    optional bool NonReplicatedVolumeDirectAcquireEnabled = 402;
 }
diff --git a/cloud/blockstore/libs/storage/core/config.cpp b/cloud/blockstore/libs/storage/core/config.cpp
@@ -493,7 +493,7 @@ TDuration MSeconds(ui32 value)
     xxx(VolumeProxyCacheRetryDuration,             TDuration, Seconds(15)     )\
                                                                                \
     xxx(UseDirectCopyRange,                             bool,      false         )\
-    xxx(UseDirectAcquireReleaseDevicesSending,          bool,      false         )\
+    xxx(NonReplicatedVolumeDirectAcquireEnabled,        bool,      false         )\
     xxx(MaxShadowDiskFillBandwidth,                     ui32,      512           )\
     xxx(MaxShadowDiskFillIoDepth,                       ui32,      1             )\
     xxx(BackgroundOperationsTotalBandwidth,             ui32,      1024          )\

diff --git a/cloud/blockstore/libs/storage/core/config.h b/cloud/blockstore/libs/storage/core/config.h
@@ -572,7 +572,6 @@ class TStorageConfig
     TString GetCachedDiskAgentSessionsPath() const;
 
     bool GetUseDirectCopyRange() const;
-    [[nodiscard]] bool GetUseDirectAcquireReleaseDevicesSending() const;
     ui32 GetMaxShadowDiskFillBandwidth() const;
     ui32 GetMaxShadowDiskFillIoDepth() const;
     ui32 GetBackgroundOperationsTotalBandwidth() const;
@@ -630,6 +629,7 @@ class TStorageConfig
     GetEnableToChangeErrorStatesFromDiskRegistryMonpage() const;
 
     [[nodiscard]] bool GetCalculateSplittedUsedQuotaMetric() const;
+    [[nodiscard]] bool GetNonReplicatedVolumeDirectAcquireEnabled() const;
 };
 
 ui64 GetAllocationUnit(

diff --git a/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp b/cloud/blockstore/libs/storage/disk_registry/disk_registry_actor.cpp
@@ -930,7 +930,7 @@ void TDiskRegistryActor::SendCachedAcquireRequestsToAgent(
     const TActorContext& ctx,
     const NProto::TAgentConfig& config)
 {
-    if (Config->GetUseDirectAcquireReleaseDevicesSending()) {
+    if (Config->GetNonReplicatedVolumeDirectAcquireEnabled()) {
         return;
     }
     auto& acquireCacheByAgentId = State->GetAcquireCacheByAgentId();

diff --git a/cloud/blockstore/libs/storage/volume/volume_actor_addclient.cpp b/cloud/blockstore/libs/storage/volume/volume_actor_addclient.cpp
@@ -40,7 +40,7 @@ void TVolumeActor::AcquireDisk(
         "Acquiring disk " << State->GetDiskId()
     );
 
-    if (Config->GetUseDirectAcquireReleaseDevicesSending()) {
+    if (Config->GetNonReplicatedVolumeDirectAcquireEnabled()) {
         SendAcquireDevicesToAgents(
             std::move(clientId),
             accessMode,

diff --git a/cloud/blockstore/libs/storage/volume/volume_actor_removeclient.cpp b/cloud/blockstore/libs/storage/volume/volume_actor_removeclient.cpp
@@ -28,7 +28,7 @@ void TVolumeActor::ReleaseDisk(const TActorContext& ctx, const TString& clientId
     request->Record.SetDiskId(State->GetDiskId());
     request->Record.MutableHeaders()->SetClientId(clientId);
     request->Record.SetVolumeGeneration(Executor()->Generation());
-    if (Config->GetUseDirectAcquireReleaseDevicesSending()) {
+    if (Config->GetNonReplicatedVolumeDirectAcquireEnabled()) {
         SendReleaseDevicesToAgents(clientId, ctx);
         return;
     }

diff --git a/cloud/blockstore/libs/storage/volume/volume_ut_session.cpp b/cloud/blockstore/libs/storage/volume/volume_ut_session.cpp
@@ -27,7 +27,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
         auto runtime = PrepareTestActorRuntime(config, state);
@@ -115,7 +115,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
         auto runtime = PrepareTestActorRuntime(config, state);
@@ -195,7 +195,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
         auto runtime = PrepareTestActorRuntime(config, state);
@@ -329,7 +329,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetAgentRequestTimeout(TDuration::Seconds(1).MilliSeconds());
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
@@ -378,7 +378,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetAgentRequestTimeout(TDuration::Seconds(2).MilliSeconds());
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
@@ -437,7 +437,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetAgentRequestTimeout(TDuration::Seconds(2).MilliSeconds());
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();
@@ -503,7 +503,7 @@ Y_UNIT_TEST_SUITE(TVolumeTest)
     {
         NProto::TStorageServiceConfig config;
         config.SetAcquireNonReplicatedDevices(true);
-        config.SetUseDirectAcquireReleaseDevicesSending(true);
+        config.SetNonReplicatedVolumeDirectAcquireEnabled(true);
         config.SetAgentRequestTimeout(TDuration::Seconds(2).MilliSeconds());
         config.SetClientRemountPeriod(2000);
         auto state = MakeIntrusive<TDiskRegistryState>();