Skip to content

Commit 7432a80

Browse files
committed
libflux: add 'shutdown_path' config, broker attr
Problem: the shutdown script will coexist with rc1 and rc3 as an alternative to the "cleanup" commands currently pushed into broker memory by rc1, but it has no path configuration. Add builtin 'shutdown_path' config key, like to 'rc1_path' and 'rc3_path'. Add 'broker.shutdown_path' broker attribute, like 'broker.rc1_path' and 'broker.rc3_path'. Update flux-config(1) and flux-broker-attributes(7).
1 parent 8ffa238 commit 7432a80

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

doc/man1/flux-config.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ The following configuration keys may be printed with
111111
The rc1 script path used by :man1:`flux-broker`, unless overridden by
112112
the ``broker.rc1_path`` broker attribute.
113113

114+
**shutdown_path**
115+
The shutdown script path used by :man1:`flux-broker`, unless overridden by
116+
the ``broker.shutdown_path`` broker attribute.
117+
114118
**rc3_path**
115119
The rc3 script path used by :man1:`flux-broker`, unless overridden by
116120
the ``broker.rc1_path`` broker attribute.

doc/man7/flux-broker-attributes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ broker.quorum-timeout [Updates: C]
118118
broker.rc1_path [Updates: C]
119119
The path to the broker's rc1 script. Default: ``${prefix}/etc/flux/rc1``.
120120

121+
broker.shutdown_path [Updates: C]
122+
The path to the broker's shutdown script. Default:
123+
``${prefix}/etc/flux/shutdown``.
124+
121125
broker.rc3_path [Updates: C]
122126
The path to the broker's rc3 script. Default: ``${prefix}/etc/flux/rc3``.
123127

src/common/libflux/conf.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,11 @@ static struct builtin builtin_tab[] = {
9494
.val_installed = FLUXCONFDIR "/rc1",
9595
.val_intree = ABS_TOP_SRCDIR "/etc/rc1",
9696
},
97+
{
98+
.key = "shutdown_path",
99+
.val_installed = FLUXCONFDIR "/shutdown",
100+
.val_intree = ABS_TOP_SRCDIR "/etc/shutdown",
101+
},
97102
{
98103
.key = "rc3_path",
99104
.val_installed = FLUXCONFDIR "/rc3",

0 commit comments

Comments
 (0)