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

add server name to verbose output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8579 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2011-01-07 20:42:31 +00:00
parent b14414b4f0
commit afe6c1c420
2 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
perl-xCAT/xCAT/InstUtils.pm
View File

@@ -142,7 +142,9 @@ sub myxCATname
# the myxcatpost_<nodename> file should exist on all nodes!
my $catcmd = "cat /xcatpost/myxcatpost_* | grep '^NODE='";
my $output = xCAT::Utils->runcmd("$catcmd", -1);
# - can't use runcmd because this routine is called by runcmd
my $output = `$catcmd`;
if ($::RUNCMD_RC == 0)
{
($junk, $name) = split('=', $output);
@@ -647,6 +649,7 @@ sub taghash
#-------------------------------------------------------------------------------
sub getOSnodes
{
my ($class, $nodes) = @_;
my @nodelist = @$nodes;
@@ -1013,6 +1016,7 @@ sub dolitesetup
}
}
# populate the .defaults dir with files and dirs from the image - if any
my $default="$instrootloc/.default";

67
perl-xCAT/xCAT/Utils.pm
View File

@@ -1035,15 +1035,18 @@ sub runcmd
# redirect stderr to stdout
if (!($cmd =~ /2>&1$/)) { $cmd .= ' 2>&1'; }
# get this systems name as known by xCAT management node
my $Sname = xCAT::InstUtils->myxCATname();
chomp $Sname;
if ($::VERBOSE)
{
if ($::CALLBACK){
my $rsp = {};
$rsp->{data}->[0] = "Running Command: $cmd\n";
$rsp->{data}->[0] = "Running command on $Sname: $cmd\n";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
} else {
xCAT::MsgUtils->message("I", "Running Command: $cmd\n");
xCAT::MsgUtils->message("I", "Running command on $Sname: $cmd\n");
}
}
@@ -3781,48 +3784,56 @@ sub get_ServiceNode
Error:
$::ERROR_RC=0 no error $::ERROR_RC=1 error
example: $sn =xCAT::Utils->getSNformattedhash(\@nodes,$service,"MN");
$sn =xCAT::Utils->getSNformattedhash(\@nodes,$service,"Node");
example: $sn =xCAT::Utils->getSNformattedhash(\@nodes,$service,"MN", $type);
$sn =xCAT::Utils->getSNformattedhash(\@nodes,$service,"Node", "primary");
=cut
#-----------------------------------------------------------------------------
sub getSNformattedhash
{
my ($class, $node, $service, $request) = @_;
my ($class, $node, $service, $request, $type) = @_;
my @node_list = @$node;
my $cmd;
my %newsnhash;
# get the values of either the servicenode or xcatmaster attributes
my $sn = xCAT::Utils->get_ServiceNode(\@node_list, $service, $request);
# get the keys which are the service nodes and break apart any pool lists
# format into individual service node keys pointing to node lists
if ($sn)
{
foreach my $snkey (keys %$sn)
{
# split the key if pool of service nodes
push my @tmpnodes, $sn->{$snkey};
my @nodes;
for my $i (0 .. $#tmpnodes) {
for my $j ( 0 .. $#{$tmpnodes[$i]}) {
my $check=$tmpnodes[$i][$j];
push @nodes,$check;
}
}
if ($sn)
{
foreach my $snkey (keys %$sn)
{
# split the key if pool of service nodes
#push my @nodes, $sn->{$snkey}->[0];
push my @tmpnodes, $sn->{$snkey};
my @nodes;
for my $i (0 .. $#tmpnodes) {
for my $j ( 0 .. $#{$tmpnodes[$i]}) {
my $check=$tmpnodes[$i][$j];
push @nodes,$check;
}
}
my @servicenodes = split /,/, $snkey;
# now build new hash of individual service nodes
foreach my $newsnkey (@servicenodes) {
push @{$newsnhash{$newsnkey}}, @nodes;
}
}
}
# for SN backup we might only want the primary or backup
my @servicenodes;
my ($primary, $backup) = split /,/, $snkey;
if (($primary) && ($type eq "primary")) {
push @servicenodes, $primary;
} elsif (($backup) && ($type eq "backup")) {
push @servicenodes, $backup;
} else {
@servicenodes = split /,/, $snkey;
}
# now build new hash of individual service nodes
foreach my $newsnkey (@servicenodes) {
push @{$newsnhash{$newsnkey}}, @nodes;
}
}
}
return \%newsnhash;
}
#-----------------------------------------------------------------------------