From c700eca927f7abb218324ec5519e1851afdeb2d0 Mon Sep 17 00:00:00 2001 From: Handora Date: Sat, 10 Feb 2024 03:16:25 +0000 Subject: [PATCH] Revert [BUG]maintain ls reference for transfer read --- src/share/parameter/ob_parameter_seed.ipp | 2 +- src/storage/high_availability/ob_transfer_handler.cpp | 2 +- src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h | 4 +--- src/storage/tx_storage/ob_access_service.cpp | 2 +- src/storage/tx_table/ob_tx_table_guards.h | 10 +++------- .../r/mysql/all_virtual_sys_parameter_stat.result | 2 +- 6 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/share/parameter/ob_parameter_seed.ipp b/src/share/parameter/ob_parameter_seed.ipp index 9eb21db89f..55ad446789 100644 --- a/src/share/parameter/ob_parameter_seed.ipp +++ b/src/share/parameter/ob_parameter_seed.ipp @@ -1572,7 +1572,7 @@ DEF_INT(_transfer_task_tablet_count_threshold, OB_TENANT_PARAMETER, "100", "(0,1 "Threshold for the count of tablets that can be processed by a transfer task" "Range: (0, 100]", ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); -DEF_BOOL(_enable_transfer_active_tx, OB_TENANT_PARAMETER, "True", +DEF_BOOL(_enable_active_txn_transfer, OB_TENANT_PARAMETER, "False", "Specifies whether support transfer active tx", ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); // end of transfer diff --git a/src/storage/high_availability/ob_transfer_handler.cpp b/src/storage/high_availability/ob_transfer_handler.cpp index 3c494ac967..2428558689 100644 --- a/src/storage/high_availability/ob_transfer_handler.cpp +++ b/src/storage/high_availability/ob_transfer_handler.cpp @@ -2672,7 +2672,7 @@ int enable_new_transfer(bool &enable) LOG_INFO("[TRANSFER] get min data version failed", K(ret)); } else if (DATA_VERSION_4_3_0_0 > data_version) { enable = false; - } else if (!tenant_config->_enable_transfer_active_tx) { + } else if (!tenant_config->_enable_active_txn_transfer) { enable = false; } else { enable = true; diff --git a/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h b/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h index 67b130ed28..95856ac86f 100644 --- a/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h +++ b/src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h @@ -169,11 +169,9 @@ public: write_flag_ = write_flag; } - void set_src_tx_table_guard(const storage::ObTxTableGuard &tx_table_guard, - storage::ObLSHandle &src_ls_handle) + void set_src_tx_table_guard(const storage::ObTxTableGuard &tx_table_guard) { tx_table_guards_.src_tx_table_guard_ = tx_table_guard; - tx_table_guards_.src_ls_handle_ = src_ls_handle; } void init_replay(transaction::ObPartTransCtx &tx_ctx, ObMemtableCtx &mem_ctx, diff --git a/src/storage/tx_storage/ob_access_service.cpp b/src/storage/tx_storage/ob_access_service.cpp index 3239d419ea..b15e84055f 100644 --- a/src/storage/tx_storage/ob_access_service.cpp +++ b/src/storage/tx_storage/ob_access_service.cpp @@ -418,7 +418,7 @@ int ObAccessService::get_source_ls_tx_table_guard_( LOG_WARN("start request for transfer failed", KR(ret), K(user_data)); } else { ObStoreCtx &ctx = ctx_guard.get_store_ctx(); - ctx.mvcc_acc_ctx_.set_src_tx_table_guard(src_tx_table_guard, ls_handle); + ctx.mvcc_acc_ctx_.set_src_tx_table_guard(src_tx_table_guard); LOG_DEBUG("succ get src tx table guard", K(ret), K(src_ls->get_ls_id()), K(src_tx_table_guard), K(user_data)); } } diff --git a/src/storage/tx_table/ob_tx_table_guards.h b/src/storage/tx_table/ob_tx_table_guards.h index 12fd72f0f5..f621839f1a 100644 --- a/src/storage/tx_table/ob_tx_table_guards.h +++ b/src/storage/tx_table/ob_tx_table_guards.h @@ -47,8 +47,7 @@ class ObTxTableGuards public: ObTxTableGuards() : tx_table_guard_(), - src_tx_table_guard_(), - src_ls_handle_() {} + src_tx_table_guard_() {} ~ObTxTableGuards() { reset(); } @@ -56,7 +55,6 @@ public: { tx_table_guard_.reset(); src_tx_table_guard_.reset(); - src_ls_handle_.reset(); } void reuse() @@ -151,15 +149,13 @@ public: bool check_ls_offline(); - TO_STRING_KV(K_(tx_table_guard), K_(src_tx_table_guard), K_(src_ls_handle)); + TO_STRING_KV(K_(tx_table_guard), K_(src_tx_table_guard)); public: storage::ObTxTableGuard tx_table_guard_; - // when dml is executing during transfer, src_tx_table_guard_ and - // src_ls_handle_ will be valid. + // dml executed during transfer, src_tx_table_guard_ will be valid. storage::ObTxTableGuard src_tx_table_guard_; - storage::ObLSHandle src_ls_handle_; }; } // namespace storage diff --git a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result index 1e70a2d3fb..4702129762 100644 --- a/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result +++ b/tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result @@ -272,6 +272,7 @@ _datafile_usage_lower_bound_percentage _datafile_usage_upper_bound_percentage _data_storage_io_timeout _delay_resource_recycle_after_correctness_issue +_enable_active_txn_transfer _enable_adaptive_compaction _enable_adaptive_merge_schedule _enable_backtrace_function @@ -312,7 +313,6 @@ _enable_tenant_sql_net_thread _enable_trace_session_leak _enable_trace_tablet_leak _enable_transaction_internal_routing -_enable_transfer_active_tx _enable_values_table_folding _enable_var_assign_use_das _endpoint_tenant_mapping