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

Fix bug that unitmanager hung when creating tenant.

Browse Source
This commit is contained in:
obdev
2024-02-07 06:08:33 +00:00
committed by ob-robot
parent 6f26466a92
commit 7784e69392
16 changed files with 501 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/share/ob_rpc_struct.cpp
View File

@ -5869,7 +5869,12 @@ OB_SERIALIZE_MEMBER(TenantServerUnitConfig,
replica_type_,
is_delete_,
if_not_grant_,
unit_id_);
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)
{
@ -6248,12 +6253,38 @@ OB_SERIALIZE_MEMBER((ObDDLNopOpreatorArg, ObDDLArg),
schema_operation_);
OB_SERIALIZE_MEMBER(ObTenantSchemaVersions, tenant_schema_versions_);
int TenantServerUnitConfig::assign(const TenantServerUnitConfig &other)
{
int ret = OB_SUCCESS;
if (this == &other) {
// do nothing
#ifdef OB_BUILD_TDE_SECURITY
} else if (OB_FAIL(root_key_.assign(other.root_key_))) {
LOG_WARN("failed to assign root_key_", KR(ret));
} else if (FALSE_IT(with_root_key_ = other.with_root_key_)) {
// should not be here
#endif
} else {
tenant_id_ = other.tenant_id_;
unit_id_ = other.unit_id_;
compat_mode_ = other.compat_mode_;
unit_config_ = other.unit_config_;
replica_type_ = other.replica_type_;
if_not_grant_ = other.if_not_grant_;
is_delete_ = other.is_delete_;
}
return ret;
}
bool TenantServerUnitConfig::is_valid() const
{
return common::OB_INVALID_ID != tenant_id_
&& ((lib::Worker::CompatMode::INVALID != compat_mode_
&& unit_config_.is_valid()
&& replica_type_ != common::ObReplicaType::REPLICA_TYPE_MAX)
#ifdef OB_BUILD_TDE_SECURITY
// root_key can be invalid
#endif
|| (is_delete_));
}
@ -6261,16 +6292,26 @@ 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)
{
int ret = OB_SUCCESS;
reset();
if (OB_UNLIKELY(OB_INVALID_ID == tenant_id)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant_id", K(ret), K(tenant_id));
LOG_WARN("invalid tenant_id", KR(ret), K(tenant_id));
// do not check others validation, since their validations vary
#ifdef OB_BUILD_TDE_SECURITY
} else if (OB_FAIL(root_key_.assign(root_key))) {
LOG_WARN("failed to assign root_key", KR(ret));
} else if (FALSE_IT(with_root_key_ = true)) {
// should not be here
#endif
} else {
tenant_id_ = tenant_id;
unit_id_ = unit_id;
@ -6283,6 +6324,39 @@ int TenantServerUnitConfig::init(
return ret;
}
int TenantServerUnitConfig::init_for_dropping(const uint64_t tenant_id,
const bool is_delete)
{
int ret = OB_SUCCESS;
reset();
if (OB_UNLIKELY(OB_INVALID_ID == tenant_id)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid tenant_id", KR(ret), K(tenant_id));
} else if (OB_UNLIKELY(!is_delete)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("is_delete should be true, while false is given", KR(ret), K(tenant_id), K(is_delete));
} else {
tenant_id_ = tenant_id;
is_delete_ = true;
}
return ret;
}
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;
}
int ObTenantSchemaVersions::add(const int64_t tenant_id, const int64_t schema_version)
{
int ret = OB_SUCCESS;
@ -7174,6 +7248,12 @@ int ObRootKeyResult::assign(const ObRootKeyResult &other)
}
return ret;
}
void ObRootKeyResult::reset()
{
key_type_ = RootKeyType::INVALID;
root_key_.reset();
}
#endif
OB_SERIALIZE_MEMBER(ObTrxToolArg, trans_id_, status_,
trans_version_, end_log_ts_, cmd_);