From 4cc2f4b53bb25a3b4a359915180b65331f874201 Mon Sep 17 00:00:00 2001 From: fengdeyiji <546976189@qq.com> Date: Mon, 3 Jul 2023 08:18:13 +0000 Subject: [PATCH] [MDS] fix mds_ctx must call on_abort bug when destroy --- src/storage/multi_data_source/mds_ctx.cpp | 3 ++- src/storage/ob_sync_tablet_seq_clog.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/multi_data_source/mds_ctx.cpp b/src/storage/multi_data_source/mds_ctx.cpp index 17bcab203..0a4409452 100644 --- a/src/storage/multi_data_source/mds_ctx.cpp +++ b/src/storage/multi_data_source/mds_ctx.cpp @@ -33,8 +33,9 @@ MdsCtx::~MdsCtx() bool list_empty = false; { MdsWLockGuard lg(lock_); - bool list_empty = write_list_.empty(); + list_empty = write_list_.empty(); if (!list_empty) { + OB_ASSERT(state_ != TwoPhaseCommitState::ON_COMMIT);// if decided, list is empty MDS_LOG_RET(INFO, OB_SUCCESS, "nodes not commit or abort when mds ctx destroyed", K(*this)); } } diff --git a/src/storage/ob_sync_tablet_seq_clog.cpp b/src/storage/ob_sync_tablet_seq_clog.cpp index 56210cc74..1e1a7eab5 100644 --- a/src/storage/ob_sync_tablet_seq_clog.cpp +++ b/src/storage/ob_sync_tablet_seq_clog.cpp @@ -131,8 +131,8 @@ int ObSyncTabletSeqMdsLogCb::on_success() { int ret = OB_SUCCESS; ret_code_ = ret; - state_ = STATE_SUCCESS; mds_ctx_.single_log_commit(__get_scn(), __get_scn()); + state_ = STATE_SUCCESS; try_release(); return ret; }