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

[Fix] Remove duplicate protobuf and add sts_credential check in restore progress

Browse Source
This commit is contained in:
obdev 2024-11-23 23:45:31 +00:00 committed by ob-robot
parent 59ca0956cb
commit d84a8b3e65
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/init/oceanbase.el7.aarch64.deps vendored
View File

@ -29,7 +29,6 @@ devdeps-boost-1.74.0-22022110914.el7.aarch64.rpm
devdeps-s2geometry-0.9.0-12023092021.el7.aarch64.rpm
devdeps-icu-69.1-72022112416.el7.aarch64.rpm
devdeps-cos-c-sdk-5.0.21-202024080916.el7.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el7.aarch64.rpm
devdeps-s3-cpp-sdk-1.11.156-102023122011.el7.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el7.aarch64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.aarch64.rpm

1
deps/init/oceanbase.el7.x86_64.deps vendored
View File

@ -32,7 +32,6 @@ devdeps-s2geometry-0.9.0-12023092021.el7.x86_64.rpm
devdeps-icu-69.1-72022112416.el7.x86_64.rpm
devdeps-cloud-qpl-1.1.0-272023061419.el7.x86_64.rpm
devdeps-cos-c-sdk-5.0.21-202024080916.el7.x86_64.rpm
devdeps-protobuf-c-1.4.1-100000062023102016.el7.x86_64.rpm
devdeps-s3-cpp-sdk-1.11.156-102023122011.el7.x86_64.rpm
devdeps-protobuf-c-1.4.1-100000062023102016.el7.x86_64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el7.x86_64.rpm

1
deps/init/oceanbase.el8.aarch64.deps vendored
View File

@ -29,7 +29,6 @@ devdeps-boost-1.74.0-22022110914.el8.aarch64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.aarch64.rpm
devdeps-icu-69.1-72022112416.el8.aarch64.rpm
devdeps-cos-c-sdk-5.0.21-202024080916.el8.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.aarch64.rpm
devdeps-protobuf-c-1.4.1-100000072023102410.el8.aarch64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.aarch64.rpm

1
deps/init/oceanbase.el8.x86_64.deps vendored
View File

@ -30,7 +30,6 @@ devdeps-boost-1.74.0-22022110914.el8.x86_64.rpm
devdeps-s2geometry-0.9.0-12023092021.el8.x86_64.rpm
devdeps-icu-69.1-72022112416.el8.x86_64.rpm
devdeps-cos-c-sdk-5.0.21-202024080916.el8.x86_64.rpm
devdeps-protobuf-c-1.4.1-100000062023102016.el8.x86_64.rpm
devdeps-s3-cpp-sdk-1.11.156-102023122011.el8.x86_64.rpm
devdeps-protobuf-c-1.4.1-100000062023102016.el8.x86_64.rpm
devdeps-roaringbitmap-croaring-3.0.0-42024042816.el8.x86_64.rpm

3
deps/oblib/src/lib/restore/ob_storage_info.cpp vendored
View File

@ -502,8 +502,7 @@ int ObObjectStorageInfo::parse_storage_info_(const char *storage_info, bool &has
ret = OB_INVALID_ARGUMENT;
LOG_WARN("cluster version mgr is null", K(ret), KP(cluster_version_mgr_));
} else if (OB_FAIL(cluster_version_mgr_->is_supported_assume_version())) {
LOG_WARN("assume role is not supported in when the mininum version is below 4.2.5",
K(ret), KPC(this));
LOG_WARN("The current version does not support the assume role", K(ret), KPC(this));
} else {
is_assume_role_mode_ = true;
ObObjectStorageCredential credential;

10
src/rootserver/restore/ob_restore_util.cpp
View File

@ -610,9 +610,13 @@ int ObRestoreUtil::fill_sts_credential_(
int ret = OB_SUCCESS;
bool is_valid = false;
if (arg.sts_credential_.empty()) {
//TODO(mingqiao): add format check function from shifangdan
} else if (OB_FAIL(job.set_sts_credential(arg.sts_credential_))) {
LOG_WARN("fail to set sts crendential");
} else {
ObStsCredential tmp_credential;
if (OB_FAIL(check_sts_credential_format(arg.sts_credential_.ptr(), tmp_credential))) {
LOG_WARN("fail to check sts credential format", K(ret), K(arg.sts_credential_));
} else if (OB_FAIL(job.set_sts_credential(arg.sts_credential_))) {
LOG_WARN("fail to set sts crendential", K(ret), K(arg.sts_credential_));
}
}
return ret;
}

3
src/share/ob_device_manager.cpp
View File

@ -137,6 +137,9 @@ int ObDeviceManager::init_devices_env()
OB_LOG(WARN, "fail to init cos storage", K(ret));
} else if (OB_FAIL(init_s3_env())) {
OB_LOG(WARN, "fail to init s3 storage", K(ret));
} else if (OB_FAIL(ObObjectStorageInfo::register_cluster_version_mgr(
&ObClusterVersionMgr::get_instance()))) {
OB_LOG(WARN, "fail to register cluster version mgr", K(ret));
} else if (OB_FAIL(ObStsCredential::register_sts_credential_mgr(
&ObTenantStsCredentialMgr::get_instance()))) {
OB_LOG(WARN, "fail to register sts crendential", K(ret));