hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert [BUG]maintain ls reference for transfer read

Browse Source
This commit is contained in:
Handora
2024-02-10 03:16:25 +00:00
committed by ob-robot
parent 8c5bdce48b
commit c700eca927
6 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/parameter/ob_parameter_seed.ipp
View File

@ -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" "Threshold for the count of tablets that can be processed by a transfer task"
"Range: (0, 100]", "Range: (0, 100]",
ObParameterAttr(Section::ROOT_SERVICE, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); 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", "Specifies whether support transfer active tx",
ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE)); ObParameterAttr(Section::TENANT, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
// end of transfer // end of transfer

2
src/storage/high_availability/ob_transfer_handler.cpp
View File

@ -2672,7 +2672,7 @@ int enable_new_transfer(bool &enable)
LOG_INFO("[TRANSFER] get min data version failed", K(ret)); LOG_INFO("[TRANSFER] get min data version failed", K(ret));
} else if (DATA_VERSION_4_3_0_0 > data_version) { } else if (DATA_VERSION_4_3_0_0 > data_version) {
enable = false; enable = false;
} else if (!tenant_config->_enable_transfer_active_tx) { } else if (!tenant_config->_enable_active_txn_transfer) {
enable = false; enable = false;
} else { } else {
enable = true; enable = true;

4
src/storage/memtable/mvcc/ob_mvcc_acc_ctx.h
View File

@ -169,11 +169,9 @@ public:
write_flag_ = write_flag; write_flag_ = write_flag;
} }
void set_src_tx_table_guard(const storage::ObTxTableGuard &tx_table_guard, void set_src_tx_table_guard(const storage::ObTxTableGuard &tx_table_guard)
storage::ObLSHandle &src_ls_handle)
{ {
tx_table_guards_.src_tx_table_guard_ = 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, void init_replay(transaction::ObPartTransCtx &tx_ctx,
ObMemtableCtx &mem_ctx, ObMemtableCtx &mem_ctx,

2
src/storage/tx_storage/ob_access_service.cpp
View File

@ -418,7 +418,7 @@ int ObAccessService::get_source_ls_tx_table_guard_(
LOG_WARN("start request for transfer failed", KR(ret), K(user_data)); LOG_WARN("start request for transfer failed", KR(ret), K(user_data));
} else { } else {
ObStoreCtx &ctx = ctx_guard.get_store_ctx(); 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)); LOG_DEBUG("succ get src tx table guard", K(ret), K(src_ls->get_ls_id()), K(src_tx_table_guard), K(user_data));
} }
} }

10
src/storage/tx_table/ob_tx_table_guards.h
View File

@ -47,8 +47,7 @@ class ObTxTableGuards
public: public:
ObTxTableGuards() ObTxTableGuards()
: tx_table_guard_(), : tx_table_guard_(),
src_tx_table_guard_(), src_tx_table_guard_() {}
src_ls_handle_() {}
~ObTxTableGuards() { reset(); } ~ObTxTableGuards() { reset(); }
@ -56,7 +55,6 @@ public:
{ {
tx_table_guard_.reset(); tx_table_guard_.reset();
src_tx_table_guard_.reset(); src_tx_table_guard_.reset();
src_ls_handle_.reset();
} }
void reuse() void reuse()
@ -151,15 +149,13 @@ public:
bool check_ls_offline(); 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: public:
storage::ObTxTableGuard tx_table_guard_; storage::ObTxTableGuard tx_table_guard_;
// when dml is executing during transfer, src_tx_table_guard_ and // dml executed during transfer, src_tx_table_guard_ will be valid.
// src_ls_handle_ will be valid.
storage::ObTxTableGuard src_tx_table_guard_; storage::ObTxTableGuard src_tx_table_guard_;
storage::ObLSHandle src_ls_handle_;
}; };
} // namespace storage } // namespace storage

2
tools/deploy/mysql_test/test_suite/inner_table/r/mysql/all_virtual_sys_parameter_stat.result
View File

@ -272,6 +272,7 @@ _datafile_usage_lower_bound_percentage
_datafile_usage_upper_bound_percentage _datafile_usage_upper_bound_percentage
_data_storage_io_timeout _data_storage_io_timeout
_delay_resource_recycle_after_correctness_issue _delay_resource_recycle_after_correctness_issue
_enable_active_txn_transfer
_enable_adaptive_compaction _enable_adaptive_compaction
_enable_adaptive_merge_schedule _enable_adaptive_merge_schedule
_enable_backtrace_function _enable_backtrace_function
@ -312,7 +313,6 @@ _enable_tenant_sql_net_thread
_enable_trace_session_leak _enable_trace_session_leak
_enable_trace_tablet_leak _enable_trace_tablet_leak
_enable_transaction_internal_routing _enable_transaction_internal_routing
_enable_transfer_active_tx
_enable_values_table_folding _enable_values_table_folding
_enable_var_assign_use_das _enable_var_assign_use_das
_endpoint_tenant_mapping _endpoint_tenant_mapping