ReplicatedPG: osd_max_notify_timeout -> osd_default_notify_timeout

This setting should not override user specified timeout.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 38423afa04e01adeb836133091941cee89685926..3a8ae15ee31717219727875f9eed9389cc2a123a 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -304,7 +304,7 @@ OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes")
 OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
 OPTION(osd_use_stale_snap, OPT_BOOL, false)
 OPTION(osd_rollback_to_cluster_snap, OPT_STR, "")
-OPTION(osd_max_notify_timeout, OPT_U32, 30) // max notify timeout in seconds
+OPTION(osd_default_notify_timeout, OPT_U32, 30) // default notify timeout in seconds
 OPTION(osd_kill_backfill_at, OPT_INT, 0)
 OPTION(osd_min_pg_log_entries, OPT_U32, 1000) // number of entries to keep in the pg log when trimming it
 OPTION(osd_op_complaint_time, OPT_FLOAT, 30) // how many seconds old makes an op complaint-worthy

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 04a705be1ab144e79ab87c2204e109cdb20b9661..f3011eb8acd9ded6f05cfdc7e8ebfb07dc6d67c4 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1898,8 +1898,8 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
        } catch (const buffer::error &e) {
          timeout = 0;
        }
-       if (!timeout || timeout > (uint32_t)g_conf->osd_max_notify_timeout)
-         timeout = g_conf->osd_max_notify_timeout;
+       if (!timeout)
+         timeout = g_conf->osd_default_notify_timeout;
 
        notify_info_t n;
        n.timeout = timeout;