xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

fix issue 882 spelling mistake while stopping docker container

Browse Source
This commit is contained in:
bybai 2016-04-06 21:56:05 -04:00
parent 15db4f31e0
commit 73bd16638c
12 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst
View File

@ -104,7 +104,7 @@ OPTIONS
\ **-f|-**\ **-force**\
The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinititialize the site table. This option should be used, if keys or credentials become corrupt or lost.
Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stoped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs.
Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs.
A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp.
Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command.

2
xCAT-client/pods/man8/xcatconfig.8.pod
View File

@ -64,7 +64,7 @@ This option will reinitialize the basic xCAT database table setup. It will not
=item B<-f|--force>
The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinititialize the site table. This option should be used, if keys or credentials become corrupt or lost.
Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stoped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs.
Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs.
A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp.
Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command.

12
xCAT-rmc/plugin/rmcmon.pm
View File

@ -144,7 +144,7 @@ sub start {
}
} elsif ($assocHash{"$cond:_:$resp"}==1) {
$result=`/usr/bin/stopcondresp $cond $resp 2>&1`;
if (($?) && ($result !~ /2618-264/)) { #stoped
if (($?) && ($result !~ /2618-264/)) { #stopped
my $rsp={};
$rsp->{data}->[0]="$localhostname: $result";
$callback->($rsp);
@ -219,7 +219,7 @@ sub start {
This function gets called when monstop command is issued by the user.
It stops the monitoring on all nodes, stops the RMC daemons.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,
@ -265,7 +265,7 @@ sub stop {
if (@tmp1 < 4) { next; }
if ($tmp1[3] !~ /Not|not/) {
my $result=`/usr/bin/stopcondresp $tmp1[0] $tmp1[1] 2>&1`;
if (($?) && ($result !~ /2618-264/)) { #stoped
if (($?) && ($result !~ /2618-264/)) { #stopped
if ($callback) {
my $rsp={};
$rsp->{data}->[0]="$localhostname: $result";
@ -805,7 +805,7 @@ sub stopNodeStatusMon {
}
if ($batch) {
my $result=`stopcondresp NodeReachability_Batch UpdatexCATNodeStatus_Batch 2>&1`;
if (($?) && ($result !~ /2618-264/)) { #stoped
if (($?) && ($result !~ /2618-264/)) { #stopped
$retcode=$?;
$retmsg="Error stop node status monitoring: $result";
reportError($retmsg, $callback);
@ -816,14 +816,14 @@ sub stopNodeStatusMon {
#stop monitoring the status of mn's immediate children
my $result=`stopcondresp NodeReachability UpdatexCATNodeStatus 2>&1`;
if (($?) && ($result !~ /2618-264/)) { #stoped
if (($?) && ($result !~ /2618-264/)) { #stopped
$retcode=$?;
$retmsg="Error stop node status monitoring: $result";
reportError($retmsg, $callback);
}
#stop monitoring the status of mn's grandchildren via their service nodes
$result=`stopcondresp NodeReachability_H UpdatexCATNodeStatus 2>&1`;
if (($?) && ($result !~ /2618-264/)) { #stoped
if (($?) && ($result !~ /2618-264/)) { #stopped
$retcode=$?;
$retmsg="Error stop node status monitoring: $result";
reportError($retmsg, $callback);

2
xCAT-server/lib/xcat/monitoring/gangliamon.pm
View File

@ -755,7 +755,7 @@ sub deconfGmetad {
Ganglia monitoring.
Arguments:
p_nodes -- A pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- A pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- The action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means all nodes (except localhost),

4
xCAT-server/lib/xcat/monitoring/monitorctrl.pm
View File

@ -405,10 +405,10 @@ sub stopMonitoring {
It stops the given plug-in for node status monitoring.
If no plug-in is specified, use the one in the monitoring table.
Arguments:
name -- name of the monitoring plu-in module to be stoped for node status monitoring.
name -- name of the monitoring plu-in module to be stopped for node status monitoring.
If none is specified, use the one in the monitoring table that has the
"nodestatmon" column set to be "1", or "Yes".
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means local host only.
2 means both local host and nodes,

2
xCAT-server/lib/xcat/monitoring/nagiosmon.pm
View File

@ -110,7 +110,7 @@ sub start {
This function gets called when monstop command is issued by the user.
It stops the monitoring on all nodes, stops the Nagios daemons.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,

2
xCAT-server/lib/xcat/monitoring/pcpmon.pm
View File

@ -220,7 +220,7 @@ sub deconfig
the daemons and does necessary cleanup process for the
PCP monitoring.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,

4
xCAT-server/lib/xcat/monitoring/samples/templatemon.pm
View File

@ -139,7 +139,7 @@ sub start {
shoul only be applied on the local host. If it is 2, then it should be applied
to the children that the local host is monitoring.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both localhost and nodes,
@ -256,7 +256,7 @@ sub startNodeStatusMon {
This function is called by the monitorctrl module when monstop command is issued.
It stops feeding the node status info back to xCAT.
Arguments:
p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,

4
xCAT-server/lib/xcat/monitoring/snmpmon.pm
View File

@ -123,7 +123,7 @@ sub start {
=head3 stop
This function gets called by the monitorctrl module when monstop command gets called.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,
@ -226,7 +226,7 @@ sub startNodeStatusMon {
This function is called by the monitorctrl module when monstop command is issued.
It stops feeding the node status info back to xCAT.
Arguments:
p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means local host only.
2 means both local host and nodes,

4
xCAT-server/lib/xcat/monitoring/xcatmon.pm
View File

@ -53,7 +53,7 @@ sub start {
=head3 stop
This function gets called by the monitorctrl module when monstop command gets called.
Arguments:
p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,
@ -185,7 +185,7 @@ sub startNodeStatusMon
This function is called by the monitorctrl module when monstop command is issued.
It stops feeding the node status info back to xCAT.
Arguments:
p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all.
p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all.
scope -- the action scope, it indicates the node type the action will take place.
0 means localhost only.
2 means both monservers and nodes,

4
xCAT-server/lib/xcat/plugins/docker.pm
View File

@ -272,7 +272,7 @@ my %command_states = (
A string to explain the http response code
Usage example:
http_state_code_info('304', "INIT_TO_WAIT_FOR_START_DONE") -> "Already started"
http_state_code_info('304', "INIT_TO_WAIT_FOR_STOP_DONE") -> "Already stoped"
http_state_code_info('304', "INIT_TO_WAIT_FOR_STOP_DONE") -> "Already stopped"
=cut
#-------------------------------------------------------
@ -289,7 +289,7 @@ sub http_state_code_info {
return [0, "container already started"];
}
else {
return [0, "container already stoped"];
return [0, "container already stopped"];
}
}
else {

2
xCAT-server/lib/xcat/plugins/monctrlcmds.pm
View File

@ -494,7 +494,7 @@ sub monstart {
name
where
name is the monitoring plug-in name. For example: rmcmon.
The specified plug-in will be stoped for monitoring the xCAT cluster.
The specified plug-in will be stopped for monitoring the xCAT cluster.
noderange a range of nodes. Default is all.
-r|--remote indicates that both monservers and the nodes need to be called to stop
the monitoring. The defaults is monservers only.