From d7e49c8f8e0cf8d59ed0fa8a0f15120a3633e8c6 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 7 Aug 2023 21:14:03 -0400 Subject: [PATCH] qa/cephfs: set confs using cluster-conf So that these configs can be easily overriden by tests. Signed-off-by: Patrick Donnelly --- qa/cephfs/conf/client.yaml | 2 +- qa/cephfs/conf/mds.yaml | 2 +- qa/cephfs/conf/mon.yaml | 9 ++++++--- qa/cephfs/conf/osd.yaml | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/qa/cephfs/conf/client.yaml b/qa/cephfs/conf/client.yaml index 4b37d03b45a..fe667224f92 100644 --- a/qa/cephfs/conf/client.yaml +++ b/qa/cephfs/conf/client.yaml @@ -1,6 +1,6 @@ overrides: ceph: - conf: + cluster-conf: client: client mount timeout: 600 debug ms: 1 diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml index b1c7a586944..ce89488d482 100644 --- a/qa/cephfs/conf/mds.yaml +++ b/qa/cephfs/conf/mds.yaml @@ -1,6 +1,6 @@ overrides: ceph: - conf: + cluster-conf: mds: debug mds: 20 debug mds balancer: 20 diff --git a/qa/cephfs/conf/mon.yaml b/qa/cephfs/conf/mon.yaml index e1ea6f6cc83..e33437ae404 100644 --- a/qa/cephfs/conf/mon.yaml +++ b/qa/cephfs/conf/mon.yaml @@ -1,8 +1,11 @@ overrides: ceph: - conf: + cluster-conf: mon: mon op complaint time: 120 - # cephadm can take up to 5 minutes to bring up remaining mons - mon down mkfs grace: 300 mon warn on pool no app: false + # cephadm can take up to 5 minutes to bring up remaining mons + # This needs to be set before cluster-conf configs are applied. + conf: + mon: + mon down mkfs grace: 300 diff --git a/qa/cephfs/conf/osd.yaml b/qa/cephfs/conf/osd.yaml index 1087202f998..2687192680f 100644 --- a/qa/cephfs/conf/osd.yaml +++ b/qa/cephfs/conf/osd.yaml @@ -1,5 +1,5 @@ overrides: ceph: - conf: + cluster-conf: osd: osd op complaint time: 180 -- 2.39.5