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

[CP] Complete the object storage IO timeout

Browse Source
This commit is contained in:
obdev 2024-11-04 10:13:36 +00:00 committed by ob-robot
parent 20be478908
commit 5908fe85b7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,7 +250,7 @@ private:
template<typename RequestType, typename OutcomeType>
int do_s3_operation_(S3OperationFunc<RequestType, OutcomeType> s3_op_func,
const RequestType &request, OutcomeType &outcome,
const int64_t retry_timeout_us = OB_STORAGE_MAX_IO_TIMEOUT_US);
const int64_t retry_timeout_us = ObObjectStorageTenantGuard::get_timeout_us());
private:
SpinRWLock lock_;

8
src/share/backup/ob_backup_io_adapter.cpp
View File

@ -113,6 +113,8 @@ int ObBackupIoAdapter::open_with_access_type(ObIODevice*& device_handle, ObIOFd
iod_opts.opt_cnt_++;
}
ObObjectStorageTenantGuard object_storage_tenant_guard(
get_tenant_id(), OB_IO_MANAGER.get_object_storage_io_timeout_ms(get_tenant_id()) * 1000LL);
ObArenaAllocator allocator(OB_STORAGE_IO_ADAPTER);
char *uri_cstr = nullptr;
if (OB_FAIL(ob_dup_cstring(allocator, uri, uri_cstr))) {
@ -273,6 +275,8 @@ int ObBackupIoAdapter::batch_del_files(
ObIArray<int64_t> &failed_files_idx)
{
int ret = OB_SUCCESS;
ObObjectStorageTenantGuard object_storage_tenant_guard(
get_tenant_id(), OB_IO_MANAGER.get_object_storage_io_timeout_ms(get_tenant_id()) * 1000LL);
ObIODevice *device_handle = nullptr;
if (OB_UNLIKELY(files_to_delete.empty())) {
ret = OB_INVALID_ARGUMENT;
@ -496,6 +500,8 @@ int ObBackupIoAdapter::async_upload_data(
int ObBackupIoAdapter::complete(common::ObIODevice &device_handle, common::ObIOFd &fd)
{
int ret = OB_SUCCESS;
ObObjectStorageTenantGuard object_storage_tenant_guard(
get_tenant_id(), OB_IO_MANAGER.get_object_storage_io_timeout_ms(get_tenant_id()) * 1000LL);
int flag = -1;
ObFdSimulator::get_fd_flag(fd, flag);
fd.device_handle_ = &device_handle;
@ -522,6 +528,8 @@ int ObBackupIoAdapter::complete(common::ObIODevice &device_handle, common::ObIOF
int ObBackupIoAdapter::abort(common::ObIODevice &device_handle, common::ObIOFd &fd)
{
int ret = OB_SUCCESS;
ObObjectStorageTenantGuard object_storage_tenant_guard(
get_tenant_id(), OB_IO_MANAGER.get_object_storage_io_timeout_ms(get_tenant_id()) * 1000LL);
int flag = -1;
ObFdSimulator::get_fd_flag(fd, flag);
if ((ObStorageAccessType::OB_STORAGE_ACCESS_DIRECT_MULTIPART_WRITER != flag)