librados_test_stub: added Rados::watch_flush

RBD now uses this method, so it was added to the test stub.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/test/librados_test_stub/LibradosTestStub.cc b/src/test/librados_test_stub/LibradosTestStub.cc
index 45d02ea4275499f0aafc6f4a83987b0a605a4da7..4f83f6ee8cff6d195446cd578c78ec0fe8a3a34a 100644 (file)
--- a/src/test/librados_test_stub/LibradosTestStub.cc
+++ b/src/test/librados_test_stub/LibradosTestStub.cc
@@ -790,6 +790,11 @@ int Rados::wait_for_latest_osdmap() {
   return impl->wait_for_latest_osdmap();
 }
 
+int Rados::watch_flush() {
+  TestRadosClient *impl = reinterpret_cast<TestRadosClient*>(client);
+  return impl->watch_flush();
+}
+
 WatchCtx::~WatchCtx() {
 }
 

diff --git a/src/test/librados_test_stub/TestMemRadosClient.cc b/src/test/librados_test_stub/TestMemRadosClient.cc
index a225702adabc6466e509d8c7ca2f11f82da8dd9a..8abfa263e051aa440e788f6ed12d9a3697d9db83 100644 (file)
--- a/src/test/librados_test_stub/TestMemRadosClient.cc
+++ b/src/test/librados_test_stub/TestMemRadosClient.cc
@@ -115,4 +115,8 @@ int TestMemRadosClient::pool_reverse_lookup(int64_t id, std::string *name) {
   return -ENOENT;
 }
 
+int TestMemRadosClient::watch_flush() {
+  return 0;
+}
+
 } // namespace librados

diff --git a/src/test/librados_test_stub/TestMemRadosClient.h b/src/test/librados_test_stub/TestMemRadosClient.h
index 5031d8c4ce8779abd5a151ffda59acf2b62fec53..df4eb18a72a6e0106d5827fbcb004773840b4499 100644 (file)
--- a/src/test/librados_test_stub/TestMemRadosClient.h
+++ b/src/test/librados_test_stub/TestMemRadosClient.h
@@ -78,6 +78,7 @@ public:
   virtual int64_t pool_lookup(const std::string &name);
   virtual int pool_reverse_lookup(int64_t id, std::string *name);
 
+  virtual int watch_flush();
 protected:
   ~TestMemRadosClient();
 

diff --git a/src/test/librados_test_stub/TestRadosClient.h b/src/test/librados_test_stub/TestRadosClient.h
index bfccad6d998108fa207a3a89b39d09b308a73f53..22b1fee8eb327fefd672f1aefcb9091c1eaaa589 100644 (file)
--- a/src/test/librados_test_stub/TestRadosClient.h
+++ b/src/test/librados_test_stub/TestRadosClient.h
@@ -63,6 +63,8 @@ public:
   virtual int64_t pool_lookup(const std::string &name) = 0;
   virtual int pool_reverse_lookup(int64_t id, std::string *name) = 0;
 
+  virtual int watch_flush() = 0;
+
   TestWatchNotify &get_watch_notify() {
     return m_watch_notify;
   }