diff --git a/etc/sched-fluxion-qmanager-stop b/etc/01-sched-fluxion-qmanager-stop similarity index 56% rename from etc/sched-fluxion-qmanager-stop rename to etc/01-sched-fluxion-qmanager-stop index 79ee6db55..46cdbebe4 100755 --- a/etc/sched-fluxion-qmanager-stop +++ b/etc/01-sched-fluxion-qmanager-stop @@ -1,6 +1,6 @@ #!/bin/bash -e if [ -z ${FLUXION_QMANAGER_RC_NOOP} ]; then - flux module remove sched-fluxion-qmanager + flux module remove -f sched-fluxion-qmanager fi diff --git a/etc/sched-fluxion-resource-start b/etc/01-sched-fluxion-resource-start similarity index 88% rename from etc/sched-fluxion-resource-start rename to etc/01-sched-fluxion-resource-start index c62f00f1b..01d6b0327 100755 --- a/etc/sched-fluxion-resource-start +++ b/etc/01-sched-fluxion-resource-start @@ -19,6 +19,9 @@ # load it via FLUX_RC_EXTRA, the in-tree version can be loaded. if [ -z ${FLUXION_RESOURCE_RC_NOOP} ]; then + # Unloading sched-simple as sched-fluxion-resource requires resource.acquire + # that is exclusively used by it. + flux module remove -f sched-simple FLUXION_RESOURCE_OPTIONS=${FLUXION_RESOURCE_OPTIONS:-"load-whitelist=node,core,gpu"} flux module reload -f sched-fluxion-resource ${FLUXION_RESOURCE_OPTIONS} fi diff --git a/etc/sched-fluxion-qmanager-start b/etc/02-sched-fluxion-qmanager-start similarity index 100% rename from etc/sched-fluxion-qmanager-start rename to etc/02-sched-fluxion-qmanager-start diff --git a/etc/sched-fluxion-resource-stop b/etc/02-sched-fluxion-resource-stop similarity index 56% rename from etc/sched-fluxion-resource-stop rename to etc/02-sched-fluxion-resource-stop index 3163dc725..a41ec67b9 100755 --- a/etc/sched-fluxion-resource-stop +++ b/etc/02-sched-fluxion-resource-stop @@ -1,6 +1,6 @@ #!/bin/bash -e if [ -z ${FLUXION_RESOURCE_RC_NOOP} ]; then - flux module remove sched-fluxion-resource + flux module remove -f sched-fluxion-resource fi diff --git a/etc/Makefile.am b/etc/Makefile.am index 1f691517f..9e31728e7 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -1,8 +1,8 @@ dist_fluxrc1_SCRIPTS = \ - sched-fluxion-resource-start \ - sched-fluxion-qmanager-start + 01-sched-fluxion-resource-start \ + 02-sched-fluxion-qmanager-start dist_fluxrc3_SCRIPTS = \ - sched-fluxion-resource-stop \ - sched-fluxion-qmanager-stop + 02-sched-fluxion-resource-stop \ + 01-sched-fluxion-qmanager-stop EXTRA_DIST = sched-fluxion-qmanager.toml