Skip conf version check when peer state is normal & Limit speed about…

… pre-handle snapshot (#1671) Signed-off-by: Zhigao Tong <[email protected]>
pingcap · Mar 27, 2021 · b52c596 · b52c596
1 parent 6194af5
commit b52c596
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/contrib/tiflash-proxy b/contrib/tiflash-proxy
diff --git a/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp b/dbms/src/Flash/Coprocessor/InterpreterDAGHelper.hpp
@@ -18,8 +18,9 @@ RegionException::RegionReadStatus GetRegionReadStatus(
     if (!current_region)
         return RegionException::RegionReadStatus::NOT_FOUND;
     auto meta_snap = current_region->dumpRegionMetaSnapshot();
-    if (meta_snap.ver != check_info.region_version || meta_snap.conf_ver != check_info.region_conf_version)
+    if (meta_snap.ver != check_info.region_version)
         return RegionException::RegionReadStatus::EPOCH_NOT_MATCH;
+    // No need to check conf_version if its peer state is normal
     if (current_region->peerState() != raft_serverpb::PeerState::Normal)
         return RegionException::RegionReadStatus::NOT_FOUND;
 

diff --git a/dbms/src/Storages/Transaction/LearnerRead.cpp b/dbms/src/Storages/Transaction/LearnerRead.cpp
@@ -69,19 +69,6 @@ struct UnavailableRegions
     std::atomic<RegionException::RegionReadStatus> status{RegionException::RegionReadStatus::NOT_FOUND};
 };
 
-/// Check whether region is invalid or not.
-RegionException::RegionReadStatus isValidRegion(const RegionQueryInfo & region_to_query, const RegionPtr & region_in_mem)
-{
-    if (region_in_mem->peerState() != raft_serverpb::PeerState::Normal)
-        return RegionException::RegionReadStatus::NOT_FOUND;
-
-    const auto & meta_snap = region_in_mem->dumpRegionMetaSnapshot();
-    if (meta_snap.ver != region_to_query.version || meta_snap.conf_ver != region_to_query.conf_version)
-        return RegionException::RegionReadStatus::EPOCH_NOT_MATCH;
-
-    return RegionException::RegionReadStatus::OK;
-}
-
 LearnerReadSnapshot doLearnerRead(const TiDB::TableID table_id, //
     const MvccQueryInfo & mvcc_query_info,                      //
     size_t num_streams, TMTContext & tmt, Poco::Logger * log)