Add tombstone timestamp to logging

pingcap · Oct 25, 2023 · ac486b8 · ac486b8
1 parent a7a5ec7
commit ac486b8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/dbms/src/Debug/dbgFuncSchema.cpp b/dbms/src/Debug/dbgFuncSchema.cpp
@@ -213,7 +213,7 @@ void dbgFuncIsTombstone(Context & context, const ASTs & args, DBGInvoker::Printe
         if (!tiflash_db)
             throw Exception(database_name + " is not DatabaseTiFlash", ErrorCodes::BAD_ARGUMENTS);
 
-        fmt_buf.append((tiflash_db->getTombstone() != 0 ? "true" : "false"));
+        fmt_buf.append((tiflash_db->isTombstone() ? "true" : "false"));
     }
     else if (args.size() == 2)
     {
@@ -225,7 +225,7 @@ void dbgFuncIsTombstone(Context & context, const ASTs & args, DBGInvoker::Printe
         if (!managed_storage)
             throw Exception(database_name + "." + table_name + " is not ManageableStorage", ErrorCodes::BAD_ARGUMENTS);
 
-        fmt_buf.append((managed_storage->getTombstone() != 0 ? "true" : "false"));
+        fmt_buf.append((managed_storage->isTombstone() ? "true" : "false"));
     }
     output(fmt_buf.toString());
 }

diff --git a/dbms/src/TiDB/Schema/SchemaSyncService.cpp b/dbms/src/TiDB/Schema/SchemaSyncService.cpp
@@ -161,10 +161,10 @@ bool SchemaSyncService::syncSchemas(KeyspaceID keyspace_id)
 }
 
 template <typename DatabaseOrTablePtr>
-inline bool isSafeForGC(const DatabaseOrTablePtr & ptr, Timestamp gc_safe_point)
+inline std::tuple<bool, Timestamp> isSafeForGC(const DatabaseOrTablePtr & ptr, Timestamp gc_safepoint)
 {
     const auto tombstone_ts = ptr->getTombstone();
-    return tombstone_ts != 0 && tombstone_ts < gc_safe_point;
+    return {tombstone_ts != 0 && tombstone_ts < gc_safepoint, tombstone_ts};
 }
 
 Timestamp SchemaSyncService::lastGcSafePoint(KeyspaceID keyspace_id) const
@@ -210,11 +210,21 @@ bool SchemaSyncService::gc(Timestamp gc_safepoint, KeyspaceID keyspace_id)
             if (!managed_storage)
                 continue;
 
-            if (isSafeForGC(db, gc_safepoint) || isSafeForGC(managed_storage, gc_safepoint))
+            const auto & [database_is_stale, db_tombstone] = isSafeForGC(db, gc_safepoint);
+            const auto & [table_is_stale, table_tombstone] = isSafeForGC(managed_storage, gc_safepoint);
+            if (database_is_stale || table_is_stale)
             {
                 // Only keep a weak_ptr on storage so that the memory can be free as soon as
                 // it is dropped.
                 storages_to_gc.emplace_back(std::weak_ptr<IManageableStorage>(managed_storage));
+                LOG_INFO(
+                    log,
+                    "Detect stale table, database_name={} table_name={} database_tombstone={} table_tombstone={} "
+                    "gc_safepoint={}",
+                    managed_storage->getDatabaseName(),
+                    managed_storage->getTableName(),
+                    db_tombstone,
+                    table_tombstone);
             }
         }
     }
@@ -248,7 +258,11 @@ bool SchemaSyncService::gc(Timestamp gc_safepoint, KeyspaceID keyspace_id)
                                SchemaNameMapper().debugTableName(table_info),
                                table_info.id);
         }();
-        LOG_INFO(keyspace_log, "Physically dropping table {}", canonical_name);
+        LOG_INFO(
+            keyspace_log,
+            "Physically dropping table, table_tombstone={} {}",
+            storage->getTombstone(),
+            canonical_name);
         auto drop_query = std::make_shared<ASTDropQuery>();
         drop_query->database = std::move(database_name);
         drop_query->table = std::move(table_name);
@@ -280,7 +294,10 @@ bool SchemaSyncService::gc(Timestamp gc_safepoint, KeyspaceID keyspace_id)
     {
         const auto & db = iter.second;
         auto ks_db_id = SchemaNameMapper::getMappedNameKeyspaceID(iter.first);
-        if (!isSafeForGC(db, gc_safepoint) || ks_db_id != keyspace_id)
+        if (ks_db_id != keyspace_id)
+            continue;
+        const auto & [db_is_stale, db_tombstone] = isSafeForGC(db, gc_safepoint);
+        if (!db_is_stale)
             continue;
 
         const auto & db_name = iter.first;
@@ -299,7 +316,7 @@ bool SchemaSyncService::gc(Timestamp gc_safepoint, KeyspaceID keyspace_id)
             continue;
         }
 
-        LOG_INFO(keyspace_log, "Physically dropping database {}", db_name);
+        LOG_INFO(keyspace_log, "Physically dropping database, database_tombstone={} {}", db->getTombstone(), db_name);
         auto drop_query = std::make_shared<ASTDropQuery>();
         drop_query->database = db_name;
         drop_query->if_exists = true;