use ceil() to round up to more sensible numbers

This commit is contained in:
Patrick Van der Veken 2020-03-30 14:02:03 +02:00
parent 94a2daaf70
commit 5b2e8a8ecb
3 changed files with 12 additions and 3 deletions

View File

@ -28,7 +28,7 @@
use strict; use strict;
use warnings; use warnings;
use POSIX qw(uname); use POSIX qw(uname ceil);
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
$|++; $|++;
@ -136,6 +136,7 @@ foreach my $lvol (sort (@vgdisplay)) {
} }
# convert to GB if needed # convert to GB if needed
$lv_size /= 1024 unless ($options{'size'} =~ /MB/i); $lv_size /= 1024 unless ($options{'size'} =~ /MB/i);
$lv_size = ceil ($lv_size);
# report data # report data
printf STDOUT ("%-${lv_str_size}s %-${vg_str_size}s %-17s %-7d %-7d %-17s %-7s %-8s %-8s\n", printf STDOUT ("%-${lv_str_size}s %-${vg_str_size}s %-17s %-7d %-7d %-17s %-7s %-8s %-8s\n",
$lv_name, $lv_name,
@ -215,3 +216,4 @@ S< >Do not show header and footer information.
@(#) 2016-06-27: added LV extents [Patrick Van der Veken] @(#) 2016-06-27: added LV extents [Patrick Van der Veken]
@(#) 2017-12-12: made LV+VG names display size dynamic, added --terse [Patrick Van der Veken] @(#) 2017-12-12: made LV+VG names display size dynamic, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken] @(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken]
@(#) 2020-03-26: use ceil() to round up to more sensible numbers [Patrick Van der Veken]

View File

@ -28,7 +28,7 @@
use strict; use strict;
use warnings; use warnings;
use POSIX qw(uname); use POSIX qw(uname ceil);
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use Data::Dumper; use Data::Dumper;
@ -156,8 +156,10 @@ sub parse_pvols {
# calculate sizes # calculate sizes
$pv_size = $pv_total_pe * $pv_size_pe; $pv_size = $pv_total_pe * $pv_size_pe;
$pv_size /= 1024 unless ($options{'size'} =~ /MB/i); $pv_size /= 1024 unless ($options{'size'} =~ /MB/i);
$pv_size = ceil ($pv_size);
$pv_free = $pv_free_pe * $pv_size_pe; $pv_free = $pv_free_pe * $pv_size_pe;
$pv_free /= 1024 unless ($options{'size'} =~ /MB/i); $pv_free /= 1024 unless ($options{'size'} =~ /MB/i);
$pv_free = ceil ($pv_free);
# report data # report data
printf STDOUT ("%-12s %-10s %-4s %-25s %-20s %-7d %-8d %-8d %-8d\n", printf STDOUT ("%-12s %-10s %-4s %-25s %-20s %-7d %-8d %-8d %-8d\n",
@ -340,3 +342,4 @@ on the amount of devices present on the system.
@(#) 2016-04-27: show all PVOLs & option --active added [Patrick Van der Veken] @(#) 2016-04-27: show all PVOLs & option --active added [Patrick Van der Veken]
@(#) 2017-12-12: added support for cluster disks, added --terse [Patrick Van der Veken] @(#) 2017-12-12: added support for cluster disks, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: fix for comparison operator + remove /dev/ prefix for VG [Patrick Van der Veken] @(#) 2019-02-08: fix for comparison operator + remove /dev/ prefix for VG [Patrick Van der Veken]
@(#) 2020-03-26: use ceil() to round up to more sensible numbers [Patrick Van der Veken]

View File

@ -28,7 +28,7 @@
use strict; use strict;
use warnings; use warnings;
use POSIX qw(uname); use POSIX qw(uname ceil);
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use Data::Dumper; use Data::Dumper;
@ -136,10 +136,13 @@ foreach my $vg_entry (sort (@vgdisplay)) {
unless ($vg_status eq "deactivated") { unless ($vg_status eq "deactivated") {
$vg_size = $vg_total_pe * $vg_size_pe; $vg_size = $vg_total_pe * $vg_size_pe;
$vg_size /= 1024 unless ($options{'size'} =~ /MB/i); $vg_size /= 1024 unless ($options{'size'} =~ /MB/i);
$vg_size = ceil ($vg_size);
$vg_free = $vg_free_pe * $vg_size_pe; $vg_free = $vg_free_pe * $vg_size_pe;
$vg_free /= 1024 unless ($options{'size'} =~ /MB/i); $vg_free /= 1024 unless ($options{'size'} =~ /MB/i);
$vg_free = ceil ($vg_free);
$vg_max = $vg_max_pe * $vg_size_pe; $vg_max = $vg_max_pe * $vg_size_pe;
$vg_max /= 1024 unless ($options{'size'} =~ /MB/i); $vg_max /= 1024 unless ($options{'size'} =~ /MB/i);
$vg_max = ceil ($vg_max);
} }
# get minor number # get minor number
$lsvg = `/usr/bin/ls -l /dev/${vg_name}/group 2>/dev/null`; $lsvg = `/usr/bin/ls -l /dev/${vg_name}/group 2>/dev/null`;
@ -235,3 +238,4 @@ S< >Do not show header and footer information.
@(#) 2016-04-27: added 'VG Major/Minor' [Patrick Van der Veken] @(#) 2016-04-27: added 'VG Major/Minor' [Patrick Van der Veken]
@(#) 2017-12-12: made VG name display size dynamic, added --active, added --terse [Patrick Van der Veken] @(#) 2017-12-12: made VG name display size dynamic, added --active, added --terse [Patrick Van der Veken]
@(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken] @(#) 2019-02-08: remove /dev/ prefix for VG [Patrick Van der Veken]
@(#) 2020-03-26: use ceil() to round up to more sensible numbers [Patrick Van der Veken]