From: Samuel Just Date: Fri, 23 Aug 2013 21:50:20 +0000 (-0700) Subject: ReplicatedPG: make watch timeout configurable X-Git-Tag: v0.69~60 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60abe08037293b400cb6f4eb52683b24cf948fb1;p=ceph.git ReplicatedPG: make watch timeout configurable Fixes: #2354 Signed-off-by: Samuel Just Reviewed-by: Sage Weil --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index ce3b78ca52e..89405121698 100644 --- 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 fcdbb182d52..339673bf253 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -2821,8 +2821,7 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector& 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))) {