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

fix error log

Browse Source
This commit is contained in:
nroskill
2024-01-12 12:44:05 +00:00
committed by ob-robot
parent 714296f31b
commit b5d1b46271
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/io/io_schedule/ob_io_mclock.h
View File

@ -63,7 +63,7 @@ public:
int init(const ObTenantIOConfig &io_config, const ObIOUsage *io_usage); int init(const ObTenantIOConfig &io_config, const ObIOUsage *io_usage);
void destroy(); void destroy();
int calc_phyqueue_clock(ObPhyQueue *phy_queue, ObIORequest &req); int calc_phyqueue_clock(ObPhyQueue *phy_queue, ObIORequest &req);
int sync_clocks(ObIArray<ObTenantIOClock *> &io_clocks); static int sync_clocks(ObIArray<ObTenantIOClock *> &io_clocks);
int sync_tenant_clock(ObTenantIOClock *ioclock); int sync_tenant_clock(ObTenantIOClock *ioclock);
int adjust_clocks(ObPhyQueue *phy_queue, ObIORequest &req); int adjust_clocks(ObPhyQueue *phy_queue, ObIORequest &req);
int adjust_reservation_clock(ObPhyQueue *phy_queue, ObIORequest &req); int adjust_reservation_clock(ObPhyQueue *phy_queue, ObIORequest &req);

5
src/share/io/ob_io_manager.cpp
View File

@ -348,7 +348,7 @@ int ObIOManager::adjust_tenant_clock()
} }
} }
if (!io_clocks.empty()) { if (!io_clocks.empty()) {
if (OB_FAIL(io_clocks.at(0)->sync_clocks(io_clocks))) { if (OB_FAIL(ObTenantIOClock::sync_clocks(io_clocks))) {
LOG_WARN("sync io clocks failed", K(ret), K(io_clocks)); LOG_WARN("sync io clocks failed", K(ret), K(io_clocks));
} }
} }
@ -521,7 +521,8 @@ int ObIOManager::get_tenant_io_manager(const uint64_t tenant_id, ObRefHolder<ObT
ObTenantIOManager *tenant_io_mgr = MTL(ObTenantIOManager*); ObTenantIOManager *tenant_io_mgr = MTL(ObTenantIOManager*);
tenant_holder.hold(tenant_io_mgr); tenant_holder.hold(tenant_io_mgr);
} else { } else {
MTL_SWITCH(tenant_id) { MAKE_TENANT_SWITCH_SCOPE_GUARD(guard);
if (OB_SUCC(guard.switch_to(tenant_id, false))) {
ObTenantIOManager *tenant_io_mgr = MTL(ObTenantIOManager*); ObTenantIOManager *tenant_io_mgr = MTL(ObTenantIOManager*);
tenant_holder.hold(tenant_io_mgr); tenant_holder.hold(tenant_io_mgr);
} }