do not put monitors on the same nodes as clients

Otherwise, for kernel clients (rbd or kclient), ceph-mon can cause a deadlock when it calls sync(2).

diff --git a/clusters/fixed-3.yaml b/clusters/fixed-3.yaml
index 6afdacae86957c7c0e3d1b85e02bd0924371de83..2cae763a3df1197aa1cf75012de4f073effec698 100644 (file)
--- a/clusters/fixed-3.yaml
+++ b/clusters/fixed-3.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.0, mds.0, osd.0]
-- [mon.1, osd.1]
-- [mon.2, client.0]
+- [mon.a, mon.c, osd.0]
+- [mon.b, mds.a, osd.1]
+- [client.0]

diff --git a/suites/regression/multiclient/clusters/two_clients.yaml b/suites/regression/multiclient/clusters/two_clients.yaml
index 5c9f166e41d1d351d7dadc269d309b378b98f285..06c6d8f7a2169d86c9c273af98072167a738d9de 100644 (file)
--- a/suites/regression/multiclient/clusters/two_clients.yaml
+++ b/suites/regression/multiclient/clusters/two_clients.yaml
@@ -1,4 +1,4 @@
 roles:
-- [mon.0, mds.0, osd.0, osd.1]
-- [mon.1, client.1]
-- [mon.2, client.0]
+- [mon.0, mon.1, mon.2, mds.0, osd.0, osd.1]
+- [client.1]
+- [client.0]