Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
ff89effe
Commit
ff89effe
authored
14 years ago
by
Moe Jette
Browse files
Options
Downloads
Patches
Plain Diff
fixes a 'missing argument' case for 'scontrol --clusters'.
Based on 03_scontrol_clusters_argu~1.diff from Gerrit.
parent
4b6c1ed5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/man/man1/scontrol.1
+3
-3
3 additions, 3 deletions
doc/man/man1/scontrol.1
src/scontrol/scontrol.c
+4
-4
4 additions, 4 deletions
src/scontrol/scontrol.c
with
7 additions
and
7 deletions
doc/man/man1/scontrol.1
+
3
−
3
View file @
ff89effe
...
@@ -29,7 +29,7 @@ and jobs steps. This causes information to be displayed about partitions
...
@@ -29,7 +29,7 @@ and jobs steps. This causes information to be displayed about partitions
that are configured as hidden and partitions that are unavailable to user's
that are configured as hidden and partitions that are unavailable to user's
group.
group.
.TP
.TP
\fB\-d\fR, \fB\-\-detail\fR
\fB\-d\fR, \fB\-\-detail
s
\fR
Causes the \fBshow\fR command to provide additional details where available.
Causes the \fBshow\fR command to provide additional details where available.
.TP
.TP
\fB\-h\fR, \fB\-\-help\fR
\fB\-h\fR, \fB\-\-help\fR
...
@@ -142,7 +142,7 @@ The two \fISPECIFICATION\fP choices are \fIPartitionName=<name>\fP and
...
@@ -142,7 +142,7 @@ The two \fISPECIFICATION\fP choices are \fIPartitionName=<name>\fP and
\fIBlockName=<name>\fP also works.
\fIBlockName=<name>\fP also works.
.TP
.TP
\fBdetail\fP
\fBdetail
s
\fP
Causes the \fIshow\fP command to provide additional details where available,
Causes the \fIshow\fP command to provide additional details where available,
namely the specific CPUs and NUMA memory allocated on each node.
namely the specific CPUs and NUMA memory allocated on each node.
Note that on computers with hyperthreading enabled and SLURM configured to
Note that on computers with hyperthreading enabled and SLURM configured to
...
@@ -151,7 +151,7 @@ Each hyperthread on that core can be allocated a separate task, so a job's
...
@@ -151,7 +151,7 @@ Each hyperthread on that core can be allocated a separate task, so a job's
CPU count and task count may differ.
CPU count and task count may differ.
See the \fB\-\-cpu_bind\fR and \fB\-\-mem_bind\fR option descriptions in
See the \fB\-\-cpu_bind\fR and \fB\-\-mem_bind\fR option descriptions in
srun man pages for more information.
srun man pages for more information.
The \fBdetail\fP option is currently only supported for the \fIshow job\fP
The \fBdetail
s
\fP option is currently only supported for the \fIshow job\fP
command.
command.
.TP
.TP
...
...
This diff is collapsed.
Click to expand it.
src/scontrol/scontrol.c
+
4
−
4
View file @
ff89effe
...
@@ -91,8 +91,8 @@ main (int argc, char *argv[])
...
@@ -91,8 +91,8 @@ main (int argc, char *argv[])
int
option_index
;
int
option_index
;
static
struct
option
long_options
[]
=
{
static
struct
option
long_options
[]
=
{
{
"all"
,
0
,
0
,
'a'
},
{
"all"
,
0
,
0
,
'a'
},
{
"cluster"
,
0
,
0
,
'M'
},
{
"cluster"
,
1
,
0
,
'M'
},
{
"clusters"
,
0
,
0
,
'M'
},
{
"clusters"
,
1
,
0
,
'M'
},
{
"details"
,
0
,
0
,
'd'
},
{
"details"
,
0
,
0
,
'd'
},
{
"help"
,
0
,
0
,
'h'
},
{
"help"
,
0
,
0
,
'h'
},
{
"hide"
,
0
,
0
,
OPT_LONG_HIDE
},
{
"hide"
,
0
,
0
,
OPT_LONG_HIDE
},
...
@@ -1514,7 +1514,7 @@ _usage () {
...
@@ -1514,7 +1514,7 @@ _usage () {
scontrol [<OPTION>] [<COMMAND>]
\n
\
scontrol [<OPTION>] [<COMMAND>]
\n
\
Valid <OPTION> values are:
\n
\
Valid <OPTION> values are:
\n
\
-a or --all: equivalent to
\"
all
\"
command
\n
\
-a or --all: equivalent to
\"
all
\"
command
\n
\
-d or --detail: equivalent to
\"
detail
\"
command
\n
\
-d or --detail
s
: equivalent to
\"
detail
s
\"
command
\n
\
-h or --help: equivalent to
\"
help
\"
command
\n
\
-h or --help: equivalent to
\"
help
\"
command
\n
\
--hide: equivalent to
\"
hide
\"
command
\n
\
--hide: equivalent to
\"
hide
\"
command
\n
\
-M or --cluster: equivalent to
\"
cluster
\"
command
\n
\
-M or --cluster: equivalent to
\"
cluster
\"
command
\n
\
...
@@ -1540,7 +1540,7 @@ scontrol [<OPTION>] [<COMMAND>] \n\
...
@@ -1540,7 +1540,7 @@ scontrol [<OPTION>] [<COMMAND>] \n\
completing display jobs in completing state along with
\n
\
completing display jobs in completing state along with
\n
\
their completing or down nodes
\n
\
their completing or down nodes
\n
\
create <SPECIFICATIONS> create a new partition or reservation
\n
\
create <SPECIFICATIONS> create a new partition or reservation
\n
\
detail
evokes additional details from the
\"
show
\"
\n
\
detail
s
evokes additional details from the
\"
show
\"
\n
\
command
\n
\
command
\n
\
delete <SPECIFICATIONS> delete the specified partition or reservation
\n
\
delete <SPECIFICATIONS> delete the specified partition or reservation
\n
\
On Dynamic layout Bluegene systems you can also
\n
\
On Dynamic layout Bluegene systems you can also
\n
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment