From 26575e68186382b47900667d6cfc6343ed880967 Mon Sep 17 00:00:00 2001
From: renju96 <fcbrenju@163.com>
Date: Mon, 13 Nov 2023 08:42:42 +0000
Subject: [PATCH] fix sys_io accumulate

---
 src/share/io/ob_io_define.cpp | 6 +++++-
 src/share/io/ob_io_struct.cpp | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/share/io/ob_io_define.cpp b/src/share/io/ob_io_define.cpp
index 0b41b0365..379c408b6 100644
--- a/src/share/io/ob_io_define.cpp
+++ b/src/share/io/ob_io_define.cpp
@@ -630,7 +630,11 @@ void ObIOResult::finish(const ObIORetCode &ret_code, ObIORequest *req)
       ret_code_ = ret_code;
       is_finished_ = true;
       if (OB_NOT_NULL(tenant_io_mgr_.get_ptr()) && OB_NOT_NULL(req)) {
-        tenant_io_mgr_.get_ptr()->io_usage_.accumulate(*this, *req);
+        if (is_sys_group(get_group_id())) {
+          tenant_io_mgr_.get_ptr()->io_backup_usage_.accumulate(*this, *req);
+        } else {
+          tenant_io_mgr_.get_ptr()->io_usage_.accumulate(*this, *req);
+        }
         tenant_io_mgr_.get_ptr()->io_usage_.record_request_finish(*this);
         end_ts_ = ObTimeUtility::fast_current_time();
         // record io error
diff --git a/src/share/io/ob_io_struct.cpp b/src/share/io/ob_io_struct.cpp
index c813066ad..54e008ca9 100644
--- a/src/share/io/ob_io_struct.cpp
+++ b/src/share/io/ob_io_struct.cpp
@@ -2202,7 +2202,7 @@ int ObAsyncIOChannel::on_full_return(ObIORequest &req, const int64_t complete_si
       if (OB_FAIL(req.recycle_buffer())) {
         LOG_WARN("recycle io raw buffer failed", K(ret), K(req));
       }
-      req.io_result_->finish(OB_SUCCESS);
+      req.io_result_->finish(ret, &req);
     }
   }
   return ret;
@@ -2226,7 +2226,7 @@ int ObAsyncIOChannel::on_partial_return(ObIORequest &req, const int64_t complete
         if (OB_FAIL(req.recycle_buffer())) {
           LOG_WARN("recycle io raw buffer failed", K(ret), K(req));
         }
-        req.io_result_->finish(OB_SUCCESS);
+        req.io_result_->finish(ret, &req);
       }
     } else {
       if (OB_FAIL(req.recycle_buffer())) {
@@ -2470,7 +2470,7 @@ int ObSyncIOChannel::do_sync_io(ObIORequest &req)
         req.io_result_->finish(ret, &req);
       }
     } else {
-      req.io_result_->finish(OB_SUCCESS);
+      req.io_result_->finish(ret, &req);
     }
   }
   return ret;