From 283962324efdfff103a4be49ce97c3c30cb56746 Mon Sep 17 00:00:00 2001
From: Brian Christiansen <brian@schedmd.com>
Date: Tue, 4 Apr 2017 16:34:31 -0600
Subject: [PATCH] Add local and sibling flags to scontrol
Controls whether jobs local only to the cluster are shown or all sibling
jobs are shown in a federation.
---
doc/man/man1/scontrol.1 | 13 +++++++++++++
src/scontrol/info_job.c | 4 ++++
src/scontrol/scontrol.c | 23 +++++++++++++++++++++--
src/scontrol/scontrol.h | 2 ++
4 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index 20897d6f911..a3f3590001d 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -46,6 +46,10 @@ Do not display information about hidden partitions, their jobs and job steps.
By default, neither partitions that are configured as hidden nor those partitions
unavailable to user's group will be displayed (i.e. this is the default behavior).
.TP
+\fB\-\-local\fR
+Show only jobs local to this cluster. Ignore other clusters in this federation
+(if any).
+.TP
\fB\-M\fR, \fB\-\-clusters\fR=<\fIstring\fR>
The cluster to issue commands to. Only one cluster name may be specified.
Note that the SlurmDBD must be up for this option to work properly.
@@ -57,6 +61,9 @@ Print information one line per record.
\fB\-Q\fR, \fB\-\-quiet\fR
Print no warning or informational messages, only fatal error messages.
.TP
+\fB\-\-sibling\fR
+Show all sibling jobs on a federated cluster.
+.TP
\fB\-u\fR, \fB\-\-uid\fR=<\fIuid\fR>
Attempt to update a job as user <uid> instead of the invoking user id.
.TP
@@ -1796,6 +1803,12 @@ Commandline options will always override these settings.)
\fBSCONTROL_ALL\fR
\fB\-a, \-\-all\fR
.TP
+\fBSCONTROL_LOCAL\fR
+\\fB\-\-local\fR
+.TP
+\fBSCONTROL_SIBLING\fR
+\\fB\-\-sibling\fR
+.TP
\fBSLURM_BITSTR_LEN\fR
Specifies the string length to be used for holding a job array's task ID
expression.
diff --git a/src/scontrol/info_job.c b/src/scontrol/info_job.c
index 0a87ff2415b..b6c31047746 100644
--- a/src/scontrol/info_job.c
+++ b/src/scontrol/info_job.c
@@ -91,6 +91,10 @@ scontrol_load_job(job_info_msg_t ** job_buffer_pptr, uint32_t job_id)
if (detail_flag > 1)
show_flags |= SHOW_DETAIL2;
}
+ if (local_flag)
+ show_flags |= SHOW_LOCAL;
+ if (sibling_flag)
+ show_flags |= SHOW_SIBLING;
if (old_job_info_ptr) {
if (last_show_flags != show_flags)
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 152d9f7fff8..a95de6301fa 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -46,7 +46,9 @@
#include "src/common/proc_args.h"
#include "src/common/uid.h"
-#define OPT_LONG_HIDE 0x102
+#define OPT_LONG_HIDE 0x102
+#define OPT_LONG_LOCAL 0x103
+#define OPT_LONG_SIBLING 0x104
/* Global externs from scontrol.h */
char *command_name;
@@ -56,8 +58,10 @@ int detail_flag = 0; /* display additional details */
int exit_code = 0; /* scontrol's exit code, =1 on any error at any time */
int exit_flag = 0; /* program to terminate if =1 */
int input_words = 128; /* number of words of input permitted */
+int local_flag = 0; /* show only local jobs -- not remote remote sib jobs */
int one_liner = 0; /* one record per line if =1 */
int quiet_flag = 0; /* quiet=1, verbose=-1, normal=0 */
+int sibling_flag = 0; /* show sibling jobs (if any fed job). */
int verbosity = 0; /* count of "-v" options */
uint32_t cluster_flags; /* what type of cluster are we talking to */
uint32_t euid = NO_VAL; /* send request to the slurmctld in behave of
@@ -105,8 +109,10 @@ int main(int argc, char **argv)
{"details", 0, 0, 'd'},
{"help", 0, 0, 'h'},
{"hide", 0, 0, OPT_LONG_HIDE},
+ {"local", 0, 0, OPT_LONG_LOCAL},
{"oneliner", 0, 0, 'o'},
{"quiet", 0, 0, 'Q'},
+ {"sibling", 0, 0, OPT_LONG_SIBLING},
{"uid", 1, 0, 'u'},
{"usage", 0, 0, 'h'},
{"verbose", 0, 0, 'v'},
@@ -127,6 +133,10 @@ int main(int argc, char **argv)
}
working_cluster_rec = list_peek(clusters);
}
+ if (getenv("SCONTROL_LOCAL"))
+ local_flag = 1;
+ if (getenv("SCONTROL_SIB") || getenv("SCONTROL_SIBLING"))
+ sibling_flag = 1;
while (1) {
if ((optind < argc) &&
@@ -155,6 +165,9 @@ int main(int argc, char **argv)
all_flag = 0;
detail_flag = 0;
break;
+ case OPT_LONG_LOCAL:
+ local_flag = 1;
+ break;
case (int)'M':
if (clusters) {
FREE_NULL_LIST(clusters);
@@ -172,6 +185,9 @@ int main(int argc, char **argv)
case (int)'Q':
quiet_flag = 1;
break;
+ case OPT_LONG_SIBLING:
+ sibling_flag = 1;
+ break;
case (int)'u':
if (uid_from_string(optarg, &euid) < 0) {
error("--uid=\"%s\" invalid", optarg);
@@ -1924,11 +1940,14 @@ scontrol [<OPTION>] [<COMMAND>] \n\
-a or --all: equivalent to \"all\" command \n\
-d or --details: equivalent to \"details\" command \n\
-h or --help: equivalent to \"help\" command \n\
- --hide: equivalent to \"hide\" command \n\
+ --hide: equivalent to \"hide\" command \n\
+ --local: Report information only about jobs on the local cluster\n\
-M or --cluster: equivalent to \"cluster\" command \n\
NOTE: SlurmDBD must be up. \n\
-o or --oneliner: equivalent to \"oneliner\" command \n\
-Q or --quiet: equivalent to \"quiet\" command \n\
+ --sibling: Report information about all sibling jobs on a \n\
+ federated cluster \n\
-u or --uid: Update job as user <uid> instead of the invoking user id.\n\
-v or --verbose: equivalent to \"verbose\" command \n\
-V or --version: equivalent to \"version\" command \n\
diff --git a/src/scontrol/scontrol.h b/src/scontrol/scontrol.h
index b26d9450f77..092b875b4eb 100644
--- a/src/scontrol/scontrol.h
+++ b/src/scontrol/scontrol.h
@@ -81,8 +81,10 @@ extern int detail_flag; /* display additional details */
extern int exit_code; /* scontrol's exit code, =1 on any error at any time */
extern int exit_flag; /* program to terminate if =1 */
extern int input_words; /* number of words of input permitted */
+extern int local_flag; /* show only local jobs -- not remote remote sib jobs */
extern int one_liner; /* one record per line if =1 */
extern int quiet_flag; /* quiet=1, verbose=-1, normal=0 */
+extern int sibling_flag; /* show sibling jobs (if any fed job). */
extern uint32_t cluster_flags; /* what type of cluster are we talking to */
extern uint32_t euid; /* send request to the slurmctld in behave of this user */
--
GitLab