merge to stable-23-3 (#878)

* issue-539: extract writedata actor into separate location + add TABLET_VERIFY for ReleaseCollectBarrier (#790) issue-539: extract writedata actor into separate location + add TABLET_VERIFY for ReleaseCollectBarrier * fix arcadia build: trailing EOL (#808) * issue-539: add tablet-side two-stage writes support for scaling throughput (#707) issue-539: add two-stage writes for scaling throughput * issue-539: add service-side two-stage writes support for scaling throughput (#807) issue-539: add service-side two-stage writes support * fix cmake build
ydb-platform · Apr 3, 2024 · d646bc7 · d646bc7
1 parent 5f33353
commit d646bc7
Show file tree

Hide file tree

Showing 54 changed files with 2,407 additions and 251 deletions.
diff --git a/cloud/filestore/config/storage.proto b/cloud/filestore/config/storage.proto
@@ -231,4 +231,16 @@ message TStorageConfig
     optional uint32 CleanupThresholdAverage = 342;
     // Enables the aforementioned threshold.
     optional bool NewCleanupEnabled = 343;
+
+    // Enables GenerateBlobIds + WriteBlob + AddData instead of WriteBlob
+    // for writing.
+    optional bool ThreeStageWriteEnabled = 344;
+
+    // When issuing blob ids, the tablet acquires a collect barrier. In order
+    // to release it in case of a client disconnect, this timeout is used.
+    optional uint32 GenerateBlobIdsReleaseCollectBarrierTimeout = 345;
+
+    // If ThreeStageWriteEnabled is true, writes that exceed this threshold
+    // will use the three-stage write path. Similar to WriteBlobThreshold
+    optional uint32 ThreeStageWriteThreshold = 346;
 }
diff --git a/cloud/filestore/libs/storage/api/service.h b/cloud/filestore/libs/storage/api/service.h
@@ -55,11 +55,11 @@ namespace NCloud::NFileStore::NStorage {
     xxx(ReleaseLock,                        __VA_ARGS__)                       \
     xxx(TestLock,                           __VA_ARGS__)                       \
                                                                                \
-    xxx(WriteData,                          __VA_ARGS__)                       \
     xxx(AllocateData,                       __VA_ARGS__)                       \
 // FILESTORE_SERVICE_REQUESTS_HANDLE
 
 #define FILESTORE_SERVICE_REQUESTS_NO_HANDLE(xxx, ...)                         \
+    xxx(WriteData,                          __VA_ARGS__)                       \
     xxx(ReadData,                           __VA_ARGS__)                       \
 // FILESTORE_SERVICE_REQUESTS_NO_HANDLE
 

diff --git a/cloud/filestore/libs/storage/api/tablet.h b/cloud/filestore/libs/storage/api/tablet.h
@@ -24,6 +24,8 @@ namespace NCloud::NFileStore::NStorage {
     xxx(ChangeStorageConfig,        __VA_ARGS__)                               \
     xxx(DescribeData,               __VA_ARGS__)                               \
     xxx(DescribeSessions,           __VA_ARGS__)                               \
+    xxx(GenerateBlobIds,            __VA_ARGS__)                               \
+    xxx(AddData,                    __VA_ARGS__)                               \
 // FILESTORE_TABLET_REQUESTS
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -65,6 +67,12 @@ struct TEvIndexTablet
         EvDescribeSessionsRequest = EvBegin + 17,
         EvDescribeSessionsResponse,
 
+        EvGenerateBlobIdsRequest = EvBegin + 19,
+        EvGenerateBlobIdsResponse,
+
+        EvAddDataRequest = EvBegin + 21,
+        EvAddDataResponse,
+
         EvEnd
     };
 

diff --git a/cloud/filestore/libs/storage/core/config.cpp b/cloud/filestore/libs/storage/core/config.cpp
@@ -139,11 +139,17 @@ namespace {
             NCloud::NProto::AUTHORIZATION_IGNORE                              )\
                                                                                \
     xxx(TwoStageReadEnabled,             bool,      false                     )\
+    xxx(ThreeStageWriteEnabled,          bool,      false                     )\
+    xxx(ThreeStageWriteThreshold,        ui32,      64_KB                     )\
     xxx(EntryTimeout,                    TDuration, TDuration::Zero()         )\
     xxx(NegativeEntryTimeout,            TDuration, TDuration::Zero()         )\
     xxx(AttrTimeout,                     TDuration, TDuration::Zero()         )\
     xxx(MaxOutOfOrderCompactionMapLoadRequestsInQueue,  ui32,      5          )\
     xxx(MaxBackpressureErrorsBeforeSuicide,             ui32,      1000       )\
+                                                                               \
+    xxx(GenerateBlobIdsReleaseCollectBarrierTimeout,                           \
+        TDuration,                                                             \
+        TDuration::Seconds(10)                                                )\
 // FILESTORE_STORAGE_CONFIG
 
 #define FILESTORE_DECLARE_CONFIG(name, type, value)                            \

diff --git a/cloud/filestore/libs/storage/core/config.h b/cloud/filestore/libs/storage/core/config.h
@@ -181,6 +181,8 @@ class TStorageConfig
     NCloud::NProto::EAuthorizationMode GetAuthorizationMode() const;
 
     bool GetTwoStageReadEnabled() const;
+    bool GetThreeStageWriteEnabled() const;
+    ui32 GetThreeStageWriteThreshold() const;
     TDuration GetEntryTimeout() const;
     TDuration GetNegativeEntryTimeout() const;
     TDuration GetAttrTimeout() const;
@@ -191,6 +193,8 @@ class TStorageConfig
 
     ui32 GetMaxBackpressureErrorsBeforeSuicide() const;
 
+    TDuration GetGenerateBlobIdsReleaseCollectBarrierTimeout() const;
+
     void Dump(IOutputStream& out) const;
     void DumpHtml(IOutputStream& out) const;
     void DumpOverridesHtml(IOutputStream& out) const;

diff --git a/cloud/filestore/libs/storage/service/CMakeLists.darwin-x86_64.txt b/cloud/filestore/libs/storage/service/CMakeLists.darwin-x86_64.txt
@@ -54,5 +54,6 @@ target_sources(filestore-libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
 )
diff --git a/cloud/filestore/libs/storage/service/CMakeLists.linux-aarch64.txt b/cloud/filestore/libs/storage/service/CMakeLists.linux-aarch64.txt
@@ -55,5 +55,6 @@ target_sources(filestore-libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
 )
diff --git a/cloud/filestore/libs/storage/service/CMakeLists.linux-x86_64.txt b/cloud/filestore/libs/storage/service/CMakeLists.linux-x86_64.txt
@@ -56,5 +56,6 @@ target_sources(filestore-libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_readdata.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
 )
diff --git a/cloud/filestore/libs/storage/service/CMakeLists.windows-x86_64.txt b/cloud/filestore/libs/storage/service/CMakeLists.windows-x86_64.txt
@@ -54,5 +54,6 @@ target_sources(filestore-libs-storage-service PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_pingsession.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_statfs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_update_stats.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_actor_writedata.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/service/service_state.cpp
 )