From 78e4209eaf8767aced7f99bc394b64c73d4c3b4f Mon Sep 17 00:00:00 2001 From: godyangfight Date: Tue, 16 Jul 2024 10:17:33 +0000 Subject: [PATCH] [CP] Make START_TRANSFER_IN redo log as STRICT_BARRIER for replay speed limit circular dependency --- mittest/mtlenv/storage/test_transfer_barrier.cpp | 2 +- src/storage/tx/ob_tx_log.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mittest/mtlenv/storage/test_transfer_barrier.cpp b/mittest/mtlenv/storage/test_transfer_barrier.cpp index 4c05d34224..42046877ea 100644 --- a/mittest/mtlenv/storage/test_transfer_barrier.cpp +++ b/mittest/mtlenv/storage/test_transfer_barrier.cpp @@ -98,7 +98,7 @@ TEST_F(TestTransferBarrier, test_transfer_barrier_redo) //START_TRANSFER_IN barrier_flag = ObTxLogTypeChecker::need_replay_barrier(log_type, ObTxDataSourceType::START_TRANSFER_IN); - ASSERT_EQ(barrier_flag, logservice::ObReplayBarrierType::PRE_BARRIER); + ASSERT_EQ(barrier_flag, logservice::ObReplayBarrierType::STRICT_BARRIER); //STRICT_BARRIER //FINISH_TRANSFER_IN diff --git a/src/storage/tx/ob_tx_log.cpp b/src/storage/tx/ob_tx_log.cpp index ea16a266cb..a9577e7fc7 100644 --- a/src/storage/tx/ob_tx_log.cpp +++ b/src/storage/tx/ob_tx_log.cpp @@ -41,14 +41,14 @@ ObTxLogTypeChecker::need_replay_barrier(const ObTxLogType log_type, || data_source_type == ObTxDataSourceType::START_TRANSFER_OUT || data_source_type == ObTxDataSourceType::START_TRANSFER_OUT_PREPARE || data_source_type == ObTxDataSourceType::FINISH_TRANSFER_OUT - || data_source_type == ObTxDataSourceType::START_TRANSFER_IN || data_source_type == ObTxDataSourceType::TABLET_BINDING) { barrier_flag = logservice::ObReplayBarrierType::PRE_BARRIER; } else if (data_source_type == ObTxDataSourceType::FINISH_TRANSFER_IN || data_source_type == ObTxDataSourceType::START_TRANSFER_OUT_V2 - || data_source_type == ObTxDataSourceType::TRANSFER_MOVE_TX_CTX) { + || data_source_type == ObTxDataSourceType::TRANSFER_MOVE_TX_CTX + || data_source_type == ObTxDataSourceType::START_TRANSFER_IN) { barrier_flag = logservice::ObReplayBarrierType::STRICT_BARRIER; }