From: Sage Weil <sage@redhat.com>
Date: Sun, 20 Jul 2014 20:38:19 +0000 (-0700)
Subject: test_mon_workloadgen: use Objecter::wait_for_osd_map
X-Git-Tag: v0.86~213^2~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd179eaddd4fcc7271254f97f9b07d10f64a4b2b;p=ceph.git

test_mon_workloadgen: use Objecter::wait_for_osd_map

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index b52760141401..6a5b00f22f99 100644
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -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;
   }
 };