diff --git a/src/observer/virtual_table/ob_all_disk_stat.h b/src/observer/virtual_table/ob_all_disk_stat.h index 127c24fbdb..e1ad671832 100644 --- a/src/observer/virtual_table/ob_all_disk_stat.h +++ b/src/observer/virtual_table/ob_all_disk_stat.h @@ -13,9 +13,9 @@ #ifndef OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_DISK_STAT_TABLE_ #define OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_DISK_STAT_TABLE_ -#include "share/ob_virtual_table_scanner_iterator.h" - - +#include "share/ob_virtual_table_scanner_iterator.h" + + namespace oceanbase { namespace common @@ -39,9 +39,9 @@ public: private: enum DISK_COLUMN { - SVR_IP = common::OB_APP_MIN_COLUMN_ID, - SVR_PORT, - TOTAL_SIZE, + SVR_IP = common::OB_APP_MIN_COLUMN_ID, + SVR_PORT, + TOTAL_SIZE, USED_SIZE, FREE_SIZE, IS_DISK_VALID, @@ -50,9 +50,9 @@ private: }; common::ObAddr *addr_; common::ObString ipstr_; - int32_t port_; - bool is_end_; - DISALLOW_COPY_AND_ASSIGN(ObInfoSchemaDiskStatTable); + int32_t port_; + bool is_end_; + DISALLOW_COPY_AND_ASSIGN(ObInfoSchemaDiskStatTable); }; } diff --git a/src/storage/blocksstable/ob_tmp_file_cache.cpp b/src/storage/blocksstable/ob_tmp_file_cache.cpp index 547e2abf24..0eb85afea9 100644 --- a/src/storage/blocksstable/ob_tmp_file_cache.cpp +++ b/src/storage/blocksstable/ob_tmp_file_cache.cpp @@ -1140,6 +1140,10 @@ int ObTmpTenantMemBlockManager::wash_block(ObTmpMacroBlock *wash_block, bool &is STORAGE_LOG(INFO, "succeed to wash a block", K(*wash_block)); } } + + if (OB_FAIL(ret)) { + mb_handle.reset(); + } } } else { STORAGE_LOG(INFO, "this block has some the unclosed extent", K(*wash_block));