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

Fix mb handle not rollback

Browse Source
This commit is contained in:
obdev
2023-04-27 02:10:57 +00:00
committed by ob-robot
parent 2293904cc0
commit f59bb29409
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/observer/virtual_table/ob_all_disk_stat.h
View File

@ -13,9 +13,9 @@
#ifndef OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_DISK_STAT_TABLE_ #ifndef OCEANBASE_OBSERVER_VIRTUAL_TABLE_OB_DISK_STAT_TABLE_
#define 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 oceanbase
{ {
namespace common namespace common
@ -39,9 +39,9 @@ public:
private: private:
enum DISK_COLUMN enum DISK_COLUMN
{ {
SVR_IP = common::OB_APP_MIN_COLUMN_ID, SVR_IP = common::OB_APP_MIN_COLUMN_ID,
SVR_PORT, SVR_PORT,
TOTAL_SIZE, TOTAL_SIZE,
USED_SIZE, USED_SIZE,
FREE_SIZE, FREE_SIZE,
IS_DISK_VALID, IS_DISK_VALID,
@ -50,9 +50,9 @@ private:
}; };
common::ObAddr *addr_; common::ObAddr *addr_;
common::ObString ipstr_; common::ObString ipstr_;
int32_t port_; int32_t port_;
bool is_end_; bool is_end_;
DISALLOW_COPY_AND_ASSIGN(ObInfoSchemaDiskStatTable); DISALLOW_COPY_AND_ASSIGN(ObInfoSchemaDiskStatTable);
}; };
} }

4
src/storage/blocksstable/ob_tmp_file_cache.cpp
View File

@ -1140,6 +1140,10 @@ int ObTmpTenantMemBlockManager::wash_block(ObTmpMacroBlock *wash_block, bool &is
STORAGE_LOG(INFO, "succeed to wash a block", K(*wash_block)); STORAGE_LOG(INFO, "succeed to wash a block", K(*wash_block));
} }
} }
if (OB_FAIL(ret)) {
mb_handle.reset();
}
} }
} else { } else {
STORAGE_LOG(INFO, "this block has some the unclosed extent", K(*wash_block)); STORAGE_LOG(INFO, "this block has some the unclosed extent", K(*wash_block));