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

fix fetch log print core

Browse Source
This commit is contained in:
obdev
2023-01-28 20:25:18 +08:00
committed by ob-robot
parent f8c8061bfa
commit 84e0aa0cfc
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/logservice/restoreservice/ob_remote_fetch_log_worker.cpp
View File

@ -171,7 +171,7 @@ int ObRemoteFetchWorker::submit_fetch_log_task(ObFetchLogTask *task)
} else if (OB_FAIL(task_queue_.push(task))) { } else if (OB_FAIL(task_queue_.push(task))) {
LOG_WARN("push task failed", K(ret), KPC(task)); LOG_WARN("push task failed", K(ret), KPC(task));
} else { } else {
LOG_TRACE("submit_fetch_log_task succ", KPC(task)); LOG_TRACE("submit_fetch_log_task succ", KP(task));
} }
return ret; return ret;
} }
@ -256,9 +256,9 @@ int ObRemoteFetchWorker::handle_single_task_()
} else { } else {
ObFetchLogTask *task = static_cast<ObFetchLogTask *>(data); ObFetchLogTask *task = static_cast<ObFetchLogTask *>(data);
ObLSID id = task->id_; ObLSID id = task->id_;
// after // after task handle, DON'T print it any more
if (OB_FAIL(handle_fetch_log_task_(task))) { if (OB_FAIL(handle_fetch_log_task_(task))) {
LOG_WARN("handle fetch log task failed", K(ret), KPC(task)); LOG_WARN("handle fetch log task failed", K(ret), KP(task), K(id));
} }
// only fatal error report fail, retry with others // only fatal error report fail, retry with others
@ -306,7 +306,7 @@ int ObRemoteFetchWorker::handle_fetch_log_task_(ObFetchLogTask *task)
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
task->iter_.update_source_cb(); task->iter_.update_source_cb();
if (OB_SUCCESS != (tmp_ret = try_retire_(task))) { if (OB_SUCCESS != (tmp_ret = try_retire_(task))) {
LOG_WARN("retire task failed", K(tmp_ret), KPC(task)); LOG_WARN("retire task failed", K(tmp_ret), KP(task));
} }
} }
@ -409,6 +409,7 @@ int ObRemoteFetchWorker::push_submit_array_(ObFetchLogTask &task)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const ObLSID &id = task.id_; const ObLSID &id = task.id_;
DEBUG_SYNC(BEFORE_RESTORE_SERVICE_PUSH_FETCH_DATA);
GET_RESTORE_HANDLER_CTX(id) { GET_RESTORE_HANDLER_CTX(id) {
if (OB_FAIL(restore_handler->submit_sorted_task(task))) { if (OB_FAIL(restore_handler->submit_sorted_task(task))) {
LOG_WARN("submit sort task failed", K(ret), K(task)); LOG_WARN("submit sort task failed", K(ret), K(task));
@ -496,7 +497,7 @@ int ObRemoteFetchWorker::foreach_ls_(const ObLSID &id)
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
task->iter_.update_source_cb(); task->iter_.update_source_cb();
if (OB_SUCCESS != (tmp_ret = try_retire_(task))) { if (OB_SUCCESS != (tmp_ret = try_retire_(task))) {
LOG_WARN("retire task failed", K(tmp_ret), KPC(task)); LOG_WARN("retire task failed", K(tmp_ret), KP(task));
} }
} }
} }

1
src/share/ob_debug_sync_point.h
View File

@ -444,6 +444,7 @@ class ObString;
ACT(BEFORE_SET_LS_MEMBER_LIST,)\ ACT(BEFORE_SET_LS_MEMBER_LIST,)\
ACT(BEFORE_MIGRATION_FETCH_TABLET_INFO,)\ ACT(BEFORE_MIGRATION_FETCH_TABLET_INFO,)\
ACT(BEFORE_BUILD_TABLET_GROUP_INFO,)\ ACT(BEFORE_BUILD_TABLET_GROUP_INFO,)\
ACT(BEFORE_RESTORE_SERVICE_PUSH_FETCH_DATA,)\
ACT(MAX_DEBUG_SYNC_POINT,) ACT(MAX_DEBUG_SYNC_POINT,)
DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF); DECLARE_ENUM(ObDebugSyncPoint, debug_sync_point, OB_DEBUG_SYNC_POINT_DEF);