Fix the issue where IO isolation for local disks did not calculate the IOPS scale according to IO calibration.

Author: obdev

deps/oblib/src/lib/tc/ob_tc.h

@@ -23,15 +23,16 @@ struct TCLink
 
 struct TCRequest
 {
-  TCRequest(): link_(NULL), qid_(-1), bytes_(0), start_ns_(0), storage_key_(0) {
+  TCRequest(): link_(NULL), qid_(-1), bytes_(0), start_ns_(0), storage_key_(0), norm_bytes_(0) {
   }
-  TCRequest(int qid, int64_t bytes): link_(NULL), qid_(qid), bytes_(bytes), start_ns_(0), storage_key_(0) {}
+  TCRequest(int qid, int64_t bytes): link_(NULL), qid_(qid), bytes_(bytes), start_ns_(0), storage_key_(0), norm_bytes_(0) {}
   ~TCRequest() {}
   TCLink link_;
   int qid_;
   int64_t bytes_;
   int64_t start_ns_;
   uint64_t storage_key_;
+  int64_t norm_bytes_; // for local device
 };
 
 class ITCHandler

deps/oblib/src/lib/tc/ob_tc_limit.cpp

@@ -16,7 +16,7 @@ class BytesLimiter: public ITCLimiter
   BytesLimiter(int id, const char* name): ITCLimiter(id, TCLIMIT_BYTES, name, 0) {}
   BytesLimiter(int id, const char* name, uint64_t storage_key): ITCLimiter(id, TCLIMIT_BYTES, name, storage_key) {}
   ~BytesLimiter() {}
-  int64_t get_cost(TCRequest* req) { return req->bytes_; }
+  int64_t get_cost(TCRequest* req) { return (req->norm_bytes_ == 0) ? req->bytes_ : req->norm_bytes_; }
 };
 
 class CountLimiter: public ITCLimiter

src/share/io/io_schedule/ob_io_schedule_v2.cpp

@@ -284,8 +284,8 @@ static void fill_qsched_req(ObIORequest& req, int qid)
 {
   req.qsched_req_.qid_ = qid;
   req.qsched_req_.bytes_ = req.get_align_size();
+  req.qsched_req_.norm_bytes_ = req.is_object_device_req() ? req.qsched_req_.bytes_ : get_norm_bw(req.qsched_req_.bytes_, req.get_mode());
 }
-
 int64_t ObTenantIOSchedulerV2::get_qindex(ObIORequest& req)
 {
   int ret = OB_SUCCESS;

src/share/io/ob_io_define.cpp

@@ -269,6 +269,16 @@ bool ObIOFlag::is_sys_module() const
           && sys_module_id_ < SYS_MODULE_END_ID;
 }
 
+bool ObIORequest::is_object_device_req() const
+{
+  bool ret = false;
+  if (io_result_ == nullptr) {
+  } else {
+    ret = io_result_->is_object_device_req_;
+  }
+  return ret;
+}
+
 int64_t ObIOFlag::get_wait_event() const
 {
   return wait_event_id_;

src/share/io/ob_io_define.h

@@ -606,6 +606,7 @@ class ObIORequest : public common::ObDLinkBase<ObIORequest>
   ObIOGroupKey get_group_key() const;
   uint64_t get_sys_module_id() const;
   bool is_sys_module() const;
+  bool is_object_device_req() const;
   char *calc_io_buf();  // calc the aligned io_buf of raw_buf_, which interact with the operating system
   const ObIOFlag &get_flag() const;
   ObIOMode get_mode() const; // 2 mode
@@ -627,7 +628,7 @@ class ObIORequest : public common::ObDLinkBase<ObIORequest>
 
   int64_t get_remained_io_timeout_us();
 
-  TO_STRING_KV(K(is_inited_), K(tenant_id_), KP(control_block_), K(ref_cnt_), KP(raw_buf_), K(fd_),
+  TO_STRING_KV(K(is_inited_), K(tenant_id_), KP(control_block_), K(ref_cnt_), KP(raw_buf_), K(fd_), K(is_object_device_req()),
                K(trace_id_), K(retry_count_), K(tenant_io_mgr_), K_(storage_accesser),
                KPC(io_result_), K_(part_id));
 private:

src/share/io/ob_io_manager.cpp

@@ -57,6 +57,23 @@ int64_t get_norm_iops(const int64_t size, const double iops, const ObIOMode mode
   }
   return norm_iops;
 }
+
+// for local device
+int64_t get_norm_bw(const int64_t size, const ObIOMode mode)
+{
+  int ret = OB_SUCCESS;
+  int64_t norm_bw = size;
+  double iops_scale = 0;
+  bool is_io_ability_valid = false;
+  if (mode == ObIOMode::MAX_MODE) {
+  } else if (FALSE_IT(ObIOCalibration::get_instance().get_iops_scale(mode, size, iops_scale, is_io_ability_valid))) {
+  } else if (iops_scale < std::numeric_limits<double>::epsilon()) {
+    LOG_WARN("calc iops scale failed", K(ret), K(mode));
+  } else {
+    norm_bw = static_cast<int64_t>((double)STANDARD_IOPS_SIZE / iops_scale);
+  }
+  return max(norm_bw, 1);;
+}
 }  // namespace common
 }  // namespace oceanbase
 int64_t ObTrafficControl::IORecord::calc()
@@ -2695,7 +2712,7 @@ int ObTenantIOManager::print_io_status()
         snprintf(io_status, sizeof(io_status),
                 "sys_group_name:%s, mode:%s, cur_req:%ld, hold_mem:%ld "
                 "[FAILED]: fail_size:%ld, fail_iops:%ld, fail_bw:%ld, [delay/us]:prepare:%ld, schedule:%ld, submit:%ld, rt:%ld, total:%ld, "
-                "[SUCC]: size:%ld, iops:%ld, norm_iops :%ld, bw:%ld, [delay/us]:prepare:%ld, schedule:%ld, submit:%ld, rt:%ld, total:%ld",
+                "[SUCC]: size:%ld, iops:%ld, norm_iops:%ld, bw:%ld, [delay/us]:prepare:%ld, schedule:%ld, submit:%ld, rt:%ld, total:%ld",
                  get_io_sys_group_name(module),
                  mode_str,
                  sys_mem_stat.group_mem_infos_.at(i).total_cnt_,

src/share/io/ob_io_manager.h

@@ -62,6 +62,7 @@ inline const char *get_resource_type_str(const ResourceType type)
 namespace common
 {
 int64_t get_norm_iops(const int64_t size, const double iops, const ObIOMode mode);
+int64_t get_norm_bw(const int64_t size, const ObIOMode mode);
 class ObTenantIOManager;
 #ifdef OB_BUILD_SHARED_STORAGE
 class ObSSIORequest;