WIP

Author: Enjection

ydb/core/tx/schemeshard/schemeshard__backup_collection_common.cpp

@@ -132,7 +132,12 @@ std::optional<THashMap<TString, THashSet<TString>>> GetBackupRequiredPaths(
 
     // Add index backup metadata directories if incremental backup is enabled
     bool incrBackupEnabled = bc->Description.HasIncrementalBackupConfig();
-    bool omitIndexes = incrBackupEnabled && bc->Description.GetIncrementalBackupConfig().GetOmitIndexes();
+    
+    // Check OmitIndexes from two possible locations:
+    // 1. Top-level OmitIndexes field (for full backups)
+    // 2. IncrementalBackupConfig.OmitIndexes (for incremental backups)
+    bool omitIndexes = bc->Description.GetOmitIndexes() || 
+                       (incrBackupEnabled && bc->Description.GetIncrementalBackupConfig().GetOmitIndexes());
 
     if (incrBackupEnabled && !omitIndexes) {
         for (const auto& item : bc->Description.GetExplicitEntryList().GetEntries()) {

ydb/core/tx/schemeshard/ut_base/ut_base.cpp

@@ -11924,9 +11924,12 @@ Y_UNIT_TEST_SUITE(TSchemeShardTest) {
 
         auto backupDirName = descr.GetChildren(0).GetName().c_str();
 
+        // When WithIncremental=true, __ydb_backup_meta directory is created for index backups
+        // So we expect 3 children: Table1, DirA, and __ydb_backup_meta
+        // When WithIncremental=false, we expect 2 children: Table1 and DirA
         TestDescribeResult(DescribePath(runtime, Sprintf("/MyRoot/.backups/collections/MyCollection1/%s", backupDirName)), {
             NLs::PathExist,
-            NLs::ChildrenCount(2),
+            NLs::ChildrenCount(WithIncremental ? 3 : 2),
             NLs::Finished,
         });