From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Feb 2015 06:05:07 +0000 (-0800)
Subject: rados: make 'watch' command unwatch when done
X-Git-Tag: v0.93~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27bab65f4ae0ffdf4f676bbe866b04ef86d98e0b;p=ceph.git

rados: make 'watch' command unwatch when done

Avoid leaving a registered watch that the OSD has to time out.  If you
want to do that, you can hit ^C.

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

diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc
index 9797a8e4fe39..b6b0d9a90ff4 100644
--- a/src/tools/rados/rados.cc
+++ b/src/tools/rados/rados.cc
@@ -2281,6 +2281,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts,
     else {
       cout << "press enter to exit..." << std::endl;
       getchar();
+      io_ctx.unwatch2(cookie);
+      rados.watch_flush();
     }
   }
   else if (strcmp(nargs[0], "notify") == 0) {