ReplicatedPG: make watch timeout configurable

Fixes: #2354
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index ce3b78ca52e8598658024a4c428feb2e491f9ba9..8940512169826522a0e50c20f057bc21d6216d14 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -243,6 +243,7 @@ OPTION(client_readahead_max_periods, OPT_LONGLONG, 4)  // as multiple of file la
 OPTION(client_snapdir, OPT_STR, ".snap")
 OPTION(client_mountpoint, OPT_STR, "/")
 OPTION(client_notify_timeout, OPT_INT, 10) // in seconds
+OPTION(osd_client_watch_timeout, OPT_INT, 30) // in seconds
 OPTION(client_caps_release_delay, OPT_INT, 5) // in seconds
 OPTION(client_oc, OPT_BOOL, true)
 OPTION(client_oc_size, OPT_INT, 1024*1024* 200)    // MB * n

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index fcdbb182d524f73264ed7afa0a0cb7dd238e2c8c..339673bf253f0a2ceae2fe929b5c1967c140e402 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2821,8 +2821,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops)
        dout(10) << "watch: peer_addr="
          << ctx->op->request->get_connection()->get_peer_addr() << dendl;
 
-       // FIXME: where does the timeout come from?
-       watch_info_t w(cookie, 30,
+       watch_info_t w(cookie, g_conf->osd_client_watch_timeout,
          ctx->op->request->get_connection()->get_peer_addr());
        if (do_watch) {
          if (oi.watchers.count(make_pair(cookie, entity))) {