From f05f90b527b915ca53ae69048a01f6b0adc0cf4b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 18 Feb 2013 13:24:18 -0800 Subject: [PATCH] rados: use 2 instead of 3 machines Put the client on the same node as some of the osds. This shouldn't cause any problems. It will make timing a bit different, but if anything that is probably a good thing. Signed-off-by: Sage Weil --- suites/rados/basic/clusters/fixed-2.yaml | 1 + suites/rados/basic/clusters/fixed-3.yaml | 1 - suites/rados/monthrash/clusters/6-osd-3-machine.yaml | 4 ---- suites/rados/monthrash/clusters/fixed-2.yaml | 1 + suites/rados/thrash/clusters/6-osd-3-machine.yaml | 4 ---- suites/rados/thrash/clusters/fixed-2.yaml | 1 + suites/rados/verify/clusters/fixed-2.yaml | 1 + suites/rados/verify/clusters/fixed-3.yaml | 1 - 8 files changed, 4 insertions(+), 10 deletions(-) create mode 120000 suites/rados/basic/clusters/fixed-2.yaml delete mode 120000 suites/rados/basic/clusters/fixed-3.yaml delete mode 100644 suites/rados/monthrash/clusters/6-osd-3-machine.yaml create mode 120000 suites/rados/monthrash/clusters/fixed-2.yaml delete mode 100644 suites/rados/thrash/clusters/6-osd-3-machine.yaml create mode 120000 suites/rados/thrash/clusters/fixed-2.yaml create mode 120000 suites/rados/verify/clusters/fixed-2.yaml delete mode 120000 suites/rados/verify/clusters/fixed-3.yaml diff --git a/suites/rados/basic/clusters/fixed-2.yaml b/suites/rados/basic/clusters/fixed-2.yaml new file mode 120000 index 0000000000000..cd0791a14861d --- /dev/null +++ b/suites/rados/basic/clusters/fixed-2.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/suites/rados/basic/clusters/fixed-3.yaml b/suites/rados/basic/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/rados/basic/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file diff --git a/suites/rados/monthrash/clusters/6-osd-3-machine.yaml b/suites/rados/monthrash/clusters/6-osd-3-machine.yaml deleted file mode 100644 index 294c2e08b0940..0000000000000 --- a/suites/rados/monthrash/clusters/6-osd-3-machine.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.b, osd.0, osd.1, osd.2] -- [mon.c, mds.a, osd.3, osd.4, osd.5] -- [client.0] diff --git a/suites/rados/monthrash/clusters/fixed-2.yaml b/suites/rados/monthrash/clusters/fixed-2.yaml new file mode 120000 index 0000000000000..cd0791a14861d --- /dev/null +++ b/suites/rados/monthrash/clusters/fixed-2.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/suites/rados/thrash/clusters/6-osd-3-machine.yaml b/suites/rados/thrash/clusters/6-osd-3-machine.yaml deleted file mode 100644 index 294c2e08b0940..0000000000000 --- a/suites/rados/thrash/clusters/6-osd-3-machine.yaml +++ /dev/null @@ -1,4 +0,0 @@ -roles: -- [mon.a, mon.b, osd.0, osd.1, osd.2] -- [mon.c, mds.a, osd.3, osd.4, osd.5] -- [client.0] diff --git a/suites/rados/thrash/clusters/fixed-2.yaml b/suites/rados/thrash/clusters/fixed-2.yaml new file mode 120000 index 0000000000000..cd0791a14861d --- /dev/null +++ b/suites/rados/thrash/clusters/fixed-2.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/suites/rados/verify/clusters/fixed-2.yaml b/suites/rados/verify/clusters/fixed-2.yaml new file mode 120000 index 0000000000000..cd0791a14861d --- /dev/null +++ b/suites/rados/verify/clusters/fixed-2.yaml @@ -0,0 +1 @@ +../../../../clusters/fixed-2.yaml \ No newline at end of file diff --git a/suites/rados/verify/clusters/fixed-3.yaml b/suites/rados/verify/clusters/fixed-3.yaml deleted file mode 120000 index a3ac9fc4dec2f..0000000000000 --- a/suites/rados/verify/clusters/fixed-3.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../clusters/fixed-3.yaml \ No newline at end of file -- 2.39.5