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

[FIX] serialize tx ctx in tx ctx lock

Browse Source
This commit is contained in:
ZenoWang 2023-08-11 02:12:53 +00:00 committed by ob-robot
parent b56b811398
commit 115f639cd5
5 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mittest/simple_server/test_tx_ctx_table_mit.cpp
View File

@ -58,8 +58,9 @@ using namespace share;
namespace storage namespace storage
{ {
int ObTxCtxMemtableScanIterator::get_next_tx_ctx_table_info_(transaction::ObPartTransCtx *&tx_ctx, int ObTxCtxMemtableScanIterator::serialize_next_tx_ctx_(ObTxLocalBuffer &buffer,
ObTxCtxTableInfo &ctx_info) int64_t &serialize_size,
transaction::ObPartTransCtx *&tx_ctx)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
bool need_retry = true; bool need_retry = true;
@ -69,7 +70,7 @@ int ObTxCtxMemtableScanIterator::get_next_tx_ctx_table_info_(transaction::ObPart
if (OB_ITER_END != ret) { if (OB_ITER_END != ret) {
STORAGE_LOG(WARN, "ls_tx_ctx_iter_.get_next_tx_ctx failed", K(ret)); STORAGE_LOG(WARN, "ls_tx_ctx_iter_.get_next_tx_ctx failed", K(ret));
} }
} else if (OB_FAIL(tx_ctx->get_tx_ctx_table_info(ctx_info))) { } else if (OB_FAIL(tx_ctx->serialize_tx_ctx_to_buffer(buffer, serialize_size))) {
if (OB_TRANS_CTX_NOT_EXIST == ret) { if (OB_TRANS_CTX_NOT_EXIST == ret) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
} else { } else {
@ -82,9 +83,9 @@ int ObTxCtxMemtableScanIterator::get_next_tx_ctx_table_info_(transaction::ObPart
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
STORAGE_LOG(INFO, "get next tx ctx table info failed", KR(ret), KPC(tx_ctx), K(ctx_info.tx_data_guard_)); STORAGE_LOG(INFO, "get next tx ctx table info failed", KR(ret), KPC(tx_ctx));
} else if (SLEEP_BEFORE_DUMP_TX_CTX) { } else if (SLEEP_BEFORE_DUMP_TX_CTX) {
fprintf(stdout, "ready to dump tx ctx, undo status node ptr : %p\n", ctx_info.tx_data_guard_.tx_data()->undo_status_list_.head_); fprintf(stdout, "ready to dump tx ctx, undo status node ptr : %p\n", tx_ctx->ctx_tx_data_.tx_data_guard_.tx_data()->undo_status_list_.head_);
fprintf(stdout, "sleep 20 seconds before dump\n"); fprintf(stdout, "sleep 20 seconds before dump\n");
HAS_GOT_TX_CTX = true; HAS_GOT_TX_CTX = true;
SLEEP_BEFORE_DUMP_TX_CTX = false; SLEEP_BEFORE_DUMP_TX_CTX = false;

19
src/storage/tx/ob_trans_part_ctx.cpp
View File

@ -1561,9 +1561,11 @@ int ObPartTransCtx::recover_tx_ctx_table_info(ObTxCtxTableInfo &ctx_info)
} }
// Checkpoint the tx ctx table // Checkpoint the tx ctx table
int ObPartTransCtx::get_tx_ctx_table_info(ObTxCtxTableInfo &info) int ObPartTransCtx::serialize_tx_ctx_to_buffer(ObTxLocalBuffer &buffer, int64_t &serialize_size)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObTxCtxTableInfo ctx_info;
CtxLockGuard guard(lock_); CtxLockGuard guard(lock_);
// 1. Tx ctx has already exited, so it means that it may have no chance to // 1. Tx ctx has already exited, so it means that it may have no chance to
// push its rec_log_ts to aggre_rec_log_ts, so we must not persist it // push its rec_log_ts to aggre_rec_log_ts, so we must not persist it
@ -1586,17 +1588,26 @@ int ObPartTransCtx::get_tx_ctx_table_info(ObTxCtxTableInfo &info)
TRANS_LOG(INFO, "tx ctx is in complete replay ctx", K(ret), KPC(this)); TRANS_LOG(INFO, "tx ctx is in complete replay ctx", K(ret), KPC(this));
} }
// 3. Fetch the current state of the tx ctx table // 3. Fetch the current state of the tx ctx table
} else if (OB_FAIL(get_tx_ctx_table_info_(info))) { } else if (OB_FAIL(get_tx_ctx_table_info_(ctx_info))) {
TRANS_LOG(WARN, "get tx ctx table info failed", K(ret), K(*this)); TRANS_LOG(WARN, "get tx ctx table info failed", K(ret), K(*this));
} else if (OB_UNLIKELY(!info.is_valid())) { } else if (OB_UNLIKELY(!ctx_info.is_valid())) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
TRANS_LOG(WARN, "tx ctx info invalid", K(ret), K(info)); TRANS_LOG(WARN, "tx ctx info invalid", K(ret), K(ctx_info));
// 4. Refresh the rec_log_ts for the next checkpoint // 4. Refresh the rec_log_ts for the next checkpoint
} else if (OB_FAIL(refresh_rec_log_ts_())) { } else if (OB_FAIL(refresh_rec_log_ts_())) {
TRANS_LOG(WARN, "refresh rec log ts failed", K(ret), K(*this)); TRANS_LOG(WARN, "refresh rec log ts failed", K(ret), K(*this));
} else {
// 5. Do serialize
int64_t pos = 0;
serialize_size = ctx_info.get_serialize_size();
if (OB_FAIL(buffer.reserve(serialize_size))) {
TRANS_LOG(WARN, "Failed to reserve local buffer", KR(ret));
} else if (OB_FAIL(ctx_info.serialize(buffer.get_ptr(), serialize_size, pos))) {
TRANS_LOG(WARN, "failed to serialize ctx_info", KR(ret), K(ctx_info), K(pos));
} else { } else {
is_ctx_table_merged_ = true; is_ctx_table_merged_ = true;
} }
}
return ret; return ret;
} }

