Skip to content

Commit 3474820

Browse files
committed
Merge PR ceph#59467 into main
* refs/pull/59467/head: qa: correct daemon for warning conf qa: print config dump after setting Reviewed-by: Adam King <[email protected]>
2 parents 0a99710 + 9aee68a commit 3474820

File tree

4 files changed

+17
-2
lines changed

4 files changed

+17
-2
lines changed

qa/cephfs/conf/mgr.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
overrides:
22
ceph:
3-
conf:
3+
cluster-conf:
44
mgr:
55
client mount timeout: 30
66
debug client: 20
77
debug mgr: 20
88
debug ms: 1
9+
mon warn on pool no app: false

qa/cephfs/conf/mon.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ overrides:
33
cluster-conf:
44
mon:
55
mon op complaint time: 120
6-
mon warn on pool no app: false
76
# cephadm can take up to 5 minutes to bring up remaining mons
87
# This needs to be set before cluster-conf configs are applied.
98
conf:

qa/tasks/ceph.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,15 @@ def conf_setup(ctx, config):
414414
for p in procs:
415415
log.debug("waiting for %s", p)
416416
p.wait()
417+
cmd = [
418+
'sudo',
419+
'ceph',
420+
'--cluster',
421+
cluster_name,
422+
'config',
423+
'dump',
424+
]
425+
mon_remote.run(args=cmd)
417426
yield
418427

419428
@contextlib.contextmanager

qa/tasks/cephadm.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,6 +1849,12 @@ def conf_setup(ctx, config):
18491849
for p in procs:
18501850
log.debug("waiting for %s", p)
18511851
p.wait()
1852+
cmd = [
1853+
'ceph',
1854+
'config',
1855+
'dump',
1856+
]
1857+
_shell(ctx, cluster_name, remote, args=cmd)
18521858
yield
18531859

18541860
@contextlib.contextmanager

0 commit comments

Comments
 (0)