diff --git a/qa/cephfs/begin/3-modules.yaml b/qa/cephfs/begin/3-modules.yaml deleted file mode 100644 index 25947342569..00000000000 --- a/qa/cephfs/begin/3-modules.yaml +++ /dev/null @@ -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 diff --git a/qa/suites/fs/workload/begin/3-modules.yaml b/qa/suites/fs/workload/begin/3-modules.yaml deleted file mode 120000 index 1eba706a59d..00000000000 --- a/qa/suites/fs/workload/begin/3-modules.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/begin/3-modules.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml index dee81778942..51bbe2a3dbf 100644 --- a/qa/suites/fs/workload/tasks/3-snaps/yes.yaml +++ b/qa/suites/fs/workload/tasks/3-snaps/yes.yaml @@ -1,8 +1,3 @@ -mgrmodules: - sequential: - - exec: - mon.a: - - ceph mgr module enable snap_schedule overrides: ceph: mgr-modules: diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py index b01fe370ec0..251337085a0 100644 --- a/qa/tasks/ceph.py +++ b/qa/tasks/ceph.py @@ -376,7 +376,7 @@ def module_setup(ctx, config): cluster_name, 'mgr', 'module', - 'emable', + 'enable', m, ] log.info("enabling module %s", m)