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

Fix ls migration set restore status ad RESTORE_START when tenant is in restore

Browse Source
This commit is contained in:
godyangfight
2023-02-21 04:41:34 +00:00
committed by ob-robot
parent af05444205
commit 4b19529f62
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/storage/tx_storage/ob_ls_service.cpp
View File

@ -29,6 +29,7 @@
#include "storage/tx_storage/ob_ls_map.h" #include "storage/tx_storage/ob_ls_map.h"
#include "storage/tx/ob_trans_service.h" #include "storage/tx/ob_trans_service.h"
#include "storage/tx_storage/ob_ls_handle.h" //ObLSHandle #include "storage/tx_storage/ob_ls_handle.h" //ObLSHandle
#include "rootserver/ob_tenant_info_loader.h"
namespace oceanbase namespace oceanbase
{ {
@ -1003,6 +1004,8 @@ int ObLSService::create_ls_for_ha(
LOG_WARN("ls waiting for destroy, need retry later", K(ret), K(arg)); LOG_WARN("ls waiting for destroy, need retry later", K(ret), K(arg));
} else if (OB_FAIL(ObMigrationStatusHelper::trans_migration_op(arg.type_, migration_status))) { } else if (OB_FAIL(ObMigrationStatusHelper::trans_migration_op(arg.type_, migration_status))) {
LOG_WARN("failed to trans migration op", K(ret), K(arg), K(task_id)); LOG_WARN("failed to trans migration op", K(ret), K(arg), K(task_id));
} else if (OB_FAIL(get_restore_status_(restore_status))) {
LOG_WARN("failed to get restore status", K(ret), K(arg), K(task_id));
} else if (OB_FAIL(inner_create_ls_(arg.ls_id_, } else if (OB_FAIL(inner_create_ls_(arg.ls_id_,
arg.dst_.get_replica_type(), arg.dst_.get_replica_type(),
migration_status, migration_status,
@ -1285,6 +1288,32 @@ int ObLSService::iterate_diagnose(const ObFunction<int(const storage::ObLS &ls)>
return ret; return ret;
} }
int ObLSService::get_restore_status_(
share::ObLSRestoreStatus &restore_status)
{
int ret = OB_SUCCESS;
const uint64_t tenant_id = MTL_ID();
rootserver::ObTenantInfoLoader *tenant_info_loader = MTL(rootserver::ObTenantInfoLoader*);
share::ObAllTenantInfo tenant_info;
restore_status = ObLSRestoreStatus::RESTORE_NONE;
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("not init", K(ret));
} else if (OB_ISNULL(tenant_info_loader)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("tenant info loader should not be NULL", K(ret), KP(tenant_info_loader));
} else if (is_sys_tenant(tenant_id) || is_meta_tenant(tenant_id)) {
restore_status = ObLSRestoreStatus::RESTORE_NONE;
} else if (OB_FAIL(tenant_info_loader->get_tenant_info(tenant_info))) {
LOG_WARN("failed to get tenant info", K(ret));
} else if (FALSE_IT(restore_status = tenant_info.is_restore() ?
ObLSRestoreStatus::RESTORE_START : ObLSRestoreStatus::RESTORE_NONE)) {
}
return ret;
}
} // storage } // storage
} // oceanbase } // oceanbase

2
src/storage/tx_storage/ob_ls_service.h
View File

@ -178,6 +178,8 @@ private:
int alloc_ls_(ObLS *&ls); int alloc_ls_(ObLS *&ls);
bool is_ls_to_restore_(const obrpc::ObCreateLSArg &arg) const; bool is_ls_to_restore_(const obrpc::ObCreateLSArg &arg) const;
bool need_create_inner_tablets_(const obrpc::ObCreateLSArg &arg) const; bool need_create_inner_tablets_(const obrpc::ObCreateLSArg &arg) const;
int get_restore_status_(
share::ObLSRestoreStatus &restore_status);
private: private:
bool is_inited_; bool is_inited_;