]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: updated librbd ImageWatcher listener signature
authorJason Dillaman <dillaman@redhat.com>
Thu, 23 Jul 2015 20:15:50 +0000 (16:15 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 13 Nov 2015 04:27:07 +0000 (23:27 -0500)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
src/test/librbd/test_ImageWatcher.cc

index 216e9557546b110a2a54ec7fbfa0b15ec4ba3207..9bc5e8460b78afdf5aa1f8cb4580bd7b55332c62 100644 (file)
@@ -60,15 +60,25 @@ public:
     virtual bool handle_requested_lock() {
       return true;
     }
-    virtual void handle_releasing_lock() {
-      Mutex::Locker locker(lock);
-      ++releasing_lock_count;
-      cond.Signal();
-    }
-    virtual void handle_lock_updated(bool _lock_supported, bool _lock_owner) {
+    virtual void handle_lock_updated(
+        librbd::ImageWatcher::LockUpdateState state) {
       Mutex::Locker locker(lock);
       ++lock_updated_count;
-      lock_owner = _lock_owner;
+
+      switch (state) {
+      case librbd::ImageWatcher::LOCK_UPDATE_STATE_NOT_SUPPORTED:
+      case librbd::ImageWatcher::LOCK_UPDATE_STATE_UNLOCKED:
+      case librbd::ImageWatcher::LOCK_UPDATE_STATE_NOTIFICATION:
+        lock_owner = false;
+        break;
+      case librbd::ImageWatcher::LOCK_UPDATE_STATE_RELEASING:
+        lock_owner = false;
+        ++releasing_lock_count;
+        break;
+      case librbd::ImageWatcher::LOCK_UPDATE_STATE_LOCKED:
+        lock_owner = true;
+        break;
+      }
       cond.Signal();
     }
   };