issue-2376: implement special switches to disable TwoStageReads and T…

…hreeStageWrites for hdd fs (#2377) * issue-2376: implement special switches to disable TwoStageReads and ThreeStageWrites for hdd fs * update * update
ydb-platform · Oct 30, 2024 · 19f3351 · 19f3351
1 parent 6488b71
commit 19f3351
Show file tree

Hide file tree

Showing 9 changed files with 239 additions and 21 deletions.
diff --git a/cloud/filestore/config/storage.proto b/cloud/filestore/config/storage.proto
@@ -450,4 +450,10 @@ message TStorageConfig
     // rewriting the data belonging to this range.
     optional uint32 CompactRangeGarbagePercentageThreshold = 401;
     optional uint32 CompactRangeAverageBlobSizeThreshold = 402;
+
+    // Disables ThreeStageWrite for HDD filesystems.
+    optional bool ThreeStageWriteDisabledForHDD = 403;
+
+    // Disables TwoStageRead for HDD filesystems.
+    optional bool TwoStageReadDisabledForHDD = 404;
 }
diff --git a/cloud/filestore/libs/storage/core/config.cpp b/cloud/filestore/libs/storage/core/config.cpp
@@ -160,8 +160,10 @@ using TAliases = NProto::TStorageConfig::TFilestoreAliases;
             NCloud::NProto::AUTHORIZATION_IGNORE                              )\
                                                                                \
     xxx(TwoStageReadEnabled,             bool,      false                     )\
+    xxx(TwoStageReadDisabledForHDD,      bool,      false                     )\
     xxx(ThreeStageWriteEnabled,          bool,      false                     )\
     xxx(ThreeStageWriteThreshold,        ui32,      64_KB                     )\
+    xxx(ThreeStageWriteDisabledForHDD,   bool,      false                     )\
     xxx(UnalignedThreeStageWriteEnabled, bool,      false                     )\
     xxx(ReadAheadCacheMaxNodes,                 ui32,       1024              )\
     xxx(ReadAheadCacheMaxResultsPerNode,        ui32,       32                )\

diff --git a/cloud/filestore/libs/storage/core/config.h b/cloud/filestore/libs/storage/core/config.h
@@ -283,6 +283,9 @@ class TStorageConfig
     TVector<TString> GetDestroyFilestoreDenyList() const;
 
     bool GetSSProxyFallbackMode() const;
+
+    bool GetTwoStageReadDisabledForHDD() const;
+    bool GetThreeStageWriteDisabledForHDD() const;
 };
 
 }   // namespace NCloud::NFileStore::NStorage
diff --git a/cloud/filestore/libs/storage/service/service_actor_readdata.cpp b/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
@@ -23,6 +23,17 @@ namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+bool IsTwoStageReadEnabled(const NProto::TFileStore& fs)
+{
+    const auto isHdd = fs.GetStorageMediaKind() == NProto::STORAGE_MEDIA_HYBRID
+        || fs.GetStorageMediaKind() == NProto::STORAGE_MEDIA_HDD;
+    const auto disabledAsHdd = isHdd &&
+        fs.GetFeatures().GetTwoStageReadDisabledForHDD();
+    return !disabledAsHdd && fs.GetFeatures().GetTwoStageReadEnabled();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 class TReadDataActor final: public TActorBootstrapped<TReadDataActor>
 {
 private:
@@ -647,7 +658,7 @@ void TStorageServiceActor::HandleReadData(
         msg->Record.SetFileSystemId(fsId);
     }
 
-    if (!filestore.GetFeatures().GetTwoStageReadEnabled()) {
+    if (!IsTwoStageReadEnabled(filestore)) {
         // If two-stage read is disabled, forward the request to the tablet in
         // the same way as all other requests.
         ForwardRequest<TEvService::TReadDataMethod>(ctx, ev);

diff --git a/cloud/filestore/libs/storage/service/service_actor_writedata.cpp b/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
@@ -24,6 +24,17 @@ namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 
+bool IsThreeStageWriteEnabled(const NProto::TFileStore& fs)
+{
+    const auto isHdd = fs.GetStorageMediaKind() == NProto::STORAGE_MEDIA_HYBRID
+        || fs.GetStorageMediaKind() == NProto::STORAGE_MEDIA_HDD;
+    const auto disabledAsHdd = isHdd &&
+        fs.GetFeatures().GetThreeStageWriteDisabledForHDD();
+    return !disabledAsHdd && fs.GetFeatures().GetThreeStageWriteEnabled();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
 class TWriteDataActor final: public TActorBootstrapped<TWriteDataActor>
 {
 private:
@@ -478,7 +489,9 @@ void TStorageServiceActor::HandleWriteData(
         msg->Record.SetFileSystemId(fsId);
     }
 
-    if (!filestore.GetFeatures().GetThreeStageWriteEnabled()) {
+    const auto threeStageWriteAllowed = IsThreeStageWriteEnabled(filestore);
+
+    if (!threeStageWriteAllowed) {
         // If three-stage write is disabled, forward the request to the tablet
         // in the same way as all other requests.
         ForwardRequest<TEvService::TWriteDataMethod>(ctx, ev);
@@ -493,7 +506,7 @@ void TStorageServiceActor::HandleWriteData(
         blockSize);
     const bool threeStageWriteEnabled =
         range.Length >= filestore.GetFeatures().GetThreeStageWriteThreshold()
-        && filestore.GetFeatures().GetThreeStageWriteEnabled()
+        && threeStageWriteAllowed
         && (range.IsAligned()
                 || StorageConfig->GetUnalignedThreeStageWriteEnabled());
     if (threeStageWriteEnabled) {