Merge PR #58487 into main

* refs/pull/58487/head:
	qa/suites/fs/workload: drop mgrmodules stanza
	qa/tasks/ceph: fix "ceph mgr module enable" command

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
This commit is contained in:
Venky Shankar 2024-08-23 22:02:34 +05:30
commit db4959e44f
4 changed files with 1 additions and 26 deletions

View File

@ -1,19 +0,0 @@
# Enable mgr modules now before any CephFS mounts are created by the mgr. This
# avoids the potential race of the mgr mounting CephFS and then getting failed
# over by the monitors before the monitors have a chance to note the new client
# session from the mgr beacon. In that case, the monitors will not blocklist
# that client mount automatically so the MDS will eventually do the eviction
# (and create a cluster log warning which we want to avoid).
#
# Note: ideally the mgr would gently stop mgr modules before respawning so that
# the client mounts can be unmounted but this caused issues historically with
# modules like the dashboard so an abrupt restart was chosen instead.
mgrmodules:
sequential:
- print: "Enabling mgr modules"
# other fragments append to this
tasks:
- sequential:
- mgrmodules

View File

@ -1 +0,0 @@
.qa/cephfs/begin/3-modules.yaml

View File

@ -1,8 +1,3 @@
mgrmodules:
sequential:
- exec:
mon.a:
- ceph mgr module enable snap_schedule
overrides:
ceph:
mgr-modules:

View File

@ -376,7 +376,7 @@ def module_setup(ctx, config):
cluster_name,
'mgr',
'module',
'emable',
'enable',
m,
]
log.info("enabling module %s", m)