Merge branch 'master' of github.com:SchedMD/slurm

doc/man/man1/Makefile.am

@@ -36,6 +36,7 @@ html_DATA = \
 	sbcast.html \
 	scancel.html \
 	scontrol.html \
+	sdiag.html \
 	sinfo.html \
 	smap.html \
 	sprio.html \

doc/man/man1/Makefile.in

@@ -344,6 +344,7 @@ man1_MANS = \
 @HAVE_MAN2HTML_TRUE@	sbcast.html \
 @HAVE_MAN2HTML_TRUE@	scancel.html \
 @HAVE_MAN2HTML_TRUE@	scontrol.html \
+@HAVE_MAN2HTML_TRUE@	sdiag.html \
 @HAVE_MAN2HTML_TRUE@	sinfo.html \
 @HAVE_MAN2HTML_TRUE@	smap.html \
 @HAVE_MAN2HTML_TRUE@	sprio.html \

doc/man/man1/sdiag.1

@@ -167,6 +167,29 @@ as much times as partitions it requested.
 \fBQueue length Mean\fR
 Mean of jobs pending to be processed by backfilling algorithm.
 
+.SH "OPTIONS"
+.LP
+
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+Get and report information. This is the default mode of operation.
+
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print description of options and exit.
+
+.TP
+\fB\-r\fR, \fB\-\-reset\fR
+Reset counters. Only used by user SlurmUser or root.
+
+.TP
+\fB\-\-usage\fR
+Print list of options and exit.
+
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Print current version number and exit.
+
 .SH "COPYING"
 SLURM is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

src/sdiag/opts.c

@@ -70,23 +70,28 @@ extern void parse_command_line(int argc, char *argv[])
 	int option_index;
 	static struct option long_options[] = {
 		{"all",		no_argument,	0,	'a'},
-		{"reset",	no_argument,	0,	'r'},
 		{"help",	no_argument,	0,	'h'},
+		{"reset",	no_argument,	0,	'r'},
 		{"usage",	no_argument,	0,	OPT_LONG_USAGE},
+		{"version",     no_argument,	0,	'V'},
 		{NULL,		0,		0,	0}
 	};
 
-	while ((opt_char = getopt_long(argc, argv, "arh", long_options,
+	while ((opt_char = getopt_long(argc, argv, "ahrV", long_options,
 				       &option_index)) != -1) {
 		switch (opt_char) {
 			case (int)'a':
 				sdiag_param = STAT_COMMAND_GET;
 				break;
+			case (int)'h':
+				_help();
+				exit(0);
+				break;
 			case (int)'r':
 				sdiag_param = STAT_COMMAND_RESET;
 				break;
-			case (int)'h':
-				_help();
+			case (int) 'V':
+				print_slurm_version();
 				exit(0);
 				break;
 			case (int)OPT_LONG_USAGE:
@@ -107,9 +112,10 @@ static void _help( void )
 {
 	printf ("\
 Usage: sdiag [OPTIONS]\n\
-  --a       all statistics\n\
-  --r       reset statistics\n\
+  --a        all statistics\n\
+  --r        reset statistics\n\
 \nHelp options:\n\
-  --help    show this help message\n\
-  --usage   display brief usage message\n");
+  --help     show this help message\n\
+  --usage    display brief usage message\n\
+  --version  display current version number\n");
 }

src/sdiag/sdiag.c

@@ -50,7 +50,7 @@
 /********************
  * Global Variables *
  ********************/
-int sdiag_param = 1;
+int sdiag_param = STAT_COMMAND_GET;
 
 stats_info_response_msg_t *buf;
 

testsuite/expect/Makefile.am

@@ -372,6 +372,11 @@ EXTRA_DIST = \
 	test25.1			\
 	test26.1			\
 	test26.2			\
+	test27.1			\
+	test27.2			\
+	test27.3			\
+	test27.4			\
+	test27.5			\
 	usleep
 
 distclean-local:

testsuite/expect/Makefile.in

@@ -655,6 +655,11 @@ EXTRA_DIST = \
 	test25.1			\
 	test26.1			\
 	test26.2			\
+	test27.1			\
+	test27.2			\
+	test27.3			\
+	test27.4			\
+	test27.5			\
 	usleep
 
 all: all-am

testsuite/expect/README

@@ -533,7 +533,7 @@ test20.4   pbsnodes command tests
 
 
 test21.#   Testing of sacctmgr commands and options.
-=================================================
+====================================================
 test21.1   sacctmgr --usage
 test21.2   sacctmgr --help
 test21.3   sacctmgr -V
@@ -565,28 +565,42 @@ test21.27  sacctmgr problems test
 test21.28  sacctmgr abort delete
 test21.29  sacctmgr clear (modify) QoS values
 
+
 test22.#   Testing of sreport commands and options.
            These also test the sacctmgr archive dump/load functions.
-=================================================
+==================================================
 test22.1   sreport cluster utilization report
 test22.2   sreport h, n, p, P, t, V options
 
+
 test23.#   Testing of sstat commands and options.
 =================================================
 test23.1   sstat -e, h, usage and V options
 test23.2   sstat --helpformat
 test23.3   sstat -a, n, o, p, P, v options
 
+
 test24.#   Testing of sshare/priority multifactor plugin.
-=================================================
+=========================================================
 test24.1   multifactor plugin algo test
 test24.2   sshare h, n, p, P, v, and V options.
 
+
 test25.#   Testing of sprio command and options.
-=================================================
+================================================
 test25.1   sprio all options
 
+
 test26.#   Test of Cray specific functionality.
 ================================================
 test26.1   Validate scontrol update command for nodes is disabled.
 test26.2   Test of srun/aprun wrapper use of --alps= option
+
+
+test27.#   Testing of sdiag commands and options.
+=================================================
+test27.1   sdiag --usage
+test27.2   sdiag --help
+test27.3   sdiag --version
+test27.4   sdiag --all (default output)
+test27.5   sdiag --reset

testsuite/expect/globals

@@ -78,6 +78,7 @@ cset sbatch      "${slurm_dir}/bin/sbatch"
 cset sbcast      "${slurm_dir}/bin/sbcast"
 cset scancel     "${slurm_dir}/bin/scancel"
 cset scontrol    "${slurm_dir}/bin/scontrol"
+cset sdiag       "${slurm_dir}/bin/sdiag"
 cset sinfo       "${slurm_dir}/bin/sinfo"
 cset smap        "${slurm_dir}/bin/smap"
 cset sprio       "${slurm_dir}/bin/sprio"