add precharge for compaction map loading (#2089)

ydb-platform · Sep 20, 2024 · 3a558c2 · 3a558c2
1 parent d91dbc7
commit 3a558c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/cloud/filestore/libs/storage/tablet/tablet_actor_loadstate.cpp b/cloud/filestore/libs/storage/tablet/tablet_actor_loadstate.cpp
@@ -446,7 +446,8 @@ bool TIndexTabletActor::PrepareTx_LoadCompactionMapChunk(
     bool ready = db.ReadCompactionMap(
         args.CompactionMap,
         args.FirstRangeId,
-        args.RangeCount);
+        args.RangeCount,
+        true);
 
     LOG_INFO_S(ctx, TFileStoreComponents::TABLET,
         LogTag << " Loading compaction map chunk "

diff --git a/cloud/filestore/libs/storage/tablet/tablet_database.cpp b/cloud/filestore/libs/storage/tablet/tablet_database.cpp
@@ -1683,16 +1683,21 @@ void TIndexTabletDatabase::WriteCompactionMap(
 bool TIndexTabletDatabase::ReadCompactionMap(
     TVector<TCompactionRangeInfo>& compactionMap)
 {
-    return ReadCompactionMap(compactionMap, 0, Max<ui32>());
+    return ReadCompactionMap(compactionMap, 0, Max<ui32>(), true);
 }
 
 bool TIndexTabletDatabase::ReadCompactionMap(
     TVector<TCompactionRangeInfo>& compactionMap,
     ui32 firstRangeId,
-    ui32 rangeCount)
+    ui32 rangeCount,
+    bool prechargeAll)
 {
     using TTable = TIndexTabletSchema::CompactionMap;
 
+    if (!firstRangeId && prechargeAll) {
+        Table<TTable>().Precharge();
+    }
+
     auto it = Table<TTable>()
         .GreaterOrEqual(firstRangeId)
         .Select();

diff --git a/cloud/filestore/libs/storage/tablet/tablet_database.h b/cloud/filestore/libs/storage/tablet/tablet_database.h
@@ -498,7 +498,8 @@ FILESTORE_FILESYSTEM_STATS(FILESTORE_DECLARE_STATS)
     bool ReadCompactionMap(
         TVector<TCompactionRangeInfo>& compactionMap,
         ui32 firstRangeId,
-        ui32 rangeCount);
+        ui32 rangeCount,
+        bool prechargeAll);
 
     //
     // OpLog

diff --git a/cloud/filestore/libs/storage/tablet/tablet_database_ut.cpp b/cloud/filestore/libs/storage/tablet/tablet_database_ut.cpp
@@ -419,19 +419,19 @@ Y_UNIT_TEST_SUITE(TIndexTabletDatabaseTest)
 
         executor.ReadTx([&] (TIndexTabletDatabase db) {
             TVector<TCompactionRangeInfo> chunk;
-            UNIT_ASSERT(db.ReadCompactionMap(chunk, 0, 5));
+            UNIT_ASSERT(db.ReadCompactionMap(chunk, 0, 5, true));
             UNIT_ASSERT_VALUES_EQUAL(toString(entries, 0, 5), toString(chunk));
 
             chunk.clear();
-            UNIT_ASSERT(db.ReadCompactionMap(chunk, 111, 5));
+            UNIT_ASSERT(db.ReadCompactionMap(chunk, 111, 5, true));
             UNIT_ASSERT_VALUES_EQUAL(toString(entries, 5, 5), toString(chunk));
 
             chunk.clear();
-            UNIT_ASSERT(db.ReadCompactionMap(chunk, 6002, 5));
+            UNIT_ASSERT(db.ReadCompactionMap(chunk, 6002, 5, true));
             UNIT_ASSERT_VALUES_EQUAL(toString(entries, 10, 5), toString(chunk));
 
             chunk.clear();
-            UNIT_ASSERT(db.ReadCompactionMap(chunk, 7001, 5));
+            UNIT_ASSERT(db.ReadCompactionMap(chunk, 7001, 5, true));
             UNIT_ASSERT_VALUES_EQUAL("", toString(chunk));
         });
 
@@ -446,7 +446,7 @@ Y_UNIT_TEST_SUITE(TIndexTabletDatabaseTest)
 
         executor.ReadTx([&] (TIndexTabletDatabase db) {
             TVector<TCompactionRangeInfo> chunk;
-            UNIT_ASSERT(db.ReadCompactionMap(chunk, 0, Max<ui32>()));
+            UNIT_ASSERT(db.ReadCompactionMap(chunk, 0, Max<ui32>(), true));
             UNIT_ASSERT_VALUES_EQUAL(
                 toString(entries, 0, Max<ui32>(), true),
                 toString(chunk));