1
src/storage/tx/ob_trans_part_ctx.h
View File

@ -380,6 +380,7 @@ public:
// get_tx_ctx_table_info returns OB_TRANS_CTX_NOT_EXIST if the tx ctx table need not to be // get_tx_ctx_table_info returns OB_TRANS_CTX_NOT_EXIST if the tx ctx table need not to be
// dumped. // dumped.
int get_tx_ctx_table_info(ObTxCtxTableInfo &info); int get_tx_ctx_table_info(ObTxCtxTableInfo &info);
int serialize_tx_ctx_to_buffer(ObTxLocalBuffer &buffer, int64_t &serialize_size);
int recover_tx_ctx_table_info(ObTxCtxTableInfo &ctx_info); int recover_tx_ctx_table_info(ObTxCtxTableInfo &ctx_info);
// leader switch related // leader switch related

41
src/storage/tx_table/ob_tx_table_iterator.cpp
View File

@ -693,8 +693,9 @@ int ObTxCtxMemtableScanIterator::init(ObTxCtxMemtable *tx_ctx_memtable)
return ret; return ret;
} }
int ObTxCtxMemtableScanIterator::get_next_tx_ctx_table_info_(transaction::ObPartTransCtx *&tx_ctx, int ObTxCtxMemtableScanIterator::serialize_next_tx_ctx_(ObTxLocalBuffer &buffer,
ObTxCtxTableInfo &ctx_info) int64_t &serialize_size,
transaction::ObPartTransCtx *&tx_ctx)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
bool need_retry = true; bool need_retry = true;
@ -704,7 +705,7 @@ int ObTxCtxMemtableScanIterator::get_next_tx_ctx_table_info_(transaction::ObPart
if (OB_ITER_END != ret) { if (OB_ITER_END != ret) {
STORAGE_LOG(WARN, "ls_tx_ctx_iter_.get_next_tx_ctx failed", K(ret)); STORAGE_LOG(WARN, "ls_tx_ctx_iter_.get_next_tx_ctx failed", K(ret));
} }
} else if (OB_FAIL(tx_ctx->get_tx_ctx_table_info(ctx_info))) { } else if (OB_FAIL(tx_ctx->serialize_tx_ctx_to_buffer(buffer, serialize_size))) {
if (OB_TRANS_CTX_NOT_EXIST == ret) { if (OB_TRANS_CTX_NOT_EXIST == ret) {
ret = OB_SUCCESS; ret = OB_SUCCESS;
} else { } else {
@ -724,7 +725,6 @@ int ObTxCtxMemtableScanIterator::inner_get_next_row(const ObDatumRow *&row)
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObTxCtxTableMeta curr_meta; ObTxCtxTableMeta curr_meta;
ObTxCtxTableInfo ctx_info;
transaction::ObPartTransCtx *tx_ctx = NULL; transaction::ObPartTransCtx *tx_ctx = NULL;
char *row_buf = NULL; char *row_buf = NULL;
int64_t need_merge_length = 0; int64_t need_merge_length = 0;
@ -733,10 +733,8 @@ int ObTxCtxMemtableScanIterator::inner_get_next_row(const ObDatumRow *&row)
if (IS_NOT_INIT) { if (IS_NOT_INIT) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "tx ctx memtable scan iterator is not inited"); STORAGE_LOG(WARN, "tx ctx memtable scan iterator is not inited");
} } else if (has_unmerged_buf_) {
// a single row can not hold the whole tx ctx
if (OB_SUCC(ret)) {
if (has_unmerged_buf_) {
row_buf = buf_.get_ptr() + unmerged_buf_start_pos_; row_buf = buf_.get_ptr() + unmerged_buf_start_pos_;
need_merge_length = prev_meta_.get_tx_ctx_serialize_size() - unmerged_buf_start_pos_; need_merge_length = prev_meta_.get_tx_ctx_serialize_size() - unmerged_buf_start_pos_;
if (OB_FAIL(prev_meta_.get_multi_row_next_extent(curr_meta))) { if (OB_FAIL(prev_meta_.get_multi_row_next_extent(curr_meta))) {
@ -744,31 +742,24 @@ int ObTxCtxMemtableScanIterator::inner_get_next_row(const ObDatumRow *&row)
} }
STORAGE_LOG(DEBUG, "write prev tx ctx unmerged buffer", K(prev_meta_)); STORAGE_LOG(DEBUG, "write prev tx ctx unmerged buffer", K(prev_meta_));
} else { } else {
if (OB_FAIL(get_next_tx_ctx_table_info_(tx_ctx, ctx_info))) { // get next tx ctx and serialize it into buffer
int64_t serialize_size = 0;
if (OB_FAIL(serialize_next_tx_ctx_(buf_, serialize_size, tx_ctx))) {
if (OB_ITER_END != ret) { if (OB_ITER_END != ret) {
STORAGE_LOG(WARN, "get_next_tx_ctx_table_info_ failed", K(ret)); STORAGE_LOG(WARN, "get_next_tx_ctx_table_info_ failed", K(ret));
} }
} else { } else {
int64_t serialize_size = ctx_info.get_serialize_size(); (void)curr_meta.init(tx_ctx->get_trans_id(),
curr_meta.init(tx_ctx->get_trans_id(), tx_ctx->get_ls_id(), serialize_size, tx_ctx->get_ls_id(),
// ceil((double)serialize_size / MAX_VALUE_LENGTH_) serialize_size,
(serialize_size + MAX_VALUE_LENGTH_ - 1) / MAX_VALUE_LENGTH_, 0); (serialize_size + MAX_VALUE_LENGTH_ - 1) / MAX_VALUE_LENGTH_ /* row_num */,
if (OB_FAIL(buf_.reserve(serialize_size))) { 0 /* row_idx */);
STORAGE_LOG(WARN, "Failed to reserve local buffer", KR(ret));
} else {
int64_t pos = 0;
if (OB_FAIL(ctx_info.serialize(buf_.get_ptr(), serialize_size, pos))) {
STORAGE_LOG(WARN, "failed to serialize ctx_info", KR(ret), K(ctx_info), K(pos));
} else {
row_buf = buf_.get_ptr(); row_buf = buf_.get_ptr();
need_merge_length = serialize_size; need_merge_length = serialize_size;
} STORAGE_LOG(DEBUG, "write tx ctx info", KPC(tx_ctx), K(serialize_size));
}
STORAGE_LOG(DEBUG, "write tx ctx info", K(ctx_info), K(serialize_size));
ls_tx_ctx_iter_.revert_tx_ctx(tx_ctx); ls_tx_ctx_iter_.revert_tx_ctx(tx_ctx);
} }
} }
}
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
if (need_merge_length > MAX_VALUE_LENGTH_) { if (need_merge_length > MAX_VALUE_LENGTH_) {
@ -814,7 +805,7 @@ int ObTxCtxMemtableScanIterator::inner_get_next_row(const ObDatumRow *&row)
row_.set_last_multi_version_row(); row_.set_last_multi_version_row();
row_.set_compacted_multi_version_row(); row_.set_compacted_multi_version_row();
row = &row_; row = &row_;
STORAGE_LOG(DEBUG, "write tx ctx info", K(ctx_info), K(idx_), K(curr_meta)); STORAGE_LOG(DEBUG, "write tx ctx info", K(idx_), K(curr_meta));
idx_++; idx_++;
} }

4
src/storage/tx_table/ob_tx_table_iterator.h
View File

@ -265,8 +265,8 @@ public:
return ret; return ret;
} }
private: private:
int get_next_tx_ctx_table_info_(transaction::ObPartTransCtx *&tx_ctx, int serialize_next_tx_ctx_(ObTxLocalBuffer &buffer, int64_t &serialize_size, transaction::ObPartTransCtx *&tx_ctx);
ObTxCtxTableInfo &ctx_info);
private: private:
const static int64_t TX_CTX_META_BUF_LENGTH = 256; const static int64_t TX_CTX_META_BUF_LENGTH = 256;
const static int64_t TX_CTX_BUF_LENGTH = 1000; const static int64_t TX_CTX_BUF_LENGTH = 1000;