From 873274fe085bd7c35f0c4bd94c41d1f9bfc867e6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 17 Oct 2016 11:33:31 -0400 Subject: [PATCH] rados/upgrade: remove hammer-x-singleton Upgrades must stop at jewel now. Signed-off-by: Sage Weil --- suites/rados/upgrade/hammer-x-singleton/% | 0 .../upgrade/hammer-x-singleton/0-cluster/+ | 0 .../0-cluster/openstack.yaml | 4 --- .../hammer-x-singleton/0-cluster/start.yaml | 16 --------- .../1-hammer-install/hammer.yaml | 7 ---- .../2-partial-upgrade/firsthalf.yaml | 7 ---- .../hammer-x-singleton/3-thrash/default.yaml | 13 ------- .../hammer-x-singleton/4-mon/mona.yaml | 6 ---- .../upgrade/hammer-x-singleton/5-workload/+ | 0 .../5-workload/rbd-cls.yaml | 7 ---- .../5-workload/rbd-import-export.yaml | 9 ----- .../5-workload/readwrite.yaml | 11 ------ .../5-workload/snaps-few-objects.yaml | 14 -------- .../hammer-x-singleton/6-next-mon/monb.yaml | 6 ---- .../upgrade/hammer-x-singleton/7-workload/+ | 0 .../7-workload/radosbench.yaml | 18 ---------- .../7-workload/rbd_api.yaml | 7 ---- .../hammer-x-singleton/8-next-mon/monc.yaml | 8 ----- .../upgrade/hammer-x-singleton/9-workload/+ | 0 .../ec-rados-plugin=jerasure-k=3-m=1.yaml | 31 ---------------- .../9-workload/rbd-python.yaml | 7 ---- .../9-workload/rgw-swift.yaml | 9 ----- .../9-workload/snaps-many-objects.yaml | 13 ------- .../9-workload/test_cache-pool-snaps.yaml | 36 ------------------- 24 files changed, 229 deletions(-) delete mode 100644 suites/rados/upgrade/hammer-x-singleton/% delete mode 100644 suites/rados/upgrade/hammer-x-singleton/0-cluster/+ delete mode 100644 suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/5-workload/+ delete mode 100644 suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/7-workload/+ delete mode 100644 suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/+ delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml delete mode 100644 suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml diff --git a/suites/rados/upgrade/hammer-x-singleton/% b/suites/rados/upgrade/hammer-x-singleton/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/+ b/suites/rados/upgrade/hammer-x-singleton/0-cluster/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml b/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml deleted file mode 100644 index e4d84236abcef..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/0-cluster/openstack.yaml +++ /dev/null @@ -1,4 +0,0 @@ -openstack: - - volumes: # attached to each instance - count: 3 - size: 10 # GB diff --git a/suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml b/suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml deleted file mode 100644 index 12093656b3492..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/0-cluster/start.yaml +++ /dev/null @@ -1,16 +0,0 @@ -overrides: - ceph: - conf: - mon: - mon warn on legacy crush tunables: false -roles: -- - mon.a - - mon.b - - mon.c - - osd.0 - - osd.1 - - osd.2 -- - osd.3 - - osd.4 - - osd.5 -- - client.0 diff --git a/suites/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml b/suites/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml deleted file mode 100644 index 5c5012afe4447..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/1-hammer-install/hammer.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install: - branch: hammer -- print: "**** done install hammer" -- ceph: - fs: xfs -- print: "**** done ceph" diff --git a/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml b/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml deleted file mode 100644 index 2490f76d6389d..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/2-partial-upgrade/firsthalf.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- install.upgrade: - osd.0: -- print: "**** done install.upgrade osd.0" -- ceph.restart: - daemons: [osd.0, osd.1, osd.2, osd.3] -- print: "**** done ceph.restart 1st half" diff --git a/suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml b/suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml deleted file mode 100644 index 6976399765232..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/3-thrash/default.yaml +++ /dev/null @@ -1,13 +0,0 @@ -overrides: - ceph: - log-whitelist: - - wrongly marked me down - - objects unfound and apparently lost - - log bound mismatch - - failed to encode -tasks: -- thrashosds: - timeout: 1200 - chance_pgnum_grow: 1 - chance_pgpnum_fix: 1 -- print: "**** done thrashosds 3-thrash" diff --git a/suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml b/suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml deleted file mode 100644 index 7c75c102fc4fc..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/4-mon/mona.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.a] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.a" diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/+ b/suites/rados/upgrade/hammer-x-singleton/5-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml deleted file mode 100644 index 1bcd1b8ccade1..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-cls.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: hammer - clients: - client.0: - - cls/test_cls_rbd.sh -- print: "**** done cls/test_cls_rbd.sh 5-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml deleted file mode 100644 index 882d979c89ae1..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/5-workload/rbd-import-export.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- workunit: - branch: hammer - clients: - client.0: - - rbd/import_export.sh - env: - RBD_CREATE_ARGS: --new-format -- print: "**** done rbd/import_export.sh 5-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml deleted file mode 100644 index 922e61fdfc032..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/5-workload/readwrite.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 45 - write: 45 - delete: 10 -- print: "**** done rados/readwrite 5-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml b/suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml deleted file mode 100644 index 33c820d127733..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/5-workload/snaps-few-objects.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 -- print: "**** done rados/snaps-few-objects 5-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml b/suites/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml deleted file mode 100644 index 22e87c7ad21d1..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/6-next-mon/monb.yaml +++ /dev/null @@ -1,6 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.b] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.b 6-next-mon" diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/+ b/suites/rados/upgrade/hammer-x-singleton/7-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml deleted file mode 100644 index b5121f0f1a461..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/7-workload/radosbench.yaml +++ /dev/null @@ -1,18 +0,0 @@ -tasks: -- full_sequential: - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 - - radosbench: - clients: [client.0] - time: 150 -- print: "**** done radosbench 7-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml b/suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml deleted file mode 100644 index 19a24c2a7f5a4..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/7-workload/rbd_api.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: hammer - clients: - client.0: - - rbd/test_librbd.sh -- print: "**** done rbd/test_librbd.sh 7-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml b/suites/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml deleted file mode 100644 index 6125368589098..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/8-next-mon/monc.yaml +++ /dev/null @@ -1,8 +0,0 @@ -tasks: -- ceph.restart: - daemons: [mon.c] - wait-for-healthy: false - wait-for-osds-up: true -- print: "**** done ceph.restart mon.c 8-next-mon" -- ceph.wait_for_mon_quorum: [a, b, c] -- print: "**** done wait_for_mon_quorum 8-next-mon" diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/+ b/suites/rados/upgrade/hammer-x-singleton/9-workload/+ deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml deleted file mode 100644 index 7714312c339bf..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/9-workload/ec-rados-plugin=jerasure-k=3-m=1.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# -# k=3 implies a stripe_width of 1376*3 = 4128 which is different from -# the default value of 4096 It is also not a multiple of 1024*1024 and -# creates situations where rounding rules during recovery becomes -# necessary. -# -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 50 - ec_pool: true - write_append_excl: false - erasure_code_profile: - name: jerasure31profile - plugin: jerasure - k: 3 - m: 1 - technique: reed_sol_van - ruleset-failure-domain: osd - op_weights: - read: 100 - write: 0 - append: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - copy_from: 50 - setattr: 25 - rmattr: 25 diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml deleted file mode 100644 index 0ea5639e6bb7b..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/9-workload/rbd-python.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- workunit: - branch: hammer - clients: - client.0: - - rbd/test_librbd_python.sh -- print: "**** done rbd/test_librbd_python.sh 9-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml deleted file mode 100644 index 8f1416082bbc9..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/9-workload/rgw-swift.yaml +++ /dev/null @@ -1,9 +0,0 @@ -tasks: -- rgw: - client.0: - default_idle_timeout: 300 -- print: "**** done rgw 9-workload" -- swift: - client.0: - rgw_server: client.0 -- print: "**** done swift 9-workload" diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml deleted file mode 100644 index 39b44f665f1c2..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/9-workload/snaps-many-objects.yaml +++ /dev/null @@ -1,13 +0,0 @@ -tasks: -- rados: - clients: [client.0] - ops: 4000 - objects: 500 - write_append_excl: false - op_weights: - read: 100 - write: 100 - delete: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 diff --git a/suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml b/suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml deleted file mode 100644 index 844b47a5c53b9..0000000000000 --- a/suites/rados/upgrade/hammer-x-singleton/9-workload/test_cache-pool-snaps.yaml +++ /dev/null @@ -1,36 +0,0 @@ -overrides: - ceph: - log-whitelist: - - must scrub before tier agent can activate -tasks: -workunit: - sequential: - - exec: - client.0: - - sudo ceph osd pool create base 4 - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add base cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay base cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 3600 - - sudo ceph osd pool set cache target_max_objects 250 - - rados: - clients: [client.0] - pools: [base] - ops: 4000 - objects: 500 - pool_snaps: true - op_weights: - read: 100 - write: 100 - delete: 50 - copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 - snap_create: 50 - snap_remove: 50 - rollback: 50 - - print: "**** done test_cache-pool-snaps 9-workload" -- 2.39.5