From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 13 Jan 2016 17:44:01 +0000 (-0500)
Subject: tests: notification slave needs to wait for master
X-Git-Tag: v0.94.6~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=447ab1d70a63fceed39518d5714c138c54f6525e;p=ceph.git

tests: notification slave needs to wait for master

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)
---

diff --git a/src/test/librbd/test_notify.py b/src/test/librbd/test_notify.py
index 8e0bca8a426d3..e2edb767a5ca6 100755
--- a/src/test/librbd/test_notify.py
+++ b/src/test/librbd/test_notify.py
@@ -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