From: Samuel Just <sjust@redhat.com>
Date: Wed, 22 Jun 2016 20:55:15 +0000 (-0700)
Subject: divergent_priors: we no longer track divergent priors explicitely
X-Git-Tag: v11.1.1~58^2^2~135^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e3159dfafb62e0d0e5ab6accede1cf1513639242;p=ceph-ci.git

divergent_priors: we no longer track divergent priors explicitely

The rest of the test is still valuable to ensure that we detect missing
items which are not in the log, but now that the missing set is
explicitely persisted, the divergent priors set isn't a special case
and won't have special log lines to check for.

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/tasks/divergent_priors.py b/tasks/divergent_priors.py
index 97a01244fa1..73a04577515 100644
--- a/tasks/divergent_priors.py
+++ b/tasks/divergent_priors.py
@@ -159,13 +159,4 @@ def task(ctx, config):
                                        '/tmp/existing'])
         assert exit_status is 0
 
-    (remote,) = ctx.\
-        cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     log.info("success")
diff --git a/tasks/divergent_priors2.py b/tasks/divergent_priors2.py
index 6b384727cf8..939d7850930 100644
--- a/tasks/divergent_priors2.py
+++ b/tasks/divergent_priors2.py
@@ -193,15 +193,6 @@ def task(ctx, config):
                                        '/tmp/existing'])
         assert exit_status is 0
 
-    (remote,) = ctx.\
-        cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     cmd = 'rm {file}'.format(file=expfile)
-    remote.run(args=cmd, wait=True)
+    exp_remote.run(args=cmd, wait=True)
     log.info("success")
diff --git a/tasks/reg11184.py b/tasks/reg11184.py
index 016057d2e3b..e4f4371b97d 100644
--- a/tasks/reg11184.py
+++ b/tasks/reg11184.py
@@ -230,13 +230,6 @@ def task(ctx, config):
 
     (remote,) = ctx.\
         cluster.only('osd.{o}'.format(o=divergent)).remotes.iterkeys()
-    msg = "dirty_divergent_priors: true, divergent_priors: %d" \
-          % (DIVERGENT_WRITE + DIVERGENT_REMOVE)
-    cmd = 'grep "{msg}" /var/log/ceph/ceph-osd.{osd}.log'\
-          .format(msg=msg, osd=divergent)
-    proc = remote.run(args=cmd, wait=True, check_status=False)
-    assert proc.exitstatus == 0
-
     cmd = 'rm {file}'.format(file=expfile)
     remote.run(args=cmd, wait=True)
     log.info("success")