From bcc49d5141bb1bfd38403f56ba6bc4cd0b17a684 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 15:43:05 +0800 Subject: [PATCH 01/23] support keyspace gc Signed-off-by: ystaticy --- dbms/src/Debug/dbgFuncMockRaftSnapshot.cpp | 2 +- dbms/src/Debug/dbgFuncSchema.cpp | 2 +- dbms/src/Server/Server.cpp | 6 ++ .../Storages/DeltaMerge/DeltaMergeStore.cpp | 2 +- .../src/Storages/DeltaMerge/DeltaMergeStore.h | 1 + .../DeltaMerge/DeltaMergeStore_InternalBg.cpp | 1 + dbms/src/Storages/StorageDeltaMerge.cpp | 16 ++-- .../Storages/Transaction/ApplySnapshot.cpp | 1 + .../src/Storages/Transaction/PDTiKVClient.cpp | 4 + dbms/src/Storages/Transaction/PDTiKVClient.h | 88 ++++++++++++++++++- dbms/src/Storages/Transaction/TiDB.cpp | 5 ++ dbms/src/Storages/Transaction/TiDB.h | 1 + dbms/src/TiDB/Schema/SchemaSyncService.cpp | 3 +- 13 files changed, 122 insertions(+), 10 deletions(-) diff --git a/dbms/src/Debug/dbgFuncMockRaftSnapshot.cpp b/dbms/src/Debug/dbgFuncMockRaftSnapshot.cpp index e2e89ffe2f3..b913007d770 100644 --- a/dbms/src/Debug/dbgFuncMockRaftSnapshot.cpp +++ b/dbms/src/Debug/dbgFuncMockRaftSnapshot.cpp @@ -524,7 +524,7 @@ RegionPtrWithBlock::CachePtr GenRegionPreDecodeBlockData(const RegionPtr & regio if (auto pd_client = tmt.getPDClient(); !pd_client->isMock()) { gc_safe_point - = PDClientHelper::getGCSafePointWithRetry(pd_client, false, context.getSettingsRef().safe_point_update_interval_seconds); + = PDClientHelper::getGCSafePointWithRetry(pd_client, keyspace_id, false, context.getSettingsRef().safe_point_update_interval_seconds); } /** * In 5.0.1, feature `compaction filter` is enabled by default. Under such feature tikv will do gc in write & default cf individually. diff --git a/dbms/src/Debug/dbgFuncSchema.cpp b/dbms/src/Debug/dbgFuncSchema.cpp index 51b6f657be9..063ae9e0736 100644 --- a/dbms/src/Debug/dbgFuncSchema.cpp +++ b/dbms/src/Debug/dbgFuncSchema.cpp @@ -181,7 +181,7 @@ void dbgFuncGcSchemas(Context & context, const ASTs & args, DBGInvoker::Printer auto & service = context.getSchemaSyncService(); Timestamp gc_safe_point = 0; if (args.empty()) - gc_safe_point = PDClientHelper::getGCSafePointWithRetry(context.getTMTContext().getPDClient()); + gc_safe_point = PDClientHelper::getGCSafePointWithRetry(context.getTMTContext().getPDClient(), NullspaceID); else gc_safe_point = safeGet(typeid_cast(*args[0]).value); service->gc(gc_safe_point, NullspaceID); diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index 109399d7fb9..6cf95e7434b 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -86,6 +86,7 @@ #include #include #include +#include #include #include #include @@ -269,6 +270,8 @@ std::string Server::getDefaultCorePath() const return getCanonicalPath(config().getString("path")) + "cores"; } +bool PDClientHelper::enable_safepoint_v2 = false; + struct TiFlashProxyConfig { std::vector args; @@ -970,6 +973,9 @@ int Server::main(const std::vector & /*args*/) LOG_INFO(log, "Using api_version={}", storage_config.api_version); + // Set whether to use safe point v2. + PDClientHelper::enable_safepoint_v2 = config().getBool("enable_safe_point_v2", false); + // Init Proxy's config TiFlashProxyConfig proxy_conf(config(), storage_config.s3_config.isS3Enabled()); EngineStoreServerWrap tiflash_instance_wrap{}; diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp index adc9f0f0602..4c532066c41 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp @@ -206,8 +206,8 @@ DeltaMergeStore::DeltaMergeStore(Context & db_context, , settings(settings_) , db_name(db_name_) , table_name(table_name_) - , keyspace_id(keyspace_id_) , physical_table_id(physical_table_id_) + , keyspace_id(keyspace_id_) , is_common_handle(is_common_handle_) , rowkey_column_size(rowkey_column_size_) , original_table_handle_define(handle) diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h index fc273fa344a..52b2f65c28c 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h @@ -251,6 +251,7 @@ class DeltaMergeStore : private boost::noncopyable const String & table_name_, KeyspaceID keyspace_id_, TableID physical_table_id_, + KeyspaceID keyspace_id, bool has_replica, const ColumnDefines & columns, const ColumnDefine & handle, diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp index 4fc97e3cf76..20c6c17d98d 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp @@ -344,6 +344,7 @@ bool DeltaMergeStore::updateGCSafePoint() { auto safe_point = PDClientHelper::getGCSafePointWithRetry( pd_client, + keyspace_id, /* ignore_cache= */ false, global_context.getSettingsRef().safe_point_update_interval_seconds); latest_gc_safe_point.store(safe_point, std::memory_order_release); diff --git a/dbms/src/Storages/StorageDeltaMerge.cpp b/dbms/src/Storages/StorageDeltaMerge.cpp index 0b710b099de..33111424d90 100644 --- a/dbms/src/Storages/StorageDeltaMerge.cpp +++ b/dbms/src/Storages/StorageDeltaMerge.cpp @@ -624,7 +624,7 @@ void setColumnsToRead(const DeltaMergeStorePtr & store, ColumnDefines & columns_ } // Check whether tso is smaller than TiDB GcSafePoint -void checkReadTso(UInt64 read_tso, const Context & context, const String & req_id) +void checkReadTso(UInt64 read_tso, const Context & context, const String & req_id, KeyspaceID keyspace_id) { auto & tmt = context.getTMTContext(); RUNTIME_CHECK(tmt.isInitialized()); @@ -633,6 +633,7 @@ void checkReadTso(UInt64 read_tso, const Context & context, const String & req_i return; auto safe_point = PDClientHelper::getGCSafePointWithRetry( pd_client, + keyspace_id, /* ignore_cache= */ false, context.getSettingsRef().safe_point_update_interval_seconds); if (read_tso < safe_point) @@ -655,7 +656,8 @@ DM::RowKeyRanges StorageDeltaMerge::parseMvccQueryInfo( { LOG_DEBUG(tracing_logger, "Read with tso: {}", mvcc_query_info.read_tso); - checkReadTso(mvcc_query_info.read_tso, context, req_id); + auto keyspace_id = getTableInfo().getKeyspaceID(); + checkReadTso(mvcc_query_info.read_tso, context, req_id, keyspace_id); FmtBuffer fmt_buf; if (unlikely(tracing_logger->is(Poco::Message::Priority::PRIO_TRACE))) @@ -935,8 +937,9 @@ BlockInputStreams StorageDeltaMerge::read( extra_table_id_index, scan_context); + auto keyspace_id = getTableInfo().getKeyspaceID(); /// Ensure read_tso info after read. - checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id); + checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id, keyspace_id); LOG_TRACE(tracing_logger, "[ranges: {}] [streams: {}]", ranges.size(), streams.size()); @@ -1006,8 +1009,9 @@ void StorageDeltaMerge::read( extra_table_id_index, scan_context); + auto keyspace_id = getTableInfo().getKeyspaceID(); /// Ensure read_tso info after read. - checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id); + checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id, keyspace_id); LOG_TRACE(tracing_logger, "[ranges: {}] [concurrency: {}]", ranges.size(), group_builder.concurrency()); } @@ -1043,8 +1047,9 @@ StorageDeltaMerge::writeNodeBuildRemoteReadSnapshot( snap->column_defines = std::make_shared(columns_to_read); + auto keyspace_id = getTableInfo().getKeyspaceID(); // Ensure read_tso is valid after snapshot is built - checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id); + checkReadTso(mvcc_query_info.read_tso, context, query_info.req_id, keyspace_id); return snap; } @@ -1846,6 +1851,7 @@ DeltaMergeStorePtr & StorageDeltaMerge::getAndMaybeInitStore(ThreadPool * thread table_column_info->table_name, tidb_table_info.keyspace_id, tidb_table_info.id, + tidb_table_info.keyspace_id, tidb_table_info.replica_info.count > 0, std::move(table_column_info->table_column_defines), std::move(table_column_info->handle_column_define), diff --git a/dbms/src/Storages/Transaction/ApplySnapshot.cpp b/dbms/src/Storages/Transaction/ApplySnapshot.cpp index 4dcd123a309..722c59a9465 100644 --- a/dbms/src/Storages/Transaction/ApplySnapshot.cpp +++ b/dbms/src/Storages/Transaction/ApplySnapshot.cpp @@ -351,6 +351,7 @@ std::vector KVStore::preHandleSSTsToDTFiles( if (auto pd_client = tmt.getPDClient(); !pd_client->isMock()) { gc_safepoint = PDClientHelper::getGCSafePointWithRetry(pd_client, + keyspace_id, /* ignore_cache= */ false, context.getSettingsRef().safe_point_update_interval_seconds); } diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.cpp b/dbms/src/Storages/Transaction/PDTiKVClient.cpp index ed46aeb18c2..91af155c99d 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.cpp +++ b/dbms/src/Storages/Transaction/PDTiKVClient.cpp @@ -25,4 +25,8 @@ extern const int LOGICAL_ERROR; std::atomic PDClientHelper::cached_gc_safe_point = 0; std::atomic> PDClientHelper::safe_point_last_update_time; +// Keyspace gc safepoint cache and update time. +std::unordered_map PDClientHelper::ks_gc_sp_map; +std::shared_mutex PDClientHelper::ks_gc_sp_mutex; + } // namespace DB diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index f1be9a0a5c0..61ba543541b 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -20,6 +20,7 @@ #ifdef __clang__ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif +#include #include #include #include @@ -31,17 +32,37 @@ #include +using TimePoint = std::chrono::time_point; + +struct KeyspaceGCInfo +{ + DB::Timestamp ks_gc_sp; + TimePoint ks_gc_sp_update_time; +}; + namespace DB { struct PDClientHelper { static constexpr int get_safepoint_maxtime = 120000; // 120s. waiting pd recover. + static bool enable_safepoint_v2; + static Timestamp getGCSafePointWithRetry( const pingcap::pd::ClientPtr & pd_client, + KeyspaceID keyspace_id, bool ignore_cache = true, Int64 safe_point_update_interval_seconds = 30) { + + // If keyspace id is `NullspaceID` it need to use safe point v1. + if (enable_safepoint_v2 && keyspace_id != NullspaceID) + { + auto gc_safe_point = getGCSafePointV2WithRetry(pd_client, keyspace_id, ignore_cache, safe_point_update_interval_seconds); + LOG_DEBUG(Logger::get(), "use safe point v2, keyspace_id={},gc_safe_point={}", keyspace_id, gc_safe_point); + return gc_safe_point; + } + if (!ignore_cache) { // In case we cost too much to update safe point from PD. @@ -69,9 +90,74 @@ struct PDClientHelper } } + static Timestamp getGCSafePointV2WithRetry( + const pingcap::pd::ClientPtr & pd_client, + KeyspaceID keyspace_id, + bool ignore_cache = false, + Int64 safe_point_update_interval_seconds = 30) + { + if (!ignore_cache) + { + // In case we cost too much to update safe point from PD. + std::chrono::time_point now = std::chrono::system_clock::now(); + + auto ks_gc_info = get_ks_gc_sp(keyspace_id); + const auto duration = std::chrono::duration_cast(now - ks_gc_info.ks_gc_sp_update_time); + const auto min_interval = std::max(Int64(1), safe_point_update_interval_seconds); // at least one second + if (duration.count() < min_interval) + { + return ks_gc_info.ks_gc_sp; + } + } + + pingcap::kv::Backoffer bo(get_safepoint_maxtime); + for (;;) + { + try + { + auto ks_gc_sp = pd_client->getGCSafePointV2(keyspace_id); + auto ks_gc_sp_last_update_time = std::chrono::system_clock::now(); + update_ks_gc_sp_map(keyspace_id, ks_gc_sp, ks_gc_sp_last_update_time); + return ks_gc_sp; + } + catch (pingcap::Exception & e) + { + bo.backoff(pingcap::kv::boPDRPC, e); + } + } + } + + + static void update_ks_gc_sp_map(KeyspaceID keyspace_id, Timestamp ks_gc_sp, TimePoint ks_gc_sp_update_time) + { + std::unique_lock lock(ks_gc_sp_mutex); + KeyspaceGCInfo newKeyspaceGCInfo; + newKeyspaceGCInfo.ks_gc_sp = ks_gc_sp; + newKeyspaceGCInfo.ks_gc_sp_update_time = ks_gc_sp_update_time; + ks_gc_sp_map[keyspace_id] = newKeyspaceGCInfo; + } + + static KeyspaceGCInfo get_ks_gc_sp(KeyspaceID keyspace_id) + { + std::shared_lock lock(ks_gc_sp_mutex); + return ks_gc_sp_map[keyspace_id]; + } + + static void remove_ks_gc_sp(KeyspaceID keyspace_id) + { + std::shared_lock lock(ks_gc_sp_mutex); + KeyspaceGCInfo ks_gc_info; + ks_gc_sp_map.erase(keyspace_id); + } + + private: static std::atomic cached_gc_safe_point; - static std::atomic> safe_point_last_update_time; + static std::atomic> safe_point_last_update_time; + + // Keyspace gc safepoint cache and update time. + static std::unordered_map ks_gc_sp_map; + static std::shared_mutex ks_gc_sp_mutex; }; diff --git a/dbms/src/Storages/Transaction/TiDB.cpp b/dbms/src/Storages/Transaction/TiDB.cpp index fd39416a48a..c0fe1f4705b 100644 --- a/dbms/src/Storages/Transaction/TiDB.cpp +++ b/dbms/src/Storages/Transaction/TiDB.cpp @@ -1078,6 +1078,11 @@ ColumnID TableInfo::getColumnID(const String & name) const DB::ErrorCodes::LOGICAL_ERROR); } +KeyspaceID TableInfo::getKeyspaceID() const +{ + return keyspace_id; +} + String TableInfo::getColumnName(const ColumnID id) const { for (const auto & col : columns) diff --git a/dbms/src/Storages/Transaction/TiDB.h b/dbms/src/Storages/Transaction/TiDB.h index ba4470958eb..01b5cfad7dd 100644 --- a/dbms/src/Storages/Transaction/TiDB.h +++ b/dbms/src/Storages/Transaction/TiDB.h @@ -399,6 +399,7 @@ struct TableInfo ColumnID getColumnID(const String & name) const; String getColumnName(ColumnID id) const; + KeyspaceID getKeyspaceID() const; const ColumnInfo & getColumnInfo(ColumnID id) const; diff --git a/dbms/src/TiDB/Schema/SchemaSyncService.cpp b/dbms/src/TiDB/Schema/SchemaSyncService.cpp index 4b70d733634..66a7a616210 100644 --- a/dbms/src/TiDB/Schema/SchemaSyncService.cpp +++ b/dbms/src/TiDB/Schema/SchemaSyncService.cpp @@ -77,7 +77,7 @@ void SchemaSyncService::addKeyspaceGCTasks() /// They must be performed synchronously, /// otherwise table may get mis-GC-ed if RECOVER was not properly synced caused by schema sync pause but GC runs too aggressively. // GC safe point must be obtained ahead of syncing schema. - auto gc_safe_point = PDClientHelper::getGCSafePointWithRetry(context.getTMTContext().getPDClient()); + auto gc_safe_point = PDClientHelper::getGCSafePointWithRetry(context.getTMTContext().getPDClient(), keyspace); stage = "Sync schemas"; done_anything = syncSchemas(keyspace); if (done_anything) @@ -130,6 +130,7 @@ void SchemaSyncService::removeKeyspaceGCTasks() keyspace_handle_iter = keyspace_handle_map.erase(keyspace_handle_iter); context.getTMTContext().getSchemaSyncerManager()->removeSchemaSyncer(keyspace); + PDClientHelper::remove_ks_gc_sp(keyspace); } } From d6110c337328781735a856503b1c4aa08a3184e7 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 15:53:38 +0800 Subject: [PATCH 02/23] support keyspace gc Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 61ba543541b..8028d46fab3 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -99,7 +99,7 @@ struct PDClientHelper if (!ignore_cache) { // In case we cost too much to update safe point from PD. - std::chrono::time_point now = std::chrono::system_clock::now(); + auto now = std::chrono::system_clock::now(); auto ks_gc_info = get_ks_gc_sp(keyspace_id); const auto duration = std::chrono::duration_cast(now - ks_gc_info.ks_gc_sp_update_time); @@ -127,7 +127,6 @@ struct PDClientHelper } } - static void update_ks_gc_sp_map(KeyspaceID keyspace_id, Timestamp ks_gc_sp, TimePoint ks_gc_sp_update_time) { std::unique_lock lock(ks_gc_sp_mutex); From 52437c973ab9aebb13db14ddf6fed36f89e2e8b7 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 15:59:25 +0800 Subject: [PATCH 03/23] support keyspace gc Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 8028d46fab3..cf5eac81409 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -32,7 +32,7 @@ #include -using TimePoint = std::chrono::time_point; +using TimePoint = std::atomic>; struct KeyspaceGCInfo { @@ -152,7 +152,7 @@ struct PDClientHelper private: static std::atomic cached_gc_safe_point; - static std::atomic> safe_point_last_update_time; + static std::atomic> safe_point_last_update_time; // Keyspace gc safepoint cache and update time. static std::unordered_map ks_gc_sp_map; From e1b19690f86393bbb0519f1a79e1a717bc9fef4d Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 16:03:29 +0800 Subject: [PATCH 04/23] fix use clock Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index cf5eac81409..bf851a4a071 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -99,7 +99,7 @@ struct PDClientHelper if (!ignore_cache) { // In case we cost too much to update safe point from PD. - auto now = std::chrono::system_clock::now(); + auto now = std::chrono::steady_clock::now(); auto ks_gc_info = get_ks_gc_sp(keyspace_id); const auto duration = std::chrono::duration_cast(now - ks_gc_info.ks_gc_sp_update_time); @@ -116,7 +116,7 @@ struct PDClientHelper try { auto ks_gc_sp = pd_client->getGCSafePointV2(keyspace_id); - auto ks_gc_sp_last_update_time = std::chrono::system_clock::now(); + auto ks_gc_sp_last_update_time = std::chrono::steady_clock::now(); update_ks_gc_sp_map(keyspace_id, ks_gc_sp, ks_gc_sp_last_update_time); return ks_gc_sp; } From 83b7f20b52c6fe4ac1f236b575451dc107846465 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 16:12:04 +0800 Subject: [PATCH 05/23] support keyspace gc Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index bf851a4a071..0b9d2d1d556 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -116,8 +116,7 @@ struct PDClientHelper try { auto ks_gc_sp = pd_client->getGCSafePointV2(keyspace_id); - auto ks_gc_sp_last_update_time = std::chrono::steady_clock::now(); - update_ks_gc_sp_map(keyspace_id, ks_gc_sp, ks_gc_sp_last_update_time); + update_ks_gc_sp_map(keyspace_id, ks_gc_sp); return ks_gc_sp; } catch (pingcap::Exception & e) @@ -127,12 +126,12 @@ struct PDClientHelper } } - static void update_ks_gc_sp_map(KeyspaceID keyspace_id, Timestamp ks_gc_sp, TimePoint ks_gc_sp_update_time) + static void update_ks_gc_sp_map(KeyspaceID keyspace_id, Timestamp ks_gc_sp) { std::unique_lock lock(ks_gc_sp_mutex); KeyspaceGCInfo newKeyspaceGCInfo; newKeyspaceGCInfo.ks_gc_sp = ks_gc_sp; - newKeyspaceGCInfo.ks_gc_sp_update_time = ks_gc_sp_update_time; + newKeyspaceGCInfo.ks_gc_sp_update_time = std::chrono::steady_clock::now(); ks_gc_sp_map[keyspace_id] = newKeyspaceGCInfo; } From 2d398ee652f8c6516fe503908836b17e317b6236 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 16:17:40 +0800 Subject: [PATCH 06/23] fix use clock Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 21 ++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 0b9d2d1d556..3f44d6d6545 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -38,6 +38,27 @@ struct KeyspaceGCInfo { DB::Timestamp ks_gc_sp; TimePoint ks_gc_sp_update_time; + + KeyspaceGCInfo() + { + ks_gc_sp_update_time = std::chrono::steady_clock::now(); + } + + KeyspaceGCInfo(const KeyspaceGCInfo& other) + { + ks_gc_sp = other.ks_gc_sp; + ks_gc_sp_update_time = std::chrono::steady_clock::now(); + } + + KeyspaceGCInfo& operator=(const KeyspaceGCInfo& other) + { + if (this != &other) + { + ks_gc_sp = other.ks_gc_sp; + ks_gc_sp_update_time = std::chrono::steady_clock::now(); + } + return *this; + } }; namespace DB From bb850e2b222bf6db1a1e151a69b619e01a9182a5 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 16:22:13 +0800 Subject: [PATCH 07/23] fix use clock Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 3f44d6d6545..38bf03db9d7 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -52,7 +52,7 @@ struct KeyspaceGCInfo KeyspaceGCInfo& operator=(const KeyspaceGCInfo& other) { - if (this != &other) + if (this != &other) { ks_gc_sp = other.ks_gc_sp; ks_gc_sp_update_time = std::chrono::steady_clock::now(); From d010278e0e59dee4b4ac03088a0e22a06731b722 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 20 Jun 2023 16:24:15 +0800 Subject: [PATCH 08/23] fix use clock Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 38bf03db9d7..10aaeda879d 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -123,7 +123,7 @@ struct PDClientHelper auto now = std::chrono::steady_clock::now(); auto ks_gc_info = get_ks_gc_sp(keyspace_id); - const auto duration = std::chrono::duration_cast(now - ks_gc_info.ks_gc_sp_update_time); + const auto duration = std::chrono::duration_cast(now - ks_gc_info.ks_gc_sp_update_time.load()); const auto min_interval = std::max(Int64(1), safe_point_update_interval_seconds); // at least one second if (duration.count() < min_interval) { From a3a20eb0f9e50414f5a937b41f83b6717cea609e Mon Sep 17 00:00:00 2001 From: ystaticy Date: Sun, 25 Jun 2023 10:47:32 +0800 Subject: [PATCH 09/23] code format Signed-off-by: ystaticy --- dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp | 5 +++-- dbms/src/Storages/DeltaMerge/DeltaMergeStore.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp index 4c532066c41..a0e514d7c14 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp @@ -200,20 +200,21 @@ DeltaMergeStore::DeltaMergeStore(Context & db_context, bool is_common_handle_, size_t rowkey_column_size_, const Settings & settings_, - ThreadPool * thread_pool) + ThreadPool * thread_pool, + ) : global_context(db_context.getGlobalContext()) , path_pool(std::make_shared(global_context.getPathPool().withTable(db_name_, table_name_, data_path_contains_database_name))) , settings(settings_) , db_name(db_name_) , table_name(table_name_) , physical_table_id(physical_table_id_) - , keyspace_id(keyspace_id_) , is_common_handle(is_common_handle_) , rowkey_column_size(rowkey_column_size_) , original_table_handle_define(handle) , background_pool(db_context.getBackgroundPool()) , blockable_background_pool(db_context.getBlockableBackgroundPool()) , next_gc_check_key(is_common_handle ? RowKeyValue::COMMON_HANDLE_MIN_KEY : RowKeyValue::INT_HANDLE_MIN_KEY) + , keyspace_id(keyspace_id_) , log(Logger::get(fmt::format("keyspace={} table_id={}", keyspace_id_, physical_table_id_))) { replica_exist.store(has_replica); diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h index 52b2f65c28c..fc273fa344a 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.h @@ -251,7 +251,6 @@ class DeltaMergeStore : private boost::noncopyable const String & table_name_, KeyspaceID keyspace_id_, TableID physical_table_id_, - KeyspaceID keyspace_id, bool has_replica, const ColumnDefines & columns, const ColumnDefine & handle, From 4ee7284705c452fd86a98758bdd069c9423e0abf Mon Sep 17 00:00:00 2001 From: ystaticy Date: Sun, 25 Jun 2023 10:54:36 +0800 Subject: [PATCH 10/23] code format Signed-off-by: ystaticy --- dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp index a0e514d7c14..55d11f6c7e5 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp @@ -200,13 +200,13 @@ DeltaMergeStore::DeltaMergeStore(Context & db_context, bool is_common_handle_, size_t rowkey_column_size_, const Settings & settings_, - ThreadPool * thread_pool, - ) + ThreadPool * thread_pool,) : global_context(db_context.getGlobalContext()) , path_pool(std::make_shared(global_context.getPathPool().withTable(db_name_, table_name_, data_path_contains_database_name))) , settings(settings_) , db_name(db_name_) , table_name(table_name_) + , keyspace_id(keyspace_id_) , physical_table_id(physical_table_id_) , is_common_handle(is_common_handle_) , rowkey_column_size(rowkey_column_size_) @@ -214,7 +214,6 @@ DeltaMergeStore::DeltaMergeStore(Context & db_context, , background_pool(db_context.getBackgroundPool()) , blockable_background_pool(db_context.getBlockableBackgroundPool()) , next_gc_check_key(is_common_handle ? RowKeyValue::COMMON_HANDLE_MIN_KEY : RowKeyValue::INT_HANDLE_MIN_KEY) - , keyspace_id(keyspace_id_) , log(Logger::get(fmt::format("keyspace={} table_id={}", keyspace_id_, physical_table_id_))) { replica_exist.store(has_replica); From c8f0adf1bd58d98ef81f065044e5c8fedb8c41d6 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Sun, 25 Jun 2023 10:55:00 +0800 Subject: [PATCH 11/23] code format Signed-off-by: ystaticy --- dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp index 55d11f6c7e5..adc9f0f0602 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaMergeStore.cpp @@ -200,7 +200,7 @@ DeltaMergeStore::DeltaMergeStore(Context & db_context, bool is_common_handle_, size_t rowkey_column_size_, const Settings & settings_, - ThreadPool * thread_pool,) + ThreadPool * thread_pool) : global_context(db_context.getGlobalContext()) , path_pool(std::make_shared(global_context.getPathPool().withTable(db_name_, table_name_, data_path_contains_database_name))) , settings(settings_) From 93b7c9317abb509f5d6becb86597c15ecfad609b Mon Sep 17 00:00:00 2001 From: ystaticy Date: Sun, 25 Jun 2023 11:00:59 +0800 Subject: [PATCH 12/23] code format Signed-off-by: ystaticy --- dbms/src/Storages/StorageDeltaMerge.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dbms/src/Storages/StorageDeltaMerge.cpp b/dbms/src/Storages/StorageDeltaMerge.cpp index 33111424d90..a73676d8e52 100644 --- a/dbms/src/Storages/StorageDeltaMerge.cpp +++ b/dbms/src/Storages/StorageDeltaMerge.cpp @@ -1851,7 +1851,6 @@ DeltaMergeStorePtr & StorageDeltaMerge::getAndMaybeInitStore(ThreadPool * thread table_column_info->table_name, tidb_table_info.keyspace_id, tidb_table_info.id, - tidb_table_info.keyspace_id, tidb_table_info.replica_info.count > 0, std::move(table_column_info->table_column_defines), std::move(table_column_info->handle_column_define), From 217ec945530b3416013d688499dd561dffa6eb80 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Mon, 26 Jun 2023 13:28:38 +0800 Subject: [PATCH 13/23] add debug log Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 10aaeda879d..3c6b9e784c2 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -101,6 +101,7 @@ struct PDClientHelper { auto safe_point = pd_client->getGCSafePoint(); cached_gc_safe_point = safe_point; + LOG_DEBUG(Logger::get(), "use safe point v1, gc_safe_point={}", safe_point); safe_point_last_update_time = std::chrono::steady_clock::now(); return safe_point; } From 5601888934afad220ece7cf5015b2d182fc9b8ff Mon Sep 17 00:00:00 2001 From: ystaticy Date: Mon, 26 Jun 2023 13:38:22 +0800 Subject: [PATCH 14/23] code format Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/ApplySnapshot.cpp | 2 +- dbms/src/Storages/Transaction/PDTiKVClient.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dbms/src/Storages/Transaction/ApplySnapshot.cpp b/dbms/src/Storages/Transaction/ApplySnapshot.cpp index 63b9f7c3af0..1058fe04a0e 100644 --- a/dbms/src/Storages/Transaction/ApplySnapshot.cpp +++ b/dbms/src/Storages/Transaction/ApplySnapshot.cpp @@ -355,7 +355,7 @@ std::vector KVStore::preHandleSSTsToDTFiles( if (auto pd_client = tmt.getPDClient(); !pd_client->isMock()) { gc_safepoint = PDClientHelper::getGCSafePointWithRetry(pd_client, - keyspace_id, + keyspace_id, /* ignore_cache= */ false, context.getSettingsRef().safe_point_update_interval_seconds); } diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 3c6b9e784c2..db3392d6024 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -44,15 +44,15 @@ struct KeyspaceGCInfo ks_gc_sp_update_time = std::chrono::steady_clock::now(); } - KeyspaceGCInfo(const KeyspaceGCInfo& other) + KeyspaceGCInfo(const KeyspaceGCInfo & other) { ks_gc_sp = other.ks_gc_sp; ks_gc_sp_update_time = std::chrono::steady_clock::now(); } - KeyspaceGCInfo& operator=(const KeyspaceGCInfo& other) + KeyspaceGCInfo & operator=(const KeyspaceGCInfo & other) { - if (this != &other) + if (this != &other) { ks_gc_sp = other.ks_gc_sp; ks_gc_sp_update_time = std::chrono::steady_clock::now(); @@ -75,7 +75,6 @@ struct PDClientHelper bool ignore_cache = true, Int64 safe_point_update_interval_seconds = 30) { - // If keyspace id is `NullspaceID` it need to use safe point v1. if (enable_safepoint_v2 && keyspace_id != NullspaceID) { From 19f14d5e73e4fd5f61666e9112d1c762fba071ff Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 11:01:21 +0800 Subject: [PATCH 15/23] remove unused code Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index db3392d6024..cc26fb3608d 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -165,7 +165,6 @@ struct PDClientHelper static void remove_ks_gc_sp(KeyspaceID keyspace_id) { std::shared_lock lock(ks_gc_sp_mutex); - KeyspaceGCInfo ks_gc_info; ks_gc_sp_map.erase(keyspace_id); } From 79047a221e0cdbcaa7a7a73339c96551d9d9f956 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 14:34:36 +0800 Subject: [PATCH 16/23] fix comments Signed-off-by: ystaticy --- dbms/src/Server/Server.cpp | 2 +- dbms/src/Storages/Transaction/PDTiKVClient.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index 1a95703d621..7ce42950e15 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -270,7 +270,7 @@ std::string Server::getDefaultCorePath() const return getCanonicalPath(config().getString("path")) + "cores"; } -bool PDClientHelper::enable_safepoint_v2 = false; +//bool PDClientHelper::enable_safepoint_v2 = false; struct TiFlashProxyConfig { diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.cpp b/dbms/src/Storages/Transaction/PDTiKVClient.cpp index 91af155c99d..b6f065d8b69 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.cpp +++ b/dbms/src/Storages/Transaction/PDTiKVClient.cpp @@ -14,6 +14,8 @@ #include +bool PDClientHelper::enable_safepoint_v2 = false; + namespace DB { From 6e36f9cf0da86d2df4b389b6bf5005436b7c0113 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 14:39:05 +0800 Subject: [PATCH 17/23] fix comments Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.cpp b/dbms/src/Storages/Transaction/PDTiKVClient.cpp index b6f065d8b69..bbf2a913593 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.cpp +++ b/dbms/src/Storages/Transaction/PDTiKVClient.cpp @@ -14,8 +14,6 @@ #include -bool PDClientHelper::enable_safepoint_v2 = false; - namespace DB { @@ -28,6 +26,7 @@ std::atomic PDClientHelper::cached_gc_safe_point = 0; std::atomic> PDClientHelper::safe_point_last_update_time; // Keyspace gc safepoint cache and update time. +bool PDClientHelper::enable_safepoint_v2 = false; std::unordered_map PDClientHelper::ks_gc_sp_map; std::shared_mutex PDClientHelper::ks_gc_sp_mutex; From e22ad7ed1b03d21adb23c99ac31eaa34cf2d27d7 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 14:54:11 +0800 Subject: [PATCH 18/23] fix comments Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index cc26fb3608d..3c199e11b82 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -164,7 +164,7 @@ struct PDClientHelper static void remove_ks_gc_sp(KeyspaceID keyspace_id) { - std::shared_lock lock(ks_gc_sp_mutex); + std::unique_lock lock(ks_gc_sp_mutex); ks_gc_sp_map.erase(keyspace_id); } From 77fd344cf0526c728b628deeecfde9fba57bac75 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 15:17:27 +0800 Subject: [PATCH 19/23] fix comments Signed-off-by: ystaticy --- dbms/src/Server/Server.cpp | 2 ++ dbms/src/Storages/Transaction/PDTiKVClient.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index 7ce42950e15..ca137734ac3 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -974,6 +974,8 @@ int Server::main(const std::vector & /*args*/) // Set whether to use safe point v2. PDClientHelper::enable_safepoint_v2 = config().getBool("enable_safe_point_v2", false); + LOG_INFO(log, "Using PDClientHelper::enable_safepoint_v2={}", PDClientHelper::enable_safepoint_v2); + // Init Proxy's config TiFlashProxyConfig proxy_conf(config(), storage_config.s3_config.isS3Enabled()); EngineStoreServerWrap tiflash_instance_wrap{}; diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 3c199e11b82..1002a403358 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -75,6 +75,7 @@ struct PDClientHelper bool ignore_cache = true, Int64 safe_point_update_interval_seconds = 30) { + LOG_DEBUG(Logger::get(), "getGCSafePointWithRetry, enable_safepoint_v2={}", enable_safepoint_v2); // If keyspace id is `NullspaceID` it need to use safe point v1. if (enable_safepoint_v2 && keyspace_id != NullspaceID) { From 252cff2fbc38948a2e2d778d1659e63d07a5dbb7 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 15:38:52 +0800 Subject: [PATCH 20/23] fix comments Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 1002a403358..5f2894f7737 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -75,7 +75,7 @@ struct PDClientHelper bool ignore_cache = true, Int64 safe_point_update_interval_seconds = 30) { - LOG_DEBUG(Logger::get(), "getGCSafePointWithRetry, enable_safepoint_v2={}", enable_safepoint_v2); + LOG_DEBUG(Logger::get(), "getGCSafePointWithRetry, enable_safepoint_v2={},keyspace_id={}", enable_safepoint_v2,keyspace_id); // If keyspace id is `NullspaceID` it need to use safe point v1. if (enable_safepoint_v2 && keyspace_id != NullspaceID) { From a8bfbd0061503ccf1939410d5ce0be4709589ac2 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 15:53:20 +0800 Subject: [PATCH 21/23] fix comments Signed-off-by: ystaticy --- dbms/src/Storages/Transaction/PDTiKVClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 5f2894f7737..6cb5bd93320 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -101,7 +101,7 @@ struct PDClientHelper { auto safe_point = pd_client->getGCSafePoint(); cached_gc_safe_point = safe_point; - LOG_DEBUG(Logger::get(), "use safe point v1, gc_safe_point={}", safe_point); + LOG_DEBUG(Logger::get(), "use safe point v1, gc_safe_point={}, enable_safepoint_v2={},keyspace_id={}", safe_point, enable_safepoint_v2,keyspace_id); safe_point_last_update_time = std::chrono::steady_clock::now(); return safe_point; } From 79bd6ac22b8743873e24a4b9dd6bee5e65d09644 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 16:14:44 +0800 Subject: [PATCH 22/23] fix comments Signed-off-by: ystaticy --- dbms/src/Server/Server.cpp | 2 -- dbms/src/Storages/Transaction/PDTiKVClient.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index ca137734ac3..7ce42950e15 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -974,8 +974,6 @@ int Server::main(const std::vector & /*args*/) // Set whether to use safe point v2. PDClientHelper::enable_safepoint_v2 = config().getBool("enable_safe_point_v2", false); - LOG_INFO(log, "Using PDClientHelper::enable_safepoint_v2={}", PDClientHelper::enable_safepoint_v2); - // Init Proxy's config TiFlashProxyConfig proxy_conf(config(), storage_config.s3_config.isS3Enabled()); EngineStoreServerWrap tiflash_instance_wrap{}; diff --git a/dbms/src/Storages/Transaction/PDTiKVClient.h b/dbms/src/Storages/Transaction/PDTiKVClient.h index 6cb5bd93320..3c199e11b82 100644 --- a/dbms/src/Storages/Transaction/PDTiKVClient.h +++ b/dbms/src/Storages/Transaction/PDTiKVClient.h @@ -75,7 +75,6 @@ struct PDClientHelper bool ignore_cache = true, Int64 safe_point_update_interval_seconds = 30) { - LOG_DEBUG(Logger::get(), "getGCSafePointWithRetry, enable_safepoint_v2={},keyspace_id={}", enable_safepoint_v2,keyspace_id); // If keyspace id is `NullspaceID` it need to use safe point v1. if (enable_safepoint_v2 && keyspace_id != NullspaceID) { @@ -101,7 +100,7 @@ struct PDClientHelper { auto safe_point = pd_client->getGCSafePoint(); cached_gc_safe_point = safe_point; - LOG_DEBUG(Logger::get(), "use safe point v1, gc_safe_point={}, enable_safepoint_v2={},keyspace_id={}", safe_point, enable_safepoint_v2,keyspace_id); + LOG_DEBUG(Logger::get(), "use safe point v1, gc_safe_point={}", safe_point); safe_point_last_update_time = std::chrono::steady_clock::now(); return safe_point; } From aa2850d4337823d73ed67ff6c6cd9c639c06561b Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 27 Jun 2023 16:19:19 +0800 Subject: [PATCH 23/23] fix comments Signed-off-by: ystaticy --- dbms/src/Server/Server.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp index 7ce42950e15..85f9e96b99a 100644 --- a/dbms/src/Server/Server.cpp +++ b/dbms/src/Server/Server.cpp @@ -270,8 +270,6 @@ std::string Server::getDefaultCorePath() const return getCanonicalPath(config().getString("path")) + "cores"; } -//bool PDClientHelper::enable_safepoint_v2 = false; - struct TiFlashProxyConfig { std::vector args;