osd/scheduler/mClockScheduler: avoid limits for recovery

Now that recovery operations are split between background_recovery and
background_best_effort, rebalance qos params to avoid penalizing
background_recovery while idle.

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/src/osd/scheduler/mClockScheduler.cc b/src/osd/scheduler/mClockScheduler.cc
index 2c5ed28167febdc8b532f290fb2f3a709d926202..4f56a8e48177a7de0ea55298678c8c519095a7ae 100644 (file)
--- a/src/osd/scheduler/mClockScheduler.cc
+++ b/src/osd/scheduler/mClockScheduler.cc
@@ -234,48 +234,48 @@ void mClockScheduler::set_config_defaults_from_profile()
    * high_client_ops
    *
    * Client Allocation:
-   *   reservation: 60% | weight: 5 | limit: 0 (max) |
+   *   reservation: 60% | weight: 2 | limit: 0 (max) |
    * Background Recovery Allocation:
-   *   reservation: 20% | weight: 1 | limit: 50% |
+   *   reservation: 40% | weight: 1 | limit: 0 (max) |
    * Background Best Effort Allocation:
-   *   reservation: 20% | weight: 1 | limit: 0 (max) |
+   *   reservation: 0 (min) | weight: 1 | limit: 70% |
    */
   static constexpr profile_t high_client_ops_profile{
-    { .6, 5, 0 },
-    { .2, 1, .5},
-    { .2, 1, 0 }
+    { .6, 2,  0 },
+    { .4, 1,  0 },
+    {  0, 1, .7 }
   };
 
   /**
    * high_recovery_ops
    *
    * Client Allocation:
-   *   reservation: 30% | weight: 1 | limit: 80% |
+   *   reservation: 30% | weight: 1 | limit: 0 (max) |
    * Background Recovery Allocation:
-   *   reservation: 60% | weight: 2 | limit: 0 (max) |
+   *   reservation: 70% | weight: 2 | limit: 0 (max) |
    * Background Best Effort Allocation:
    *   reservation: 0 (min) | weight: 1 | limit: 0 (max) |
    */
   static constexpr profile_t high_recovery_ops_profile{
-    { .3, 1, .8 },
-    { .6, 2, 0 },
-    { 0, 1, 0 }
+    { .3, 1, 0 },
+    { .7, 2, 0 },
+    {  0, 1, 0 }
   };
 
   /**
    * balanced
    *
    * Client Allocation:
-   *   reservation: 40% | weight: 1 | limit: 100% |
+   *   reservation: 50% | weight: 1 | limit: 0 (max) |
    * Background Recovery Allocation:
-   *   reservation: 40% | weight: 1 | limit: 70% |
+   *   reservation: 50% | weight: 1 | limit: 0 (max) |
    * Background Best Effort Allocation:
-   *   reservation: 20% | weight: 1 | limit: 0 (max) |
+   *   reservation: 0 (min) | weight: 1 | limit: 90% |
    */
   static constexpr profile_t balanced_profile{
-    { .4, 1, 1.0 },
-    { .4, 1, .7 },
-    { .2, 1, 0 }
+    { .5, 1, 0 },
+    { .5, 1, 0 },
+    {  0, 1, .9 }
   };
 
   const profile_t *profile = nullptr;