osd: rename backoff config options

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/thrash/backoff/aggressive_peering.yaml b/qa/suites/rados/thrash/backoff/aggressive_peering.yaml
deleted file mode 100644 (file)
index 4743d26..0000000
--- a/qa/suites/rados/thrash/backoff/aggressive_peering.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd peering aggressive backoff: true

diff --git a/qa/suites/rados/thrash/backoff/peering.yaml b/qa/suites/rados/thrash/backoff/peering.yaml
new file mode 100644 (file)
index 0000000..66d0611
--- /dev/null
+++ b/qa/suites/rados/thrash/backoff/peering.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd backoff on peering: true

diff --git a/qa/suites/rados/thrash/backoff/peering_and_degraded.yaml b/qa/suites/rados/thrash/backoff/peering_and_degraded.yaml
new file mode 100644 (file)
index 0000000..e610990
--- /dev/null
+++ b/qa/suites/rados/thrash/backoff/peering_and_degraded.yaml
@@ -0,0 +1,6 @@
+overrides:
+  ceph:
+    conf:
+      osd:
+        osd backoff on peering: true
+        osd backoff on degraded: true

diff --git a/qa/suites/rados/thrash/backoff/peering_and_recovery.yaml b/qa/suites/rados/thrash/backoff/peering_and_recovery.yaml
deleted file mode 100644 (file)
index 6521afe..0000000
--- a/qa/suites/rados/thrash/backoff/peering_and_recovery.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      osd:
-        osd peering aggressive backoff: true
-        osd recovery aggressive backoff: true

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 66e4dc324df3c7f5e79d243f87f5b429fd1070b8..de4a4e64977a1e313b1eb2b2b665c151c0095484 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -842,8 +842,10 @@ OPTION(osd_command_max_records, OPT_INT, 256)
 OPTION(osd_max_pg_blocked_by, OPT_U32, 16)    // max peer osds to report that are blocking our progress
 OPTION(osd_op_log_threshold, OPT_INT, 5) // how many op log messages to show in one go
 OPTION(osd_verify_sparse_read_holes, OPT_BOOL, false)  // read fiemap-reported holes and verify they are zeros
-OPTION(osd_peering_aggressive_backoff, OPT_BOOL, false)  // issue aggressive client backoff during peering
-OPTION(osd_recovery_aggressive_backoff, OPT_BOOL, false) // issue aggressive client backoff during per-object recovery
+OPTION(osd_backoff_on_unfound, OPT_BOOL, true)   // object unfound
+OPTION(osd_backoff_on_degraded, OPT_BOOL, false) // [mainly for debug?] object unreadable/writeable
+OPTION(osd_backoff_on_down, OPT_BOOL, true)      // pg in down/incomplete state
+OPTION(osd_backoff_on_peering, OPT_BOOL, false)  // [debug] pg peering
 OPTION(osd_debug_crash_on_ignored_backoff, OPT_BOOL, false) // crash osd if client ignores a backoff; useful for debugging
 OPTION(osd_debug_drop_ping_probability, OPT_DOUBLE, 0)
 OPTION(osd_debug_drop_ping_duration, OPT_INT, 0)

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 09d85098ea0fd7cf85cfeb93b7c4648a75c65efa..f27cff38e9861159d3f56a4ac7a8b146533f4c5a 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1633,7 +1633,7 @@ void PrimaryLogPG::do_request(
        is_down() ||
        is_incomplete() ||
        (!is_active() && is_peered());
-      if (g_conf->osd_peering_aggressive_backoff && !backoff) {
+      if (g_conf->osd_backoff_on_peering && !backoff) {
        if (is_peering()) {
          backoff = true;
        }
@@ -1934,8 +1934,8 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
   // missing object?
   if (is_unreadable_object(head)) {
     if (can_backoff &&
-       (g_conf->osd_recovery_aggressive_backoff ||
-        missing_loc.is_unfound(head))) {
+       (g_conf->osd_backoff_on_degraded ||
+        (g_conf->osd_backoff_on_unfound && missing_loc.is_unfound(head)))) {
       add_backoff(session, head, head);
       maybe_kick_recovery(head);
     } else {
@@ -1946,7 +1946,7 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
 
   // degraded object?
   if (write_ordered && is_degraded_or_backfilling_object(head)) {
-    if (can_backoff && g_conf->osd_recovery_aggressive_backoff) {
+    if (can_backoff && g_conf->osd_backoff_on_degraded) {
       add_backoff(session, head, head);
     } else {
       wait_for_degraded_object(head, op);