Skip to content

Commit e581b9a

Browse files
committed
1 parent c1c6fb1 commit e581b9a

20 files changed

+136
-96
lines changed

ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2023-09-29 S. Thiell <[email protected]>
2+
3+
* Version 1.9.2 released. The main changes are listed below.
4+
5+
* CLI: fix line buffering with Python 3 (#528)
6+
7+
* clush: fix --[r]copy dest when --dest is omitted (#525)
8+
9+
* NodeUtils: allow null values in cluster.yaml (#533)
10+
11+
* Topology: check that node groups/wildcards are non-empty (#527)
12+
13+
* rpm: xcat.conf.example missing (#526)
14+
115
2023-02-09 S. Thiell <[email protected]>
216

317
* Version 1.9.1 released. The main changes are listed below.

clustershell.spec.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,9 @@ rm -rf %{buildroot}
230230
%{vimdatadir}/syntax/groupsconf.vim
231231

232232
%changelog
233+
* Fri Sep 29 2023 Stephane Thiell <[email protected]> 1.9.2-1
234+
- update to 1.9.2
235+
233236
* Thu Feb 9 2023 Stephane Thiell <[email protected]> 1.9.1-1
234237
- update to 1.9.1
235238

doc/man/man1/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SOURCES := $(SRCDIR)/clubak.txt \
66
OBJECTS := $(SOURCES:$(SRCDIR)/%.txt=%.1)
77

88
%.1: ../../txt/%.txt
9-
rst2man -v $< $@
9+
rst2man $< $@
1010

1111
all: $(OBJECTS)
1212

doc/man/man1/clubak.1

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.\" Man page generated from reStructuredText.
22
.
3+
.TH CLUBAK 1 "2023-09-29" "1.9.2" "ClusterShell User Manual"
4+
.SH NAME
5+
clubak \- format output from clush/pdsh-like output and more
36
.
47
.nr rst2man-indent-level 0
58
.
@@ -27,22 +30,19 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2730
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2831
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2932
..
30-
.TH "CLUBAK" 1 "2023-02-09" "1.9.1" "ClusterShell User Manual"
31-
.SH NAME
32-
clubak \- format output from clush/pdsh-like output and more
3333
.SH SYNOPSIS
3434
.sp
3535
\fBclubak\fP [ OPTIONS ]
3636
.SH DESCRIPTION
3737
.sp
3838
\fBclubak\fP formats text from standard input containing lines of the form
39-
\(dq\fInode:output\fP\(dq. It is fully backward compatible with \fBdshbak\fP(1) but
39+
"\fInode:output\fP". It is fully backward compatible with \fBdshbak\fP(1) but
4040
provides additional features. For instance, \fBclubak\fP always displays
4141
its results sorted by node/nodeset.
4242
.sp
4343
You do not need to use \fBclubak\fP when using \fBclush\fP(1) as all output
4444
formatting features are already included in. It is provided for other usages,
45-
like post\-processing results of the form \(dq\fInode:output\fP\(dq.
45+
like post\-processing results of the form "\fInode:output\fP".
4646
.sp
4747
Like \fBclush\fP(1), \fBclubak\fP uses the \fIClusterShell.MsgTree\fP module of the
4848
ClusterShell library (see \fBpydoc ClusterShell.MsgTree\fP).
@@ -52,20 +52,20 @@ ClusterShell library (see \fBpydoc ClusterShell.MsgTree\fP).
5252
.SH OPTIONS
5353
.INDENT 0.0
5454
.TP
55-
.B \-\-version
55+
.B \-\-version
5656
show \fBclubak\fP version number and exit
5757
.TP
58-
.B \-b\fP,\fB \-c
58+
.B \-b\fP,\fB \-c
5959
gather nodes with same output (\-c is provided for \fBdshbak\fP(1)
6060
compatibility)
6161
.TP
62-
.B \-d\fP,\fB \-\-debug
62+
.B \-d\fP,\fB \-\-debug
6363
output more messages for debugging purpose
6464
.TP
65-
.B \-L
65+
.B \-L
6666
disable header block and order output by nodes
6767
.TP
68-
.B \-r\fP,\fB \-\-regroup
68+
.B \-r\fP,\fB \-\-regroup
6969
fold nodeset using node groups
7070
.TP
7171
.BI \-s \ GROUPSOURCE\fR,\fB \ \-\-groupsource\fB= GROUPSOURCE
@@ -74,22 +74,22 @@ optional \fBgroups.conf\fP(5) group source to use
7474
.BI \-\-groupsconf\fB= FILE
7575
use alternate config file for groups.conf(5)
7676
.TP
77-
.B \-G\fP,\fB \-\-groupbase
77+
.B \-G\fP,\fB \-\-groupbase
7878
do not display group source prefix (always \fI@groupname\fP)
7979
.TP
8080
.BI \-S \ SEPARATOR\fR,\fB \ \-\-separator\fB= SEPARATOR
8181
node / line content separator string (default: \fI:\fP)
8282
.TP
83-
.B \-F\fP,\fB \-\-fast
83+
.B \-F\fP,\fB \-\-fast
8484
faster but memory hungry mode (preload all messages per node)
8585
.TP
86-
.B \-T\fP,\fB \-\-tree
86+
.B \-T\fP,\fB \-\-tree
8787
message tree trace mode; switch to enable \fBClusterShell.MsgTree\fP trace mode, all keys/nodes being kept for each message element of the tree, thus allowing special output gathering
8888
.TP
8989
.BI \-\-color\fB= WHENCOLOR
9090
\fBclush\fP can use NO_COLOR, CLICOLOR and CLICOLOR_FORCE environment variables. \fB\-\-color\fP command line option always takes precedence over environment variables. NO_COLOR takes precedence over CLICOLOR_FORCE which takes precedence over CLICOLOR. \fB\-\-color\fP tells whether to use ANSI colors to surround node or nodeset prefix/header with escape sequences to display them in color on the terminal. \fIWHENCOLOR\fP is \fBnever\fP, \fBalways\fP or \fBauto\fP (which use color if standard output refers to a terminal). Color is set to [34m (blue foreground text) and cannot be modified.
9191
.TP
92-
.B \-\-diff
92+
.B \-\-diff
9393
show diff between gathered outputs
9494
.UNINDENT
9595
.SH EXIT STATUS
@@ -121,7 +121,7 @@ Another example, iterate over \fInode*\fP text files in current directory and ga
121121
.INDENT 3.0
122122
.INDENT 3.5
123123
.nf
124-
# find \-name \(dqnode*\(dq \-exec wc \-c {} ; | awk \(aq{ gsub(\(dq./\(dq,\(dq\(dq,$2); print $2\(dq: \(dq$1 }\(aq | clubak \-bL
124+
# find \-name "node*" \-exec wc \-c {} ; | awk \(aq{ gsub("./","",$2); print $2": "$1 }\(aq | clubak \-bL
125125
node[1,3]: 7
126126
node2: 9
127127
.fi

doc/man/man1/cluset.1

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.\" Man page generated from reStructuredText.
22
.
3+
.TH CLUSET 1 "2023-09-29" "1.9.2" "ClusterShell User Manual"
4+
.SH NAME
5+
cluset \- compute advanced cluster node set operations
36
.
47
.nr rst2man-indent-level 0
58
.
@@ -27,9 +30,6 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
2730
.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
2831
.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
2932
..
30-
.TH "CLUSET" 1 "2023-02-09" "1.9.1" "ClusterShell User Manual"
31-
.SH NAME
32-
cluset \- compute advanced cluster node set operations
3333
.SH SYNOPSIS
3434
.INDENT 0.0
3535
.INDENT 3.5
@@ -53,10 +53,10 @@ administration shell scripts.
5353
.INDENT 3.5
5454
.INDENT 0.0
5555
.TP
56-
.B \-\-version
56+
.B \-\-version
5757
show program\(aqs version number and exit
5858
.TP
59-
.B \-h\fP,\fB \-\-help
59+
.B \-h\fP,\fB \-\-help
6060
show this help message and exit
6161
.TP
6262
.BI \-s \ GROUPSOURCE\fR,\fB \ \-\-groupsource\fB= GROUPSOURCE
@@ -70,22 +70,22 @@ use alternate config file for groups.conf(5)
7070
.B Commands:
7171
.INDENT 7.0
7272
.TP
73-
.B \-c\fP,\fB \-\-count
73+
.B \-c\fP,\fB \-\-count
7474
show number of nodes in nodeset(s)
7575
.TP
76-
.B \-e\fP,\fB \-\-expand
76+
.B \-e\fP,\fB \-\-expand
7777
expand nodeset(s) to separate nodes (see also \-S \fISEPARATOR\fP)
7878
.TP
79-
.B \-f\fP,\fB \-\-fold
79+
.B \-f\fP,\fB \-\-fold
8080
fold nodeset(s) (or separate nodes) into one nodeset
8181
.TP
82-
.B \-l\fP,\fB \-\-list
82+
.B \-l\fP,\fB \-\-list
8383
list node groups, list node groups and nodes (\fB\-ll\fP) or list node groups, nodes and node count (\fB\-lll\fP). When no argument is specified at all, this command will list all node group names found in selected group source (see also \-s \fIGROUPSOURCE\fP). If any nodesets are specified as argument, this command will find node groups these nodes belongs to (individually). Optionally for each group, the fraction of these nodes being member of the group may be displayed (with \fB\-ll\fP), and also member count/total group node count (with \fB\-lll\fP). If a single hyphen\-minus (\-) is given as a nodeset, it will be read from standard input.
8484
.TP
85-
.B \-r\fP,\fB \-\-regroup
85+
.B \-r\fP,\fB \-\-regroup
8686
fold nodes using node groups (see \-s \fIGROUPSOURCE\fP)
8787
.TP
88-
.B \-\-groupsources
88+
.B \-\-groupsources
8989
list all active group sources (see \fBgroups.conf\fP(5))
9090
.UNINDENT
9191
.TP
@@ -105,23 +105,23 @@ calculate symmetric difference between sets
105105
.B Options:
106106
.INDENT 7.0
107107
.TP
108-
.B \-a\fP,\fB \-\-all
108+
.B \-a\fP,\fB \-\-all
109109
call external node groups support to display all nodes
110110
.TP
111111
.BI \-\-autostep\fB= AUTOSTEP
112-
enable a\-b/step style syntax when folding nodesets, value is min node count threshold (integer \(aq4\(aq, percentage \(aq50%\(aq or \(aqauto\(aq). If not specified, auto step is disabled (best for compatibility with other cluster tools. Example: autostep=4, \(dqnode2 node4 node6\(dq folds in node[2,4,6] but autostep=3, \(dqnode2 node4 node6\(dq folds in node[2\-6/2].
112+
enable a\-b/step style syntax when folding nodesets, value is min node count threshold (integer \(aq4\(aq, percentage \(aq50%\(aq or \(aqauto\(aq). If not specified, auto step is disabled (best for compatibility with other cluster tools. Example: autostep=4, "node2 node4 node6" folds in node[2,4,6] but autostep=3, "node2 node4 node6" folds in node[2\-6/2].
113113
.TP
114-
.B \-d\fP,\fB \-\-debug
114+
.B \-d\fP,\fB \-\-debug
115115
output more messages for debugging purpose
116116
.TP
117-
.B \-q\fP,\fB \-\-quiet
117+
.B \-q\fP,\fB \-\-quiet
118118
be quiet, print essential output only
119119
.TP
120-
.B \-R\fP,\fB \-\-rangeset
120+
.B \-R\fP,\fB \-\-rangeset
121121
switch to RangeSet instead of NodeSet. Useful when
122122
working on numerical cluster ranges, eg. 1,5,18\-31
123123
.TP
124-
.B \-G\fP,\fB \-\-groupbase
124+
.B \-G\fP,\fB \-\-groupbase
125125
hide group source prefix (always \fI@groupname\fP)
126126
.TP
127127
.BI \-S \ SEPARATOR\fR,\fB \ \-\-separator\fB= SEPARATOR
@@ -132,13 +132,13 @@ separator string to use when expanding nodesets
132132
output format (default: \(aq%s\(aq)
133133
.TP
134134
.BI \-I \ SLICE_RANGESET\fR,\fB \ \-\-slice\fB= SLICE_RANGESET
135-
return sliced off result; examples of SLICE_RANGESET are \(dq0\(dq for simple index selection, or \(dq1\-9/2,16\(dq for complex rangeset selection
135+
return sliced off result; examples of SLICE_RANGESET are "0" for simple index selection, or "1\-9/2,16" for complex rangeset selection
136136
.TP
137137
.BI \-\-split\fB= MAXSPLIT
138138
split result into a number of subsets
139139
.TP
140-
.B \-\-contiguous
141-
split result into contiguous subsets (ie. for nodeset, subsets will contain nodes with same pattern name and a contiguous range of indexes, like foobar[1\-100]; for rangeset, subsets with consists in contiguous index ranges)\(dq\(dq\(dq
140+
.B \-\-contiguous
141+
split result into contiguous subsets (ie. for nodeset, subsets will contain nodes with same pattern name and a contiguous range of indexes, like foobar[1\-100]; for rangeset, subsets with consists in contiguous index ranges)"""
142142
.TP
143143
.BI \-\-axis\fB= RANGESET
144144
for nD nodesets, fold along provided axis only. Axis are indexed from 1 to n and can be specified here either using the rangeset syntax, eg. \(aq1\(aq, \(aq1\-2\(aq, \(aq1,3\(aq, or by a single negative number meaning that the indices is counted from the end. Because some nodesets may have several different dimensions, axis indices are silently truncated to fall in the allowed range.
@@ -225,7 +225,7 @@ node[0\-4,11\-13]
225225
.sp
226226
This computes a folded nodeset containing nodes found in group @gpu and @slurm:bigmem, but not in both, minus the nodes found in odd chassis groups from 1 to 9.
227227
.TP
228-
.B \(dqAll nodes\(dq extension
228+
.B "All nodes" extension
229229
The \fB@*\fP and \fB@SOURCE:*\fP special notations may be used in extended patterns to represent all nodes (in SOURCE) according to the \fIall\fP external shell command (see \fBgroups.conf\fP(5)) and are equivalent to:
230230
.INDENT 7.0
231231
.INDENT 3.5
@@ -469,7 +469,7 @@ dc3n[4\-5]
469469
.SH HISTORY
470470
.sp
471471
\fBcluset\fP was added in 1.7.3 to avoid a conflict with xCAT\(aqs \fBnodeset\fP
472-
command and also to conform with ClusterShell\(aqs \(dqclu*\(dq command nomenclature.
472+
command and also to conform with ClusterShell\(aqs "clu*" command nomenclature.
473473
.SH SEE ALSO
474474
.sp
475475
\fBclubak\fP(1), \fBclush\fP(1), \fBnodeset\fP(1), \fBgroups.conf\fP(5).

doc/man/man1/clush.1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" Man page generated from reStructuredText.
22
.
3-
.TH CLUSH 1 "2023-02-09" "1.9.1" "ClusterShell User Manual"
3+
.TH CLUSH 1 "2023-09-29" "1.9.2" "ClusterShell User Manual"
44
.SH NAME
55
clush \- execute shell commands on a cluster
66
.
@@ -165,9 +165,6 @@ optional \fBgroups.conf\fP(5) group source to use
165165
.B \-n\fP,\fB \-\-nostdin
166166
do not watch for possible input from stdin; this should be used when \fBclush\fP is run in the background (or in scripts).
167167
.TP
168-
.B \-\-sudo
169-
enable sudo password prompt: a prompt will ask for your sudo password and sudo will be used to run your commands on the target nodes. The password must be the same on all target nodes. The actual sudo command used by \fBclush\fP can be changed in \fBclush.conf\fP(5) or in command line using \fB\-O sudo_command="..."\fP\&. The configured \fBsudo_command\fP must be able to read a password on stdin followed by a new line (which is what \fBsudo \-S\fP does).
170-
.TP
171168
.BI \-\-groupsconf\fB= FILE
172169
use alternate config file for groups.conf(5)
173170
.TP

0 commit comments

Comments
 (0)