Add more message for ingest range check (#7850)

close #7766
pingcap · Jul 27, 2023 · 7dabea2 · 7dabea2
1 parent 8caefe3
commit 7dabea2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_Ingest.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_Ingest.cpp
@@ -555,10 +555,12 @@ UInt64 DeltaMergeStore::ingestFiles(
             {
                 RUNTIME_CHECK_MSG(
                     compare(range.getStart(), ext_file.range.getStart()) <= 0 && compare(range.getEnd(), ext_file.range.getEnd()) >= 0,
-                    "Detected illegal region boundary: range={} file_range={} . "
+                    "Detected illegal region boundary: range={} file_range={} keyspace={} table_id={}. "
                     "TiFlash will exit to prevent data inconsistency. "
                     "If you accept data inconsistency and want to continue the service, "
                     "set profiles.default.dt_enable_ingest_check=false .",
+                    keyspace_id,
+                    physical_table_id,
                     range.toDebugString(),
                     ext_file.range.toDebugString());
             }

diff --git a/dbms/src/Storages/Transaction/ApplySnapshot.cpp b/dbms/src/Storages/Transaction/ApplySnapshot.cpp
@@ -119,8 +119,8 @@ void KVStore::checkAndApplyPreHandledSnapshot(const RegionPtrWrap & new_region,
     }
 
     {
-        auto table_id = new_region->getMappedTableID();
         auto keyspace_id = new_region->getKeyspaceID();
+        auto table_id = new_region->getMappedTableID();
         if (auto storage = tmt.getStorages().get(keyspace_id, table_id); storage)
         {
             switch (storage->engineType())
@@ -600,8 +600,8 @@ RegionPtr KVStore::handleIngestSSTByDTFile(const RegionPtr & region, const SSTVi
     // ignore the step of calling `ingestFiles`
     if (!external_files.empty())
     {
-        auto table_id = region->getMappedTableID();
         auto keyspace_id = region->getKeyspaceID();
+        auto table_id = region->getMappedTableID();
         if (auto storage = tmt.getStorages().get(keyspace_id, table_id); storage)
         {
             // Ingest DTFiles into DeltaMerge storage