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 9797a8e4fe391663960e55362d86bbb074d6eae1..b6b0d9a90ff41c289e619688aad13f6e24654b28 100644 (file)
--- 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) {