xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-14 18:30:23 +00:00
Code Issues Releases Wiki Activity

modified table format

Browse Source
This commit is contained in:
XuWei
2017-02-10 02:22:54 -05:00
parent 17800828bf
commit 64b926ce63
2 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
xCAT-probe/lib/perl/probe_utils.pm
View File

@ -7,6 +7,7 @@ use File::Path;
use File::Copy;
use Time::Local;
use Socket;
use List::Util qw/sum/;
#-----------------------------------------
@ -597,4 +598,64 @@ sub convert_second_to_time {
return $result;
}
sub print_table {
my $content = shift;
$content = shift if (($content) && ($content =~ /probe_utils/));
my $has_title = shift;
my $title;
if ($has_title) {
$title = shift(@$content);
}
my @length_array;
my $count_num = 0;
foreach my $row (@$content) {
$count_num = 0;
foreach my $element (@{$row}) {
$length_array[$count_num] = length($element) if ($length_array[$count_num] < length($element));
$count_num++;
}
}
my @content_new;
my @row_new;
my $row_line;
my $whole_length;
foreach my $row (@$content) {
$count_num = 0;
@row_new = ();
foreach my $element (@{$row}) {
push @row_new, $element. " " x ($length_array[$count_num] - length($element));
$count_num++;
}
$row_line = "| " . join(" | ", @row_new) . " |";
$whole_length = length($row_line);
push @content_new, $row_line;
}
my $title_new;
my $title_length = length($title);
if ($has_title) {
if ($whole_length < $title_length) {
$title_new = $title;
} elsif ($whole_length - 2 == $title_length) {
$title_new = "|". $title. "|";
} else {
$title_new = " " x (($whole_length - 2 - $title_length)/2) . "$title";
$title_new .= " " x ($whole_length - 2 - length($title_new));
$title_new = "|" . $title_new . "|";
}
}
my $format_line = "-" x $whole_length;
print $format_line . "\n";
print $title_new . "\n" if ($has_title);
print $format_line . "\n";
foreach (@content_new) {
print $_ . "\n";
}
print $format_line . "\n";
}
1;

53
xCAT-probe/subcmds/osdeploy
View File

@ -580,78 +580,74 @@ sub performance_calculation {
return if (!%node_status_time);
probe_utils->send_msg("stdout", "", "-----------node provision performance-----------");
# Currently, only diskful is supported
my $provision_type = $::DISKFUL;
my @status_for_time = ();
my $isnull = 0;
my $length_node = 20;
my $space = " " x ($length_node - 4);
my @time_content;
# print table's first line
# @status_for_time: the status that needed to calculate time
push @time_content, "node provision performance";
my @title_lines = (
"NODE $space ELAPSED\n",
"NODE $space SVRBOOT RPM POST POSTBOOT ELAPSED\n",
"NODE $space RPOWER DHCP BOOTLOADER KERNEL INITRD RPM POST POSTBOOT COMPLETED\n",
"NODE $space RPOWER DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT COMPLETED\n",
"NODE $space DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT ELAPSED\n");
[qw/NODE ELAPSED/],
[qw/NODE SVRBOOT RPM POST POSTBOOT ELAPSED/],
[qw/NODE RPOWER DHCP BOOTLOADER KERNEL INITRD RPM POST POSTBOOT COMPLETED/],
[qw/NODE RPOWER DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT COMPLETED/],
[qw/NODE DHCP BOOTLOADER KERNEL INITRD NETBOOTING ROOTIMG POSTBOOT ELAPSED/]);
if ($performance eq "compact") {
print $title_lines[0];
push @time_content, $title_lines[0];
@status_for_time = ($::STATE_COMPLETED);
}
if ($performance eq "phase") {
print $title_lines[1];
push @time_content, $title_lines[1];
@status_for_time = ($::STATE_DHCP, $::STATE_INSTALLRPM, $::STATE_POSTSCRIPT, $::STATE_POSTBOOTSCRIPT, $::STATE_COMPLETED);
}
if ($performance eq "origin") {
if ($provision_type == $::DISKFUL){
print $title_lines[2];
push @time_content, $title_lines[2];
@status_for_time = ($::STATE_POWER_ON, $::STATE_DHCP, $::STATE_BOOTLODER, $::STATE_KERNEL, $::STATE_INITRD, $::STATE_INSTALLRPM, $::STATE_POSTSCRIPT, $::STATE_POSTBOOTSCRIPT, $::STATE_COMPLETED);
} else { # reserved for diskless
print $title_lines[3];
push @time_content, $title_lines[3];
@status_for_time = ($::STATE_POWER_ON, $::STATE_DHCP, $::STATE_BOOTLODER, $::STATE_KERNEL, $::STATE_INITRD, $::STATE_NETBOOTING, $::STATE_ROOTIMG, $::STATE_POSTBOOTSCRIPT, $::STATE_COMPLETED);
}
}
if ($performance eq "reserve") {
print $title_lines[4];
push @time_content, $title_lines[4];
@status_for_time = ($::STATE_DHCP, $::STATE_BOOTLODER, $::STATE_KERNEL, $::STATE_INITRD, $::STATE_NETBOOTING, $::STATE_ROOTIMG, $::STATE_POSTBOOTSCRIPT, $::STATE_COMPLETED);
}
# calculate time for each node and status
foreach my $node (keys %node_status_time) {
my @timeinfo = ();
push @timeinfo, $node;
if ($performance eq "origin") {
my @time_origin = ();
foreach my $status (@status_for_time) {
if ($node_status_time{$node}{$status}{time_point}) {
if ($status == $::STATE_DHCP and $node_status_time{$node}{$::STATE_DHCP}{end_time} > $node_status_time{$node}{$::STATE_BOOTLODER}{start_time}){
push @time_origin, "NULL* ";
push @timeinfo, "NULL";
$isnull = 1;
} else {
push @time_origin, $node_status_time{$node}{$status}{time_point};
push @timeinfo, $node_status_time{$node}{$status}{time_point};
}
} else {
push @time_origin, "NULL* ";
push @timeinfo, "NULL";
$isnull = 1;
}
}
my $time_str = join(" ", @time_origin);
$space = " " x ($length_node - length($node));
print "$node $space $time_str\n";
push @time_content, [ @timeinfo ];
next;
}
# get the start time and end time for each step
@timeinfo = ();
foreach my $status (@status_for_time) {
my $tmp_status;
my $tmp_detail_status;
@ -676,17 +672,14 @@ sub performance_calculation {
if ($tmp_start_time && $tmp_end_time) {
push @timeinfo, probe_utils->convert_second_to_time($tmp_end_time - $tmp_start_time);
} else {
push @timeinfo, "NULL* ";
push @timeinfo, "NULL";
$isnull = 1;
}
}
my $time_str = join(" ", @timeinfo);
$space = " " x ($length_node - length($node));
print "$node $space $time_str\n";
push @time_content, [ @timeinfo ];
}
probe_utils->send_msg("stdout", "", "------------------------------------------------");
probe_utils->print_table(\@time_content, 1);
if ($isnull and $is_success) {
my $command_input = "xcatprobe -w $program_name";