update ceph source to reef 18.2.1

[ceph.git] / ceph / src / osd / scheduler / mClockScheduler.cc

diff --git a/ceph/src/osd/scheduler/mClockScheduler.cc b/ceph/src/osd/scheduler/mClockScheduler.cc
index 8f76e516530dadaba45b581fc2a76435b085c712..0ea519655d85b5a4e02fc3010658213336367e9a 100644 (file)
--- a/ceph/src/osd/scheduler/mClockScheduler.cc
+++ b/ceph/src/osd/scheduler/mClockScheduler.cc
@@ -340,8 +340,7 @@ uint32_t mClockScheduler::calc_scaled_cost(int item_cost)
       item_cost));
   auto cost_per_io = static_cast<uint32_t>(osd_bandwidth_cost_per_io);
 
-  // Calculate total scaled cost in bytes
-  return cost_per_io + cost;
+  return std::max<uint32_t>(cost, cost_per_io);
 }
 
 void mClockScheduler::update_configuration()