]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: notification slave needs to wait for master 7225/head
authorJason Dillaman <dillaman@redhat.com>
Wed, 13 Jan 2016 17:44:01 +0000 (12:44 -0500)
committerJason Dillaman <dillaman@redhat.com>
Thu, 14 Jan 2016 01:10:10 +0000 (20:10 -0500)
If the slave instance starts before the master, race
conditions are possible.

Fixes: #13810
Backport: infernalis, hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 3992d6fe67bbf82322cedc1582406caaf6d4de60)

src/test/librbd/test_notify.py

index 8e0bca8a426d37e7be9c2c996505b16a32e04a80..e2edb767a5ca6c501dc05027416dbe14fd8b7a63 100755 (executable)
@@ -65,6 +65,7 @@ def master(ioctx):
         while offset < IMG_SIZE:
             image.write(data, offset)
             offset += (1 << IMG_ORDER)
+        image.write('1', IMG_SIZE - 1)
         assert(image.is_exclusive_lock_owner())
 
         print("waiting for slave to complete")
@@ -81,7 +82,8 @@ def slave(ioctx):
     while True:
         try:
             with Image(ioctx, CLONE_IMG_NAME) as image:
-                if image.list_lockers() != []:
+                if (image.list_lockers() != [] and
+                    image.read(IMG_SIZE - 1, 1) == '1'):
                     break
         except Exception:
             pass