import 15.2.4

[ceph.git] / ceph / qa / tasks / lost_unfound.py

diff --git a/ceph/qa/tasks/lost_unfound.py b/ceph/qa/tasks/lost_unfound.py
index 1cc588b401674e116336d15ba9e32dd7586756d6..ab17a95dc30d037c5588cac34b06bdc32a7b6aea 100644 (file)
--- a/ceph/qa/tasks/lost_unfound.py
+++ b/ceph/qa/tasks/lost_unfound.py
@@ -3,10 +3,10 @@ Lost_unfound
 """
 import logging
 import time
-import ceph_manager
+from tasks import ceph_manager
+from tasks.util.rados import rados
 from teuthology import misc as teuthology
 from teuthology.orchestra import run
-from util.rados import rados
 
 log = logging.getLogger(__name__)
 
@@ -22,7 +22,7 @@ def task(ctx, config):
     assert isinstance(config, dict), \
         'lost_unfound task only accepts a dict for configuration'
     first_mon = teuthology.get_first_mon(ctx, config)
-    (mon,) = ctx.cluster.only(first_mon).remotes.iterkeys()
+    (mon,) = ctx.cluster.only(first_mon).remotes.keys()
 
     manager = ceph_manager.CephManager(
         mon,
@@ -139,7 +139,7 @@ def task(ctx, config):
             # verify that i can list them direct from the osd
             log.info('listing missing/lost in %s state %s', pg['pgid'],
                      pg['state']);
-            m = manager.list_pg_missing(pg['pgid'])
+            m = manager.list_pg_unfound(pg['pgid'])
             #log.info('%s' % m)
             assert m['num_unfound'] == pg['stat_sum']['num_objects_unfound']
             num_unfound=0
@@ -169,8 +169,8 @@ def task(ctx, config):
         assert not err
 
     # see if osd.1 can cope
-    manager.revive_osd(1)
     manager.mark_in_osd(1)
+    manager.revive_osd(1)
     manager.wait_till_osd_is_up(1)
     manager.wait_for_clean()
     run.wait(procs)