From b5d1b46271a823ee7e338e4ef42a99ab757ca960 Mon Sep 17 00:00:00 2001
From: nroskill <nroskill@gmail.com>
Date: Fri, 12 Jan 2024 12:44:05 +0000
Subject: [PATCH] fix error log

---
 src/share/io/io_schedule/ob_io_mclock.h | 2 +-
 src/share/io/ob_io_manager.cpp          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/share/io/io_schedule/ob_io_mclock.h b/src/share/io/io_schedule/ob_io_mclock.h
index 209ce4e498..aebf925a87 100644
--- a/src/share/io/io_schedule/ob_io_mclock.h
+++ b/src/share/io/io_schedule/ob_io_mclock.h
@@ -63,7 +63,7 @@ public:
   int init(const ObTenantIOConfig &io_config, const ObIOUsage *io_usage);
   void destroy();
   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 adjust_clocks(ObPhyQueue *phy_queue, ObIORequest &req);
   int adjust_reservation_clock(ObPhyQueue *phy_queue, ObIORequest &req);
diff --git a/src/share/io/ob_io_manager.cpp b/src/share/io/ob_io_manager.cpp
index 63f6f4fa2c..8ce908b0ac 100644
--- a/src/share/io/ob_io_manager.cpp
+++ b/src/share/io/ob_io_manager.cpp
@@ -348,7 +348,7 @@ int ObIOManager::adjust_tenant_clock()
       }
     }
     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));
       }
     }
@@ -521,7 +521,8 @@ int ObIOManager::get_tenant_io_manager(const uint64_t tenant_id, ObRefHolder<ObT
     ObTenantIOManager *tenant_io_mgr = MTL(ObTenantIOManager*);
     tenant_holder.hold(tenant_io_mgr);
   } 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*);
       tenant_holder.hold(tenant_io_mgr);
     }