From 82d6756606a9a3ab641abc18c05a07f50f53e384 Mon Sep 17 00:00:00 2001 From: chinaxing Date: Mon, 17 Jun 2024 11:27:02 +0000 Subject: [PATCH] fix LAST_BARRIER_DATA_VERSION not ready for 4_2_5 --- src/storage/tx/ob_tx_api.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/storage/tx/ob_tx_api.cpp b/src/storage/tx/ob_tx_api.cpp index eda296d5c..3ca64ed3f 100644 --- a/src/storage/tx/ob_tx_api.cpp +++ b/src/storage/tx/ob_tx_api.cpp @@ -78,8 +78,14 @@ inline int ObTransService::init_tx_(ObTxDesc &tx, if (0 == cluster_version && OB_FAIL(GET_MIN_DATA_VERSION(tenant_id_, tx.cluster_version_))) { TRANS_LOG(WARN, "get min data version fail", K(ret), K(tx)); } else if (tx.cluster_version_ < MOCK_DATA_VERSION_4_2_4_0) { - ret = OB_ERR_UNEXPECTED; - TRANS_LOG(WARN, "data version should >= 4_2_4_0", K(ret), K(tx)); + if (tx.cluster_version_ == DATA_VERSION_4_2_1_0) { + // FIXME: remove this branch + tx.cluster_version_ = MOCK_DATA_VERSION_4_2_4_0; + TRANS_LOG(WARN, "NEED_REMOVE_NOTICE:4_2_1_0 data version forced to 4_2_4_0"); + } else { + ret = OB_ERR_UNEXPECTED; + TRANS_LOG(WARN, "data version should >= 4_2_4_0", K(ret), K(tx)); + } } tx.seq_base_ = common::ObSequence::get_max_seq_no() - 1; return ret;