arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bugfixes for ppping: changed some option logic and put support back in for interfaces. Also updated the man page for ppping.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3989 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
potterbm
2009-08-12 20:52:53 +00:00
parent 2817ef9a9b
commit 5e309212cf
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
xCAT-client/bin/ppping
View File

@@ -38,10 +38,10 @@ my $USAGE="Usage: ppping [-i|--interface interface] [-d|--debug] [-v|--verbose]
# Parse the options
if(!GetOptions(
'h|help' => \$::HELP,
'V|version' => \$::VERSION,
'v|version' => \$::VERSION,
's|serial' => \$::SERIAL,
'd|debug' => \$DEBUG,
'v|verbose' => \$VERBOSE,
'V|verbose' => \$VERBOSE,
'H|hierarchical' => \$HIERARCHY,
'interface=s' => \$interface))
{
@@ -155,7 +155,22 @@ debug("REACHABLE_NODES:@reachable_nodes\n");
if (@reachable_nodes > 0) {
my $allnodes=join(',', @nodes);
# If verbose is set, take out the quiet flag
my $quiet = "-q";
if($VERBOSE){
$quiet = "";
}
# If hierarchical behavior is wanted, take out the bypass flag
my $bypass = "-B";
if($HIERARCHY){
$bypass = "";
}
my $i_string = "";
if($interface) {
$i_string = "-i $interface";
}
## If the serial option was set, pping2 one reachable node at a time.
if ($::SERIAL) {
debug("SERIAL:$::SERIAL\n");
@@ -163,15 +178,8 @@ if (@reachable_nodes > 0) {
foreach(@reachable_nodes) {
my $result;
my $command = "$::XCATROOT/bin/xdsh $_ -e $::XCATROOT/sbin/pping2 \"$i_string -q $allnodes\" 2>&1";
# If verbose is set, take out the quiet flag
if($VERBOSE) {
$command =~ s/-q//;
}
# If hierarchical behavior is wanted, put in the bypass flag
if($HIERARCHY){
$command =~ s/\$_/\$_ -B/;
}
my $command = "$::XCATROOT/bin/xdsh $_ $bypass -e $::XCATROOT/sbin/pping2 \"$i_string $quiet $allnodes\" 2>&1";
debug("Running \'$command\'\n");
$result=`$command`;
print "$result";
@@ -183,15 +191,7 @@ if (@reachable_nodes > 0) {
else {
debug("SERIAL not set.\n");
my $node_string=join(',', @reachable_nodes);
my $command = "$::XCATROOT/bin/xdsh $node_string -s -e $::XCATROOT/sbin/pping2 \"$i_string -q $allnodes\" 2> /dev/null|";
# If verbose is set, take out the quiet flag
if($VERBOSE) {
$command =~ s/-q//;
}
# If hierarchical behavior is wanted, put in the bypass flag
if($HIERARCHY){
$command =~ s/\$_/\$_ -B/;
}
my $command = "$::XCATROOT/bin/xdsh $node_string $bypass -s -e $::XCATROOT/sbin/pping2 \"$i_string $quiet $allnodes\" 2> /dev/null|";
debug("Running \'$command\'");
open (PPING2, "$command") or die("Cannot open pping-internal pipe: $!");
# Print out the result

6
xCAT-client/pods/man1/ppping.1.pod
View File

@@ -28,6 +28,12 @@ B<-s> Ping serially
B<-i interface> interface
B<-V | verbose> verbose
B<-H | hierarchical> Allow management node hierarchy
B<-d | debug> Print debug information
B<-h | help> help
B<-v | version> version