Recover the Replicated Database forcefully after restoring database metadata in Keeper

tuanpach · tuanpach · commit 22dba5d08706 · 2025-08-21T04:45:06.000Z
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
@@ -1811,6 +1811,10 @@ void DatabaseReplicated::restoreDatabaseMetadataInKeeper(ContextPtr)
         LOG_DEBUG(log, "It seems that the metadata was restored previously: {}.", e.what());
     }
 
+    /// Force the database to recover to update the restored metadata
+    auto current_zookeeper = getContext()->getZooKeeper();
+    current_zookeeper->set(replica_path + "/digest", DatabaseReplicatedDDLWorker::FORCE_AUTO_RECOVERY_DIGEST);
+
     reinitializeDDLWorker();
 }
 
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -49,7 +49,6 @@ namespace FailPoints
     extern const char database_replicated_delay_entry_execution[];
 }
 
-static constexpr const char * FORCE_AUTO_RECOVERY_DIGEST = "42";
 
 DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_)
     : DDLWorker(
diff --git a/src/Databases/DatabaseReplicatedWorker.h b/src/Databases/DatabaseReplicatedWorker.h
@@ -42,6 +42,8 @@ class DatabaseReplicatedDDLWorker : public DDLWorker
 
     bool isUnsyncedAfterRecovery() const { return unsynced_after_recovery; }
 
+    static constexpr const char * FORCE_AUTO_RECOVERY_DIGEST = "42";
+
 private:
     bool initializeMainThread() override;
     void initializeReplication() override;

Original file line number	Diff line number	Diff line change
`@@ -1811,6 +1811,10 @@ void DatabaseReplicated::restoreDatabaseMetadataInKeeper(ContextPtr)`
`1811`	`1811`	`LOG_DEBUG(log, "It seems that the metadata was restored previously: {}.", e.what());`
`1812`	`1812`	`}`
`1813`	`1813`
	`1814`	`+ /// Force the database to recover to update the restored metadata`
	`1815`	`+ auto current_zookeeper = getContext()->getZooKeeper();`
	`1816`	`+ current_zookeeper->set(replica_path + "/digest", DatabaseReplicatedDDLWorker::FORCE_AUTO_RECOVERY_DIGEST);`
	`1817`	`+`
`1814`	`1818`	`reinitializeDDLWorker();`
`1815`	`1819`	`}`
`1816`	`1820`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ namespace FailPoints`
`49`	`49`	`extern const char database_replicated_delay_entry_execution[];`
`50`	`50`	`}`
`51`	`51`
`52`		`-static constexpr const char * FORCE_AUTO_RECOVERY_DIGEST = "42";`
`53`	`52`
`54`	`53`	`DatabaseReplicatedDDLWorker::DatabaseReplicatedDDLWorker(DatabaseReplicated * db, ContextPtr context_)`
`55`	`54`	`: DDLWorker(`