]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test_mon_workloadgen: use Objecter::wait_for_osd_map
authorSage Weil <sage@redhat.com>
Sun, 20 Jul 2014 20:38:19 +0000 (13:38 -0700)
committerJohn Spray <john.spray@redhat.com>
Mon, 25 Aug 2014 00:34:01 +0000 (01:34 +0100)
Signed-off-by: Sage Weil <sage@redhat.com>
src/test/mon/test_mon_workloadgen.cc

index b52760141401fff43ed0402c14fdd2f5f85a956a..6a5b00f22f9907a76c19eb4a578e22a8ea85beee 100644 (file)
@@ -288,14 +288,11 @@ class ClientStub : public TestStub
     timer.init();
     monc.renew_subs();
 
-    while (osdmap.get_epoch() == 0) {
-      dout(1) << "ClientStub::" << __func__ << " waiting for osdmap" << dendl;
-      cond.Wait(lock);
-    }
-
     lock.Unlock();
-    dout(10) << "ClientStub::" << __func__ << " done" << dendl;
 
+    objecter->wait_for_osd_map();
+
+    dout(10) << "ClientStub::" << __func__ << " done" << dendl;
     return 0;
   }
 };