From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Nov 2014 00:20:49 +0000 (-0800)
Subject: ceph_test_rados_watch_notify: do not unwatch on invalid handle
X-Git-Tag: v0.91~80
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0614a109e79ac22e48c3334edfffde6ae665e28;p=ceph.git

ceph_test_rados_watch_notify: do not unwatch on invalid handle

It is not safe to call rados_unwatch on an undefined handle.

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

diff --git a/src/test/system/st_rados_watch.cc b/src/test/system/st_rados_watch.cc
index ba58e474ade..7f837f532b0 100644
--- a/src/test/system/st_rados_watch.cc
+++ b/src/test/system/st_rados_watch.cc
@@ -91,7 +91,8 @@ run()
     r = 1;
   }
 
-  rados_unwatch(io_ctx, m_obj_name.c_str(), handle);
+  if (m_watch_retcode == 0)
+    rados_unwatch(io_ctx, m_obj_name.c_str(), handle);
   rados_ioctx_destroy(io_ctx);
   rados_shutdown(cl);