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

[Bugfix] migrating sys unit failed

Browse Source
This commit is contained in:
LeonChaoHi
2023-12-05 08:12:19 +00:00
committed by ob-robot
parent 80cb93dc2c
commit d979a20bdc
7 changed files with 75 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/share/ob_rpc_struct.cpp
View File

@ -5863,20 +5863,6 @@ OB_SERIALIZE_MEMBER(ObEstPartResElement, logical_row_count_,
OB_SERIALIZE_MEMBER(ObEstPartRes, index_param_res_);
OB_SERIALIZE_MEMBER(TenantServerUnitConfig,
tenant_id_,
compat_mode_,
unit_config_,
replica_type_,
is_delete_,
if_not_grant_,
unit_id_
#ifdef OB_BUILD_TDE_SECURITY
, with_root_key_
, root_key_
#endif
);
int ObForceSetLSAsSingleReplicaArg::init(const uint64_t tenant_id, const share::ObLSID &ls_id)
{
int ret = OB_SUCCESS;
@ -6293,13 +6279,14 @@ int TenantServerUnitConfig::init(
const uint64_t tenant_id,
const uint64_t unit_id,
const lib::Worker::CompatMode compat_mode,
#ifdef OB_BUILD_TDE_SECURITY
const ObRootKeyResult &root_key,
#endif
const share::ObUnitConfig &unit_config,
const common::ObReplicaType replica_type,
const bool if_not_grant,
const bool is_delete)
const bool is_delete
#ifdef OB_BUILD_TDE_SECURITY
, const ObRootKeyResult &root_key
#endif
)
{
int ret = OB_SUCCESS;
reset();
@ -6348,16 +6335,30 @@ void TenantServerUnitConfig::reset()
tenant_id_ = OB_INVALID_ID;
unit_id_ = OB_INVALID_ID;
compat_mode_ = lib::Worker::CompatMode::INVALID;
#ifdef OB_BUILD_TDE_SECURITY
with_root_key_ = false;
root_key_.reset();
#endif
unit_config_.reset();
replica_type_ = common::ObReplicaType::REPLICA_TYPE_MAX;
if_not_grant_ = false;
is_delete_ = false;
#ifdef OB_BUILD_TDE_SECURITY
with_root_key_ = false;
root_key_.reset();
#endif
}
OB_SERIALIZE_MEMBER(TenantServerUnitConfig,
tenant_id_,
compat_mode_,
unit_config_,
replica_type_,
is_delete_,
if_not_grant_,
unit_id_
#ifdef OB_BUILD_TDE_SECURITY
, with_root_key_
, root_key_
#endif
);
int ObTenantSchemaVersions::add(const int64_t tenant_id, const int64_t schema_version)
{
int ret = OB_SUCCESS;
@ -7172,7 +7173,7 @@ OB_SERIALIZE_MEMBER(ObRootKeyArg, tenant_id_, is_set_, key_type_, root_key_);
int ObRootKeyArg::init_for_get(const uint64_t tenant_id)
{
int ret = OB_SUCCESS;
if (!is_user_tenant(tenant_id)) {
if (!(is_sys_tenant(tenant_id) || is_user_tenant(tenant_id))) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(tenant_id));
} else {
@ -7186,7 +7187,7 @@ int ObRootKeyArg::init(const uint64_t tenant_id, RootKeyType key_type,
ObString &root_key)
{
int ret = OB_SUCCESS;
if (!is_user_tenant(tenant_id)
if (!(is_sys_tenant(tenant_id) || is_user_tenant(tenant_id))
|| RootKeyType::INVALID == key_type) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", KR(ret), K(tenant_id), K(key_type), K(root_key));