rados/singleton-nomsgr/all/11439: fix greps

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

diff --git a/suites/rados/singleton-nomsgr/all/11429.yaml b/suites/rados/singleton-nomsgr/all/11429.yaml
index e3910e6a78f02a13262a973f62f73224b210f411..b84858bd40f35667488141e774954831db2fa22e 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -61,6 +61,13 @@ tasks:
         - osd.0
         - osd.1
         - osd.2
+  - exec:
+      osd.0:
+        - sudo grep -c 'load_pgs. skipping PG' /var/log/ceph/ceph-osd.0.log
+      osd.1:
+        - sudo grep -c 'load_pgs. skipping PG' /var/log/ceph/ceph-osd.1.log
+      osd.2:
+        - sudo grep -c 'load_pgs. skipping PG' /var/log/ceph/ceph-osd.2.log
   - ceph_manager.wait_for_clean: null
   - ceph_manager.create_pool:
       args: ['newpool']
@@ -93,11 +100,11 @@ tasks:
   - ceph_manager.wait_for_clean: null
   - exec:
       osd.0:
-        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.0.log
+        - sudo grep -c 'Skipping the pg for now' /var/log/ceph/ceph-osd.0.log
       osd.1:
-        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.1.log
+        - sudo grep -c 'Skipping the pg for now' /var/log/ceph/ceph-osd.1.log
       osd.2:
-        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.2.log
+        - sudo grep -c 'Skipping the pg for now' /var/log/ceph/ceph-osd.2.log
   - print: '**** done verifying hammer upgrade'
 
   - install.upgrade:
@@ -105,6 +112,13 @@ tasks:
   - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2, mds.a]
   - ceph_manager.wait_for_clean: null
   - ceph.restart: [osd.0, osd.1, osd.2]
+  - exec:
+      osd.0:
+        - sudo grep -c 'unable to peek at' /var/log/ceph/ceph-osd.0.log
+      osd.1:
+        - sudo grep -c 'unable to peek at' /var/log/ceph/ceph-osd.1.log
+      osd.2:
+        - sudo grep -c 'unable to peek at' /var/log/ceph/ceph-osd.2.log
   - radosbench:
       clients: [client.0]
       time: 30