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

Fix kill -15 wait ls migration handler bug

Browse Source
This commit is contained in:
godyangfight
2023-06-01 03:11:49 +00:00
committed by ob-robot
parent 1ce7207b1d
commit c27fb22c59
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@
#include "ob_storage_ha_service.h"
#include "share/ls/ob_ls_table_operator.h"
#include "observer/ob_server_event_history_table_operator.h"
#include "observer/omt/ob_tenant.h"
namespace oceanbase
{
@ -1194,8 +1195,17 @@ void ObLSMigrationHandler::wait(bool &wait_finished)
int ret = OB_SUCCESS;
wait_finished = false;
ObLSMigrationTask task;
share::ObTenantBase *tenant_base = MTL_CTX();
omt::ObTenant *tenant = nullptr;
if (OB_FAIL(get_ls_migration_task_(task))) {
if (OB_ISNULL(tenant_base)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant base should not be NULL", K(ret), KP(tenant_base));
} else if (FALSE_IT(tenant = static_cast<omt::ObTenant *>(tenant_base))) {
} else if (tenant->has_stopped()) {
LOG_INFO("tenant has stop, no need wait ls migration handler task finish");
wait_finished = true;
} else if (OB_FAIL(get_ls_migration_task_(task))) {
if (OB_ENTRY_NOT_EXIST == ret) {
ret = OB_SUCCESS;
wait_finished = true;