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

set ddl redo clog timeout

Browse Source
This commit is contained in:
AnimationFan
2024-06-17 21:01:44 +00:00
committed by ob-robot
parent 241569b9a4
commit fd09ea86f1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/ddl/ob_ddl_redo_log_writer.cpp
View File

@ -1232,6 +1232,7 @@ int ObDDLRedoLogWriter::wait_macro_block_log_finish(
const blocksstable::MacroBlockId &macro_block_id) const blocksstable::MacroBlockId &macro_block_id)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t wait_timeout_us = MAX(ObDDLRedoLogHandle::DDL_REDO_LOG_TIMEOUT, GCONF._data_storage_io_timeout * 1);
if (OB_UNLIKELY(!is_inited_)) { if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("ddl redo log writer has not been inited", K(ret)); LOG_WARN("ddl redo log writer has not been inited", K(ret));
@ -1239,7 +1240,7 @@ int ObDDLRedoLogWriter::wait_macro_block_log_finish(
// remote write no need to wait local handle // remote write no need to wait local handle
} else if (OB_UNLIKELY(!ddl_redo_handle_.is_valid())) { } else if (OB_UNLIKELY(!ddl_redo_handle_.is_valid())) {
// no redo log has been written yet // no redo log has been written yet
} else if (OB_FAIL(ddl_redo_handle_.wait())) { } else if (OB_FAIL(ddl_redo_handle_.wait(wait_timeout_us))) {
LOG_WARN("fail to wait io finish", K(ret)); LOG_WARN("fail to wait io finish", K(ret));
} else if (OB_FAIL(ddl_redo_handle_.cb_->get_ret_code())) { } else if (OB_FAIL(ddl_redo_handle_.cb_->get_ret_code())) {
LOG_WARN("ddl redo callback executed failed", K(ret)); LOG_WARN("ddl redo callback executed failed", K(ret));