From 797d6f80ed79bdffde0924e55bea9e209c3486aa Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Fri, 4 May 2018 13:37:55 -0700 Subject: [PATCH] qa/test: added client-upgrade-luminous suite (whitelisted CACHE_POOL_NO_HIT_SET) Fixes https://tracker.ceph.com/issues/24021 Signed-off-by: Yuri Weinstein --- .../luminous-client-x/basic/% | 0 .../luminous-client-x/basic/0-cluster/+ | 0 .../basic/0-cluster/openstack.yaml | 4 ++++ .../basic/0-cluster/start.yaml | 15 +++++++++++++ .../basic/1-install/luminous-client-x.yaml | 11 ++++++++++ .../basic/2-workload/rbd_api_tests.yaml | 21 +++++++++++++++++++ .../2-workload/rbd_cli_import_export.yaml | 11 ++++++++++ .../luminous-client-x/basic/supported | 1 + .../luminous-client-x/rbd/% | 0 .../luminous-client-x/rbd/0-cluster/+ | 0 .../rbd/0-cluster/openstack.yaml | 4 ++++ .../rbd/0-cluster/start.yaml | 15 +++++++++++++ .../rbd/1-install/luminous-client-x.yaml | 11 ++++++++++ .../rbd/2-features/defaults.yaml | 6 ++++++ .../rbd/2-features/layering.yaml | 6 ++++++ .../3-workload/rbd_notification_tests.yaml | 21 +++++++++++++++++++ .../luminous-client-x/rbd/supported | 1 + 17 files changed, 127 insertions(+) create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/% create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/+ create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/openstack.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/start.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/1-install/luminous-client-x.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_api_tests.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_cli_import_export.yaml create mode 120000 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/supported create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/% create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/+ create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/openstack.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/start.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/1-install/luminous-client-x.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/defaults.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/layering.yaml create mode 100644 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml create mode 120000 qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/supported diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/% b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/+ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/openstack.yaml new file mode 100644 index 00000000000..b0f3b9b4da2 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/openstack.yaml @@ -0,0 +1,4 @@ +openstack: + - volumes: # attached to each instance + count: 4 + size: 30 # GB diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/start.yaml new file mode 100644 index 00000000000..dff144f0550 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/0-cluster/start.yaml @@ -0,0 +1,15 @@ +roles: +- - mon.a + - mon.b + - mon.c + - osd.0 + - osd.1 + - osd.2 + - mgr.x +- - client.0 +overrides: + ceph: + log-whitelist: + - failed to encode map + - CACHE_POOL_NO_HIT_SET + fs: xfs diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/1-install/luminous-client-x.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/1-install/luminous-client-x.yaml new file mode 100644 index 00000000000..3e190f0d5e9 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/1-install/luminous-client-x.yaml @@ -0,0 +1,11 @@ +tasks: +- install: + branch: luminous + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] +- print: "**** done install luminous" +upgrade_workload: + sequential: + - install.upgrade: + exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1'] + client.0: + - print: "**** done install.upgrade to -x on client.0" diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_api_tests.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_api_tests.yaml new file mode 100644 index 00000000000..386c5e3dced --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_api_tests.yaml @@ -0,0 +1,21 @@ +tasks: +- exec: + client.0: + - "cp $(which ceph_test_librbd_api) $TESTDIR/ceph_test_librbd_api" +- sequential: + - upgrade_workload +- ceph: +- print: "**** done ceph" +- exec: + client.0: + - "cp --force $TESTDIR/ceph_test_librbd_api $(which ceph_test_librbd_api)" + - "rm -rf $TESTDIR/ceph_test_librbd_api" +- print: "**** done reverting to luminous ceph_test_librbd_api" +- workunit: + branch: luminous + clients: + client.0: + - rbd/test_librbd_api.sh + env: + RBD_FEATURES: "61" +- print: "**** done rbd/test_librbd_api.sh" diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_cli_import_export.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_cli_import_export.yaml new file mode 100644 index 00000000000..1467a048795 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/2-workload/rbd_cli_import_export.yaml @@ -0,0 +1,11 @@ +tasks: +- sequential: + - upgrade_workload +- ceph: +- print: "**** done ceph" +- workunit: + branch: luminous + clients: + client.0: + - rbd/import_export.sh +- print: "**** done rbd/import_export.sh" diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/supported b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/supported new file mode 120000 index 00000000000..ea78f6570e5 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/basic/supported @@ -0,0 +1 @@ +../../../../../distros/supported/ \ No newline at end of file diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/% b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/+ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/+ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/openstack.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/openstack.yaml new file mode 100644 index 00000000000..b0f3b9b4da2 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/openstack.yaml @@ -0,0 +1,4 @@ +openstack: + - volumes: # attached to each instance + count: 4 + size: 30 # GB diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/start.yaml new file mode 100644 index 00000000000..699811f65bb --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/0-cluster/start.yaml @@ -0,0 +1,15 @@ +roles: +- - mon.a + - mon.b + - mon.c + - osd.0 + - osd.1 + - osd.2 + - client.0 + - mgr.x +- - client.1 +overrides: + ceph: + log-whitelist: + - failed to encode map + fs: xfs diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/1-install/luminous-client-x.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/1-install/luminous-client-x.yaml new file mode 100644 index 00000000000..4a4553546f3 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/1-install/luminous-client-x.yaml @@ -0,0 +1,11 @@ +tasks: +- install: + branch: luminous + exclude_packages: ['ceph-mgr','libcephfs2','libcephfs-devel','libcephfs-dev'] +- print: "**** done install luminous" +- install.upgrade: + exclude_packages: ['ceph-test', 'ceph-test-dbg','libcephfs1'] + client.1: +- print: "**** done install.upgrade to -x on client.0" +- ceph: +- print: "**** done ceph task" diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/defaults.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/defaults.yaml new file mode 100644 index 00000000000..dff6623ad03 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/defaults.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + rbd default features: 61 + diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/layering.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/layering.yaml new file mode 100644 index 00000000000..5613d0155ab --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/2-features/layering.yaml @@ -0,0 +1,6 @@ +overrides: + ceph: + conf: + client: + rbd default features: 1 + diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml new file mode 100644 index 00000000000..17d2c17db0c --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/3-workload/rbd_notification_tests.yaml @@ -0,0 +1,21 @@ +tasks: +- workunit: + branch: luminous + clients: + client.0: + - rbd/notify_master.sh + client.1: + - rbd/notify_slave.sh + env: + RBD_FEATURES: "61" +- print: "**** done rbd: old librbd -> new librbd" +- workunit: + branch: luminous + clients: + client.0: + - rbd/notify_slave.sh + client.1: + - rbd/notify_master.sh + env: + RBD_FEATURES: "61" +- print: "**** done rbd: new librbd -> old librbd" diff --git a/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/supported b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/supported new file mode 120000 index 00000000000..ea78f6570e5 --- /dev/null +++ b/qa/suites/upgrade/client-upgrade-luminous/luminous-client-x/rbd/supported @@ -0,0 +1 @@ +../../../../../distros/supported/ \ No newline at end of file -- 2.47.3