Merge pull request ceph#3243 from yuyuyu101/wip-10424

librados: only call watch_flush if necessary Reviewed-by: Loic Dachary <[email protected]>
zz2 · Dec 23, 2014 · bb01f9e · bb01f9e
2 parents e1384af + 926a1b7
commit bb01f9e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
@@ -282,9 +282,6 @@ int librados::RadosClient::connect()
 
 void librados::RadosClient::shutdown()
 {
-  // make sure watch callbacks are flushed
-  watch_flush();
-
   lock.Lock();
   if (state == DISCONNECTED) {
     lock.Unlock();
@@ -301,8 +298,11 @@ void librados::RadosClient::shutdown()
   instance_id = 0;
   timer.shutdown();   // will drop+retake lock
   lock.Unlock();
-  if (need_objecter)
+  if (need_objecter) {
+    // make sure watch callbacks are flushed
+    watch_flush();
     objecter->shutdown();
+  }
   monclient.shutdown();
   if (messenger) {
     messenger->shutdown();