From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 3 May 2017 21:50:19 +0000 (-0700)
Subject: test_multi: realm checkpoint after init
X-Git-Tag: ses5-milestone6~9^2~3^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9e2aff891dd4f213b00c9dca1054835e66712c4;p=ceph.git

test_multi: realm checkpoint after init

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_sync.cc b/src/rgw/rgw_sync.cc
index 9d8d250132b4..a9ef1ac784f6 100644
--- a/src/rgw/rgw_sync.cc
+++ b/src/rgw/rgw_sync.cc
@@ -1508,10 +1508,12 @@ public:
         collect_children();
       } while ((int)entries.size() == max_entries && can_adjust_marker);
 
+ldout(cct, 0) << __FILE__ << ":" << __LINE__ << ":" << *this << ": num_spawned()=" << num_spawned() << dendl;
       while (num_spawned() > 1) {
         yield wait_for_child();
         collect_children();
       }
+ldout(cct, 0) << __FILE__ << ":" << __LINE__ << ":" << *this << ": num_spawned()=" << num_spawned() << dendl;
 
       if (!lost_lock) {
         /* update marker to reflect we're done with full sync */
diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index bcc3ff8f2b75..231e742c011b 100644
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -44,6 +44,7 @@ def init_multi(_realm, _user, _config=None):
     user = _user
     global config
     config = _config or Config()
+    realm_meta_checkpoint(realm)
 
 def get_realm():
     return realm