From 3b7233a402ec68094ae86333c3f4f09706d173d1 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 12 Jul 2018 21:35:46 -0700 Subject: [PATCH] qa: use 4 mds cluster for multifs tests Fixes: http://tracker.ceph.com/issues/24899 Signed-off-by: Patrick Donnelly --- qa/cephfs/clusters/1a3s-mds-1c-client.yaml | 12 ++++++++++++ qa/cephfs/clusters/1a3s-mds-2c-client.yaml | 12 ++++++++++++ .../fs/multifs/clusters/1-mds-2-client-coloc.yaml | 1 - .../fs/multifs/clusters/1a3s-mds-2c-client.yaml | 1 + 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 qa/cephfs/clusters/1a3s-mds-1c-client.yaml create mode 100644 qa/cephfs/clusters/1a3s-mds-2c-client.yaml delete mode 120000 qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml create mode 120000 qa/suites/fs/multifs/clusters/1a3s-mds-2c-client.yaml diff --git a/qa/cephfs/clusters/1a3s-mds-1c-client.yaml b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml new file mode 100644 index 00000000000..0b479ed716a --- /dev/null +++ b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml @@ -0,0 +1,12 @@ +roles: +- [mon.a, mgr.y, mds.a, mds.w-s, osd.0, osd.1, osd.2, osd.3, client.0] +- [mon.b, mon.c, mgr.x, mds.x-s, mds.y-s, osd.4, osd.5, osd.6, osd.7] +openstack: +- volumes: # attached to each instance + count: 4 + size: 20 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/cephfs/clusters/1a3s-mds-2c-client.yaml b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml new file mode 100644 index 00000000000..01388ae541f --- /dev/null +++ b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml @@ -0,0 +1,12 @@ +roles: +- [mon.a, mgr.y, mds.a, mds.w-s, osd.0, osd.1, osd.2, osd.3, client.0] +- [mon.b, mon.c, mgr.x, mds.x-s, mds.y-s, osd.4, osd.5, osd.6, osd.7, client.1] +openstack: +- volumes: # attached to each instance + count: 4 + size: 20 # GB +- machine: + disk: 200 # GB +log-rotate: + ceph-mds: 10G + ceph-osd: 10G diff --git a/qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml b/qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml deleted file mode 120000 index d5b5c4d5602..00000000000 --- a/qa/suites/fs/multifs/clusters/1-mds-2-client-coloc.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/clusters/1-mds-2-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/multifs/clusters/1a3s-mds-2c-client.yaml b/qa/suites/fs/multifs/clusters/1a3s-mds-2c-client.yaml new file mode 120000 index 00000000000..c190ea92ff5 --- /dev/null +++ b/qa/suites/fs/multifs/clusters/1a3s-mds-2c-client.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1a3s-mds-2c-client.yaml \ No newline at end of file