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

BUGFIX: fix deadlock at ls gc and migrate

Browse Source
This commit is contained in:
obdev
2022-11-16 04:05:39 +00:00
committed by wangzelin.wzl
parent 9847c3139a
commit 318f835b88
20 changed files with 480 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/storage/high_availability/ob_ls_migration_handler.cpp
View File

@ -932,11 +932,8 @@ int ObLSMigrationHandler::report_meta_table_()
LOG_WARN("failed ot get result", K(ret));
} else if (OB_SUCCESS != result) {
//do nothing
} else {
ObLSLockGuard lock_ls(ls_);
if (OB_FAIL(ls_->report_replica_info())) {
LOG_WARN("failed to report replica info", K(ret), KPC(ls_));
}
} else if (OB_FAIL(ls_->report_replica_info())) {
LOG_WARN("failed to report replica info", K(ret), KPC(ls_));
}
return ret;
}
@ -1179,27 +1176,26 @@ void ObLSMigrationHandler::stop()
}
}
int ObLSMigrationHandler::safe_to_destroy(
bool &is_safe_to_destroy)
void ObLSMigrationHandler::wait(bool &wait_finished)
{
int ret = OB_SUCCESS;
is_safe_to_destroy = false;
wait_finished = false;
ObLSMigrationTask task;
if (OB_FAIL(get_ls_migration_task_(task))) {
if (OB_ENTRY_NOT_EXIST == ret) {
ret = OB_SUCCESS;
is_safe_to_destroy = true;
wait_finished = true;
} else {
LOG_WARN("failed to get ls migration task", K(ret), KPC(ls_));
}
} else {
is_safe_to_destroy = false;
wait_finished = false;
wakeup_();
}
return ret;
}
}
}