diff --git a/NEWS b/NEWS index 894e7bd1574fabd1633e12aca1502b6bda1fda03..a825748b2a6219ec6e3f164a94b9564668e9b54c 100644 --- a/NEWS +++ b/NEWS @@ -268,6 +268,11 @@ documents those changes that are of interest to users and admins. the code) -- Added support for OSX build. +* Changes in SLURM 1.1.35 +========================= + - In sched/wiki - Add support for CMD=SIGNALJOB to accept option + of VALUE=SIGXXX in addition to VALUE=# and VALUE=XXX options + * Changes in SLURM 1.1.34 ========================= - Insure that slurm_signal_job_step() is defined in srun for mvapich diff --git a/src/plugins/sched/wiki2/job_signal.c b/src/plugins/sched/wiki2/job_signal.c index 94912b71bf3c9c27bfd2fd1674b860fcd05a6c77..be30e48ec15f415d1f5416876ecbca6a417f590e 100644 --- a/src/plugins/sched/wiki2/job_signal.c +++ b/src/plugins/sched/wiki2/job_signal.c @@ -40,6 +40,12 @@ #include "src/slurmctld/locks.h" #include "src/slurmctld/slurmctld.h" +/* translate a signal value to the numeric value, sig_ptr value + * can have three different forms: + * 1. A number + * 2. SIGUSR1 (or other suffix) + * 3. USR1 + */ static uint16_t _xlate_signal(char *sig_ptr) { uint16_t sig_val; @@ -52,6 +58,9 @@ static uint16_t _xlate_signal(char *sig_ptr) return sig_val; } + if (strncasecmp(sig_ptr, "SIG", 3) == 0) + sig_ptr += 3; + if (strncasecmp(sig_ptr, "HUP", 3) == 0) return SIGHUP; if (strncasecmp(sig_ptr, "INT", 3) == 0)