Skip to content

Commit

Permalink
rc: add a prefix number to each script to enforce ordering
Browse files Browse the repository at this point in the history
Add flux module remove sched-simple for fluxion
resource rc1 script. fluxion resource requires
the resource.acquire RPC which conflicts with
sched-simple's use of it.
  • Loading branch information
dongahn committed Jun 17, 2020
1 parent 2c6870d commit 251b200
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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

8 changes: 4 additions & 4 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 251b200

Please sign in to comment.