suites/rados/singleton-nomsgr/all/11429.yaml: double-hop and fix

- simplify this.. lots of extra cruft we don't need
- restart twice at hammer to ensure that we can still load pgs
  post-upgrade
- do the same for the final version.

Fixes: #11429 (again, for ~infernalis)
Fixes: #13060
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 c66b0552468512f4b2dfa6aaacb77085bcb04a3d..eb7103dde220153edf21495e6855f0cd63912106 100644 (file)
--- a/suites/rados/singleton-nomsgr/all/11429.yaml
+++ b/suites/rados/singleton-nomsgr/all/11429.yaml
@@ -50,6 +50,7 @@ tasks:
       size: 1
       pool: toremove
       create_pool: false
+      cleanup: false
   - ceph_manager.remove_pool:
       args: ['toremove']
   - sleep:
@@ -59,13 +60,7 @@ tasks:
         - osd.0
         - osd.1
         - osd.2
-  - sleep:
-      duration: 30
   - ceph_manager.wait_for_clean: null
-  - radosbench:
-      clients: [client.0]
-      time: 60
-      size: 1
   - ceph_manager.create_pool:
       args: ['newpool']
   - loop:
@@ -75,8 +70,6 @@ tasks:
             args: ['newpool', 'min_size', 2]
         - ceph_manager.set_pool_property:
             args: ['newpool', 'min_size', 1]
-  - sleep:
-      duration: 30
   - ceph_manager.wait_for_clean: null
   - loop:
       count: 100
@@ -86,25 +79,36 @@ tasks:
         - ceph_manager.set_pool_property:
             args: ['newpool', 'min_size', 1]
   - sleep:
-      duration: 30
+      duration: 10
   - ceph_manager.wait_for_clean: null
-  - sleep:
-      duration: 30
+  - print: '**** done creating zombie pgs'
+
   - install.upgrade:
       mon.a:
         branch: hammer
-  - ceph.restart: [mon.a, mon.b, mon.c, osd.0, osd.1, osd.2]
+  - 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]
+  - ceph_manager.wait_for_clean: null
+  - exec:
+      osd.0:
+        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.0.log
+      osd.1:
+        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.1.log
+      osd.2:
+        - sudo grep 'unable to peek at' /var/log/ceph/ceph-osd.2.log
+  - print: '**** done verifying hammer upgrade'
+
   - install.upgrade:
       mon.a: null
-  - ceph.restart:
-      daemons:
-        - osd.0
-        - osd.1
-        - osd.2
-  - sleep:
-      duration: 30
+  - 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]
   - radosbench:
       clients: [client.0]
       time: 30
       size: 1
   - ceph_manager.wait_for_clean: null
+  - ceph.restart: [osd.0, osd.1, osd.2]
+  - ceph_manager.wait_for_clean: null
+  - print: '**** done verifying final upgrade'
\ No newline at end of file