From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 23 Jul 2015 20:15:50 +0000 (-0400)
Subject: tests: updated librbd ImageWatcher listener signature
X-Git-Tag: v10.0.1~52^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1affd87b4a1dbbcf3b1abd8ab6f3fb6c193bf25;p=ceph.git

tests: updated librbd ImageWatcher listener signature

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

diff --git a/src/test/librbd/test_ImageWatcher.cc b/src/test/librbd/test_ImageWatcher.cc
index 216e9557546b..9bc5e8460b78 100644
--- a/src/test/librbd/test_ImageWatcher.cc
+++ b/src/test/librbd/test_ImageWatcher.cc
@@ -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();
     }
   };