xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-22 03:00:26 +00:00
Code Issues Releases Wiki Activity

xcatprobe osdeploy need to be modified accordingly

Browse Source
This commit is contained in:
bxuxa
2018-11-27 16:57:48 +08:00
parent cc6cb0f217
commit ee654cffbe
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-probe/subcmds/osdeploy
View File

@@ -1169,10 +1169,11 @@ sub handle_cluster_msg {
my $log_msg = $log_ref->{msg};
my @split_log = split(/\s+/, $log_msg);
if ($split_log[1] eq "Allowing") {
my $command = $split_log[2];
my $nodes_str = $split_log[4];
my $sub_command = $split_log[5];
# As xcat log message will in both messages.log and cluster.log, need to filter one to avoid the duplication
if ($split_log[1] eq "xCAT:" && $split_log[2] eq "Allowing") {
my $command = $split_log[3];
my $nodes_str = $split_log[5];
my $sub_command = $split_log[6];
if ($command eq "rinstall" or $command eq "rnetboot" or ($command eq "rpower" and $sub_command =~ /on|boot|reset/) or ($command eq "xdsh" and $log_msg =~ /reboot|shutdown -r/)) {
my @nodes = probe_utils->parse_node_range($nodes_str);
@@ -1188,7 +1189,7 @@ sub handle_cluster_msg {
}
}
}
} elsif ($log_ref->{msg} =~ /(.+)\s+status:\s+(.+)\s+statustime:/) {
} elsif ($log_ref->{msg} =~ /INFO xcat.updatestatus - (.+):\s+changing status=(.+)/) {
my $nodes = $1;
my $status = $2;
my $record = "Node status is changed to $status";