From 6b4f4fa4bfb4f29011b82506b37e012f95aa96b1 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Wed, 15 Oct 2008 15:34:10 +0000
Subject: [PATCH] svn merge -r15415:15424
https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
---
doc/man/man1/sacct.1 | 14 +++++++-------
doc/man/man1/sacctmgr.1 | 4 ++++
doc/man/man1/sinfo.1 | 2 +-
doc/man/man3/slurm_free_job_info_msg.3 | 2 +-
doc/man/man3/slurm_slurmd_status.3 | 1 +
src/common/hostlist.h | 2 +-
testsuite/expect/test21.10 | 4 ++--
testsuite/expect/test21.11 | 2 +-
testsuite/expect/test21.12 | 2 +-
testsuite/expect/test21.5 | 2 +-
testsuite/expect/test21.6 | 2 +-
11 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/doc/man/man1/sacct.1 b/doc/man/man1/sacct.1
index ca501a0743a..9b3e95389de 100644
--- a/doc/man/man1/sacct.1
+++ b/doc/man/man1/sacct.1
@@ -84,7 +84,7 @@ option is also specified.
\f3\-C \fP\f2cluster_list\fP\f3,\fP \f3\-\-cluster\fP\f3=\fP\f2cluster_list\fP
Displays the statistics only for the jobs started on the clusters specified by
the \f2cluster_list\fP operand, which is a comma\-separated list of clusters.
-Space characters are not allowed in the \f2cluster_list\fP. -1 for
+Space characters are not allowed in the \f2cluster_list\fP. \-1 for
all clusters, default is current cluster you are executing the sacct
command on\&.
@@ -190,7 +190,7 @@ instead of the current SLURM job accounting log file.
Displays the statistics only for the jobs started with the GID
specified by the \f2gid_list\fP operand, which is a comma\-separated
list of gids. Space characters are not allowed in the \f2gid_list\fP.
-Default is no restrictions. This is virtually the same as the --group
+Default is no restrictions. This is virtually the same as the \-\-group
option\&.
.TP
@@ -198,7 +198,7 @@ option\&.
Displays the statistics only for the jobs started with the GROUP
specified by the \f2group_list\fP operand, which is a comma\-separated
list of groups. Space characters are not allowed in the \f2group_list\fP.
-Default is no restrictions. This is virtually the same as the --gid option\&.
+Default is no restrictions. This is virtually the same as the \-\-gid option\&.
.TP
\f3\-h \fP\f3,\fP \f3\-\-help\fP
@@ -389,16 +389,16 @@ Intermediate steps are displayed by default.
Displays the statistics only for the jobs started by the specified
\f2uid_list\fP operand, which is a comma\-separated list of uids.
Space characters are not allowed in the \f2uid_list\fP.
--1 for all uids, default is current uid. If run as user root default
-is all users. This is virtually the same as the --user option\&.
+\-1 for all uids, default is current uid. If run as user root default
+is all users. This is virtually the same as the \-\-user option\&.
.TP
\f3\-u \fP\f2user_list\fP\f3,\fP \f3\-\-user\fP\f3=\fP\f2user_list\fP
Displays the statistics only for the jobs started by the specified
\f2user_list\fP operand, which is a comma\-separated list of users.
Space characters are not allowed in the \f2user_list\fP.
--1 for all uids, default is current uid. If run as user root default
-is all users. This is virtually the same as the --uid option\&.
+\-1 for all uids, default is current uid. If run as user root default
+is all users. This is virtually the same as the \-\-uid option\&.
.TP
\f3\-\-usage\fP
diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1
index cc6669ec925..ff407e65728 100644
--- a/doc/man/man1/sacctmgr.1
+++ b/doc/man/man1/sacctmgr.1
@@ -694,6 +694,7 @@ Comma separated list of Quality of Service names (Defined in sacctmgr).
Followed by Accounts you want in this fashion...
+.na
\fBParent\ \-\ root\fP (Defined by default)
.br
\fBAccount\ \-\ cs\fP:MaxNodesPerJob=5:MaxJobs=4:MaxProcSecondsPerJob=20:FairShare=399:MaxWallDurationPerJob=40:Description='Computer Science':Organization='LC'
@@ -701,6 +702,7 @@ Followed by Accounts you want in this fashion...
\fBParent\ \-\ cs\fP
.br
\fBAccount\ \-\ test\fP:MaxNodesPerJob=1:MaxJobs=1:MaxProcSecondsPerJob=1:FairShare=1:MaxWallDurationPerJob=1:Description='Test Account':Organization='Test'
+.ad
.TP
Any of the options after a ':' can be left out and they can be in any order.
@@ -771,7 +773,9 @@ Comma separated list of Quality of Service names (Defined in sacctmgr).
To add users to a account add a line like this after a Parent \- line
\fBParent\ \-\ test\fP
.br
+.na
\fBUser\ \-\ adam\fP:MaxNodesPerJob=2:MaxJobs=3:MaxProcSecondsPerJob=4:FairShare=1:MaxWallDurationPerJob=1:AdminLevel=Operator:Coordinator='test'
+.ad
.TP
All user options are
diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index d0356800ddc..d9ebfaaa014 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -473,7 +473,7 @@ debug* up 30:00 0/8/0/8 adev[0-7]
Report more complete information about the partition debug:
.nf
-> sinfo \-\-long \-\-partition=debug
+> sinfo --long --partition=debug
PARTITION AVAIL TIMELIMIT JOB_SIZE ROOT SHARE GROUPS NODES STATE NODELIST
debug* up 30:00 8 no no all 8 idle dev[0-7]
.fi
diff --git a/doc/man/man3/slurm_free_job_info_msg.3 b/doc/man/man3/slurm_free_job_info_msg.3
index ce1b8dabd5b..ff193a18504 100644
--- a/doc/man/man3/slurm_free_job_info_msg.3
+++ b/doc/man/man3/slurm_free_job_info_msg.3
@@ -186,7 +186,7 @@ greater than the last time changes where made to that information, new
information is not returned. Otherwise all the configuration. job, node,
or partition records are returned.
.SH "DESCRIPTION"
-.JP
+.LP
\fBslurm_free_resource_allocation_response_msg\fR Free slurm resource
allocation response message.
.LP
diff --git a/doc/man/man3/slurm_slurmd_status.3 b/doc/man/man3/slurm_slurmd_status.3
index 87c4badc1f8..60ef74bcbc5 100644
--- a/doc/man/man3/slurm_slurmd_status.3
+++ b/doc/man/man3/slurm_slurmd_status.3
@@ -3,6 +3,7 @@
.SH "NAME"
slurm_free_slurmd_status, slurm_load_slurmd_status, slurm_print_slurmd_status
+\- Slurmd status functions
.SH "SYNTAX"
.LP
diff --git a/src/common/hostlist.h b/src/common/hostlist.h
index 41a8501899e..1f49a65700f 100644
--- a/src/common/hostlist.h
+++ b/src/common/hostlist.h
@@ -40,7 +40,7 @@
#ifndef _HOSTLIST_H
#define _HOSTLIST_H
-#include <unistd.h> /* load ssize_t definition */
+#include <sys/types.h> /* load ssize_t definition */
/* max size of internal hostrange buffer */
#define MAXHOSTRANGELEN 8192
diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index ae9cd61f123..71d8e1ac550 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -106,7 +106,7 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
set nothing 0
set matches 0
-set sadel_pid [spawn $sacctmgr -i $del $clu $tc1]
+set my_pid [spawn $sacctmgr -i $del $clu $tc1]
expect {
-re "privilege to perform this action" {
@@ -269,7 +269,7 @@ expect {
}
timeout {
send_user "\nFAILURE: sacctmgr add not responding\n"
- slow_kill $sadd_pid
+ slow_kill $sadel_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index c23e308aaf0..68f75cd423b 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -134,7 +134,7 @@ expect {
}
timeout {
send_user "\nFAILURE: sacctmgr add not responding\n"
- slow_kill $sadd_pid
+ slow_kill $sadel_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test21.12 b/testsuite/expect/test21.12
index d66fab3a2ac..4566dcacadb 100755
--- a/testsuite/expect/test21.12
+++ b/testsuite/expect/test21.12
@@ -136,7 +136,7 @@ expect {
}
timeout {
send_user "\nFAILURE: sacctmgr add not responding\n"
- slow_kill $sadd_pid
+ slow_kill $sadel_pid
set exit_code 1
}
eof {
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index ce86a271649..4f83bef5e64 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -94,7 +94,7 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
set nothing 0
set matches 0
-set sadel_pid [spawn $sacctmgr -i $del $clu $tc1]
+set my_pid [spawn $sacctmgr -i $del $clu $tc1]
expect {
-re "privilege to perform this action" {
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index 5a2e4a0407c..b738004445c 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -97,7 +97,7 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
set nothing 0
set matches 0
-set sadel_pid [spawn $sacctmgr -i $del $clu $tc1,$tc2,$tc3]
+set my_pid [spawn $sacctmgr -i $del $clu $tc1,$tc2,$tc3]
expect {
-re "privilege to perform this action" {
--
GitLab