From f30eb228ce153d6376a63ba9e808aafc5a70e0ae Mon Sep 17 00:00:00 2001 From: Hongqin-Li Date: Tue, 14 Feb 2023 04:44:44 +0000 Subject: [PATCH] Fix ddl kv mgr deadlock(2) --- src/storage/ddl/ob_ddl_clog.cpp | 1 - src/storage/ddl/ob_ddl_redo_log_writer.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/src/storage/ddl/ob_ddl_clog.cpp b/src/storage/ddl/ob_ddl_clog.cpp index 30c5f43b7..4995a4e05 100644 --- a/src/storage/ddl/ob_ddl_clog.cpp +++ b/src/storage/ddl/ob_ddl_clog.cpp @@ -183,7 +183,6 @@ int ObDDLMacroBlockClogCb::on_success() ObDDLMacroBlock macro_block; ObLSHandle ls_handle; ObTabletHandle tablet_handle; - ddl_kv_mgr_handle_.get_obj()->unlock(lock_tid_); // unlock first, because set_macro_block need to acquire this lock { ObSpinLockGuard data_buffer_guard(data_buffer_lock_); if (is_data_buffer_freed_) { diff --git a/src/storage/ddl/ob_ddl_redo_log_writer.cpp b/src/storage/ddl/ob_ddl_redo_log_writer.cpp index 6da272677..b41227a73 100644 --- a/src/storage/ddl/ob_ddl_redo_log_writer.cpp +++ b/src/storage/ddl/ob_ddl_redo_log_writer.cpp @@ -637,7 +637,6 @@ int ObDDLRedoLogWriter::write( } else { handle.cb_ = cb; cb = nullptr; - lock_tid = 0; handle.scn_ = scn; LOG_INFO("submit ddl redo log succeed", K(lsn), K(base_scn), K(scn)); }