From a41c97afedac7686b38ee00a8874953e3a73f641 Mon Sep 17 00:00:00 2001 From: Tyshawn Date: Tue, 8 Nov 2022 15:05:34 +0000 Subject: [PATCH] [BUG.FIX] fix resize datafile when it comes to failure. --- src/storage/meta_mem/ob_meta_pointer_map.h | 2 +- src/storage/slog/ob_storage_logger_manager.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/storage/meta_mem/ob_meta_pointer_map.h b/src/storage/meta_mem/ob_meta_pointer_map.h index 5fc8d0437..e9c4a5aca 100644 --- a/src/storage/meta_mem/ob_meta_pointer_map.h +++ b/src/storage/meta_mem/ob_meta_pointer_map.h @@ -567,7 +567,7 @@ int ObMetaPointerMap::get_meta_obj_with_external_memory( if (REACH_TIME_INTERVAL(1000000)) { STORAGE_LOG(WARN, "disk address change", K(ret), K(disk_addr), KPC(t_ptr)); } - } else if (t->deserialize_post_work()) { + } else if (OB_FAIL(t->deserialize_post_work())) { STORAGE_LOG(WARN, "fail to deserialize post work", K(ret), KP(t)); } else if (OB_FAIL(t->assign_pointer_handle(ptr_hdl))) { STORAGE_LOG(WARN, "fail to assign pointer handle", K(ret), KP(t)); diff --git a/src/storage/slog/ob_storage_logger_manager.cpp b/src/storage/slog/ob_storage_logger_manager.cpp index e6acc9083..bac71a335 100644 --- a/src/storage/slog/ob_storage_logger_manager.cpp +++ b/src/storage/slog/ob_storage_logger_manager.cpp @@ -329,6 +329,9 @@ int ObStorageLoggerManager::get_using_disk_space(int64_t &using_space) const using_space += tenant_using_size; } } + if (OB_TENANT_NOT_IN_SERVER == ret) { + ret = OB_SUCCESS; + } } } return ret;