WIP-34-1-5

Author: Enjection

ydb/core/tx/datashard/datashard_ut_incremental_backup.cpp

@@ -3088,6 +3088,7 @@ Y_UNIT_TEST_SUITE(IncrementalBackup) {
             )", false);
 
         ExecSQL(server, edgeActor, R"(BACKUP `MyCollection`;)", false);
+        SimulateSleep(server, TDuration::Seconds(5));
 
         ExecSQL(server, edgeActor, R"(
             UPSERT INTO `/Root/Table` (key, value) VALUES

ydb/core/tx/schemeshard/schemeshard__operation_common_cdc_stream.cpp

@@ -115,7 +115,9 @@ TTableVersionContext BuildTableVersionContext(
 void SyncImplTableVersion(
     const TTableVersionContext& versionCtx,
     TTableInfo::TPtr& table,
-    TOperationContext& context)
+    TOperationId operationId,
+    TOperationContext& context,
+    NIceDb::TNiceDb& db)
 {
     Y_ABORT_UNLESS(context.SS->Tables.contains(versionCtx.GrandParentPathId));
     auto parentTable = context.SS->Tables.at(versionCtx.GrandParentPathId);
@@ -154,6 +156,20 @@ void SyncImplTableVersion(
                     << ", newImplVersion: " << table->AlterVersion
                     << ", at schemeshard: " << context.SS->SelfTabletId());
     }
+    
+    // Persist the updated version and notify datashards
+    context.SS->PersistTableAlterVersion(db, versionCtx.PathId, table);
+    if (context.SS->PathsById.contains(versionCtx.PathId)) {
+        auto implTablePath = context.SS->PathsById.at(versionCtx.PathId);
+        context.SS->ClearDescribePathCaches(implTablePath);
+        context.OnComplete.PublishToSchemeBoard(operationId, versionCtx.PathId);
+        
+        LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
+                    "Published schema update to SchemeBoard for index impl table"
+                    << ", implTablePathId: " << versionCtx.PathId
+                    << ", newVersion: " << table->AlterVersion
+                    << ", at schemeshard: " << context.SS->SelfTabletId());
+    }
 }
 
 void UpdateTableVersion(
@@ -181,7 +197,7 @@ void UpdateTableVersion(
                     << ", grandParentPathId: " << versionCtx.GrandParentPathId
                     << ", at schemeshard: " << context.SS->SelfTabletId());
 
-        SyncImplTableVersion(versionCtx, table, context);
+        SyncImplTableVersion(versionCtx, table, operationId, context, db);
 
         // Sync the index entity to match the impl table version
         ::NKikimr::NSchemeShard::NCdcStreamState::SyncIndexEntityVersion(versionCtx.ParentPathId, table->AlterVersion, operationId, context, db);
@@ -330,27 +346,11 @@ void SyncChildIndexes(
 
         NCdcStreamState::SyncIndexEntityVersion(childPathId, targetVersion, operationId, context, db);
 
-        // Also sync the index impl table
-        for (const auto& [implChildName, implChildPathId] : childPath->GetChildren()) {
-            auto implChildPath = context.SS->PathsById.at(implChildPathId);
-            if (implChildPath->IsTable() && context.SS->Tables.contains(implChildPathId)) {
-                auto implTable = context.SS->Tables.at(implChildPathId);
-                if (implTable->AlterVersion < targetVersion) {
-                    implTable->AlterVersion = targetVersion;
-                    context.SS->PersistTableAlterVersion(db, implChildPathId, implTable);
-                    context.SS->ClearDescribePathCaches(implChildPath);
-                    context.OnComplete.PublishToSchemeBoard(operationId, implChildPathId);
-                    
-                    LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
-                                "Synced index impl table version"
-                                << ", indexImplTablePathId: " << implChildPathId
-                                << ", indexPathId: " << childPathId
-                                << ", newVersion: " << targetVersion
-                                << ", at schemeshard: " << context.SS->SelfTabletId());
-                }
-            }
-        }
-
+        // NOTE: We intentionally do NOT sync the index impl table version here.
+        // Bumping AlterVersion without sending a TX_KIND_SCHEME transaction to datashards
+        // causes SCHEME_CHANGED errors because datashards still have the old version.
+        // The version should only be incremented when there's an actual schema change.
+        
         LOG_DEBUG_S(context.Ctx, NKikimrServices::FLAT_TX_SCHEMESHARD,
                     "Synced parent index version with parent table"
                     << ", parentTable: " << parentPath->Name