proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-29 03:09:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pvereport: only comput report def if we generate a report.

Browse Source 
it's really not a good idea to start doing exec, file exist checks,
... on every module load of this, this may even hang completely
differen parts if something pull us in, and confuse one completely...

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Reported-by: Wolfgang Link <w.link@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-04-08 12:25:57 +02:00
parent 4711d99862
commit 01c8f6fe7d
1 changed files with 80 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
PVE/Report.pm
View File

@ -9,8 +9,9 @@ $ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
my $cmd_timeout = 10; # generous timeout
# NOTE: always add new sections to the report_order array!
my $report_def = {
my $init_report_cmds = sub {
# NOTE: always add new sections to the report_order array!
my $report_def = {
general => {
title => 'general system info',
cmds => [
@ -69,24 +70,21 @@ my $report_def = {
'lvs',
'vgs',
],
};
push @{$report_def->{volumes}}, 'zpool status', 'zpool list -v', 'zfs list' if cmd_exists('zfs');
if (-e '/etc/ceph/ceph.conf') {
my $crbd = eval "`ceph osd pool ls | sed -e 's/^/echo /' | sed 'p;s/echo/rbd ls/g'`";
push @{$report_def->{volumes}}, 'ceph status', 'ceph osd status', 'ceph df', 'pveceph status', 'pveceph lspools', $crbd;
}
push @{$report_def->{disk}}, 'multipath -ll', 'multipath -v3' if cmd_exists('multipath');
return $report_def;
};
my @report_order = ('general', 'storage', 'virtual guests', 'network',
'firewall', 'cluster', 'bios', 'pci', 'disks', 'volumes');
push @{$report_def->{volumes}}, 'zpool status', 'zpool list -v', 'zfs list' if cmd_exists('zfs');
if (-e '/etc/ceph/ceph.conf') {
my $crbd = eval "`ceph osd pool ls | sed -e 's/^/echo /' | sed 'p;s/echo/rbd ls/g'`";
push @{$report_def->{volumes}}, 'ceph status', 'ceph osd status', 'ceph df', 'pveceph status', 'pveceph lspools', $crbd;
}
push @{$report_def->{disk}}, 'multipath -ll', 'multipath -v3' if cmd_exists('multipath');
my $report = '';
my $report;
# output the content of all the files of a directory
sub dir2text {
my ($target_dir, $regexp) = @_;
@ -103,6 +101,12 @@ sub cmd_exists { system("command -v '$_[0]' > /dev/null 2>&1") == 0 }
sub generate {
my $report_def = $init_report_cmds->();
my @report_order = ('general', 'storage', 'virtual guests', 'network',
'firewall', 'cluster', 'bios', 'pci', 'disks', 'volumes');
$report = '';
my $record_output = sub {
$report .= shift . "\n";
};
@ -129,11 +133,11 @@ sub generate {
$report .= "\n==== $title ====\n";
foreach my $command (@$commands) {
print STDERR "Process ".$command."...";
eval {
if (ref $command eq 'CODE') {
PVE::Tools::run_with_timeout($cmd_timeout, $command);
} else {
print STDERR "Process ".$command."...";
$report .= "\n# $command\n";
PVE::Tools::run_command($command, %$run_cmd_params);
}