From 066f1b7ad108d68ea77cd3f83fc6b689b102acd7 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Mon, 28 Mar 2022 15:52:27 +0800 Subject: [PATCH] Fix data race of DeltaIndexManager. (#4459) (#4472) close pingcap/tiflash#4405 --- dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp b/dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp index e07ed5a8e11..0a726259849 100644 --- a/dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp +++ b/dbms/src/Storages/DeltaMerge/DeltaIndexManager.cpp @@ -92,9 +92,8 @@ void DeltaIndexManager::refreshRef(const DeltaIndexPtr & index) current_size += holder.size; removeOverflow(removed); + CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size); } - - CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size); } void DeltaIndexManager::deleteRef(const DeltaIndexPtr & index) @@ -124,9 +123,8 @@ void DeltaIndexManager::deleteRef(const DeltaIndexPtr & index) lru_queue.erase(holder.queue_it); // Remove it later index_map.erase(it); + CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size); } - - CurrentMetrics::set(CurrentMetrics::DT_DeltaIndexCacheSize, current_size); } DeltaIndexPtr DeltaIndexManager::getRef(UInt64 index_id)