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

[CP] Fix the issue with missing error codes

Browse Source
This commit is contained in:
obdev
2024-02-29 03:45:06 +00:00
committed by ob-robot
parent ea50e6a7bd
commit cdd364b244
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deps/oblib/src/lib/restore/ob_storage_oss_base.cpp vendored
View File

@ -2122,12 +2122,12 @@ int ObStorageOssAppendWriter::do_write(const char *buf, const int64_t size, cons
int64_t cur_pos = -1;
char *append_pos_str = (char*)(apr_table_get(resp_headers, OSS_NEXT_APPEND_POSITION));
if (OB_ISNULL(append_pos_str)) {
OB_LOG(WARN, "after append fail, current append pos is not found");
OB_LOG(WARN, "after append fail, current append pos is not found", K(ret));
} else if (OB_TMP_FAIL(c_str_to_int(append_pos_str, cur_pos))) {
OB_LOG(WARN, "after append fail, fail to get append pos",
K(tmp_ret), K(append_pos_str), K_(object));
K(ret), K(tmp_ret), K(append_pos_str), K_(object));
} else {
OB_LOG(WARN, "after append fail, we got the object meta", K(cur_pos));
OB_LOG(WARN, "after append fail, we got the object meta", K(ret), K(cur_pos));
}
}
}

2
deps/oblib/src/lib/restore/ob_storage_s3_base.cpp vendored
View File

@ -948,7 +948,7 @@ int ObStorageS3Base::open(const ObString &uri, ObObjectStorageInfo *storage_info
OB_LOG(WARN, "failed to parse uri", K(ret), K(uri));
} else if (OB_FAIL(storage_info->get_storage_info_str(info_str, sizeof(info_str)))) {
OB_LOG(WARN, "failed to get storage info str", K(ret), KPC(storage_info));
} else if (s3_account_.parse_from(info_str, strlen(info_str))) {
} else if (OB_FAIL(s3_account_.parse_from(info_str, strlen(info_str)))) {
OB_LOG(WARN, "failed to build s3 account", K(ret));
} else if (OB_FAIL(ObS3Env::get_instance().get_or_create_s3_client(s3_account_, s3_client_))) {
OB_LOG(WARN, "faied to get s3 client", K(ret));