test,qa/workunits: fix a zillion tests

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

1 files changed, 11 insertions, 9 deletions

diff --git a/qa/tasks/reg11184.py b/qa/tasks/reg11184.py
index 03db1b0641e..0ffac5cdf38 100644
--- a/qa/tasks/reg11184.py
+++ b/qa/tasks/reg11184.py
@@ -153,6 +153,8 @@ def task(ctx, config):
     manager.raw_cluster_cmd('osd', 'pool', 'set', 'foo', 'pg_num', '2')
     time.sleep(5)
 
+    manager.raw_cluster_cmd('pg','dump')
+
     # Export a pg
     (exp_remote,) = ctx.\
         cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
@@ -165,27 +167,27 @@ def task(ctx, config):
               format(fpath=FSPATH, jpath=JPATH))
     pid = os.getpid()
     expfile = os.path.join(testdir, "exp.{pid}.out".format(pid=pid))
-    cmd = ((prefix + "--op export --pgid 1.0 --file {file}").
+    cmd = ((prefix + "--op export --pgid 2.0 --file {file}").
            format(id=divergent, file=expfile))
     proc = exp_remote.run(args=cmd, wait=True,
                           check_status=False, stdout=StringIO())
     assert proc.exitstatus == 0
 
     # Remove the same pg that was exported
-    cmd = ((prefix + "--op remove --pgid 1.0").
+    cmd = ((prefix + "--op remove --pgid 2.0").
            format(id=divergent, file=expfile))
     proc = exp_remote.run(args=cmd, wait=True,
                           check_status=False, stdout=StringIO())
     assert proc.exitstatus == 0
 
     # Kill one of non-divergent OSDs
-    log.info('killing osd.%d' % non_divergent[1])
-    manager.kill_osd(non_divergent[1])
-    manager.mark_down_osd(non_divergent[1])
-    # manager.mark_out_osd(non_divergent[1])
+    log.info('killing osd.%d' % non_divergent[0])
+    manager.kill_osd(non_divergent[0])
+    manager.mark_down_osd(non_divergent[0])
+    # manager.mark_out_osd(non_divergent[0])
 
     cmd = ((prefix + "--op import --file {file}").
-           format(id=non_divergent[1], file=expfile))
+           format(id=non_divergent[0], file=expfile))
     proc = exp_remote.run(args=cmd, wait=True,
                           check_status=False, stdout=StringIO())
     assert proc.exitstatus == 0
@@ -194,8 +196,8 @@ def task(ctx, config):
     log.info("revive divergent %d", divergent)
     manager.revive_osd(divergent)
     manager.mark_in_osd(divergent)
-    log.info("revive %d", non_divergent[1])
-    manager.revive_osd(non_divergent[1])
+    log.info("revive %d", non_divergent[0])
+    manager.revive_osd(non_divergent[0])
 
     while len(manager.get_osd_status()['up']) < 3:
         time.sleep(10)