Hello Andreas
Please try this patch against an unmodified 'fai-setup-storage_4.2_all.deb' and
install libcapture-tiny-perl. You can also remove liblinux-lvm-perl if you
want.
This patch is a bit larger then actually necessary since I modified the debug
output a bit and added 2 helper functions 'update_devicetree()' and
'execute()'. These helpers are not mandatory but it should be seen as an
investment for the future.
@LVM2 2.02.88 or below: The patched setup-storage checks for ancient versions
but it simply tells you to update.
Using your config as a testcase I got:
Starting setup-storage 1.5
Using config file: /var/lib/fai/config/disk_config/DISK_TYPE5_preserve
Preserved partition /dev/sda5 does not end at a cylinder boundary, parted may
fail to restore the partition!
/dev/sda5 will be preserved
/dev/sda2 will be resized
vg1/home will be preserved
Executing: wipefs -a /dev/sda1
Executing: vgchange -a n vg1
Executing: lvremove -f /dev/vg1/swap
Executing: lvremove -f /dev/vg1/root
Executing: lvremove -f /dev/vg1/varlog
Executing: lvremove -f /dev/vg1/tmp
Executing: parted -s /dev/sda mklabel msdos
Executing: parted -s /dev/sda mkpart extended "" 312475648B 10737418239B
Executing: parted -s /dev/sda mkpart logical "" 313524224B 10737418239B
Executing: parted -s /dev/sda resize 1 312475648B 10737418239B
Executing: parted -s /dev/sda mklabel msdos
Executing: parted -s /dev/sda mkpart primary "ext3" 1048576B 312475647B
Executing: parted -s /dev/sda set 1 boot on
Executing: parted -s /dev/sda mkpart extended "" 312475648B 10737418239B
Executing: parted -s /dev/sda set 2 lba on
Executing: parted -s /dev/sda mkpart logical "" 313524224B 10737418239B
Executing: parted -s /dev/sda set 5 lvm on
Executing: mkfs.ext4 /dev/sda1
Executing: vgchange -a y vg1
Executing: lvcreate -n root -L 1024 vg1
Executing: mkfs.ext4 /dev/vg1/root
Executing: lvcreate -n swap -L 1024 vg1
Executing: mkswap /dev/vg1/swap
Executing: lvcreate -n tmp -L 1024 vg1
Executing: mkfs.ext4 /dev/vg1/tmp
Executing: lvcreate -n varlog -L 1024 vg1
Executing: mkfs.ext4 /dev/vg1/varlog
/dev/sda1 UUID=784c08d4-e2c7-4d73-8ef2-3190043288a2
/dev/vg1/swap UUID=3915692b-d23a-4a65-8efc-cfc0f5e2543c
/dev/vg1/root UUID=241daf75-4d5f-46bf-bdfc-5d9fc2e49a94
/dev/vg1/varlog UUID=0e46c3c0-e850-49bd-bafc-09364a5d4093
/dev/vg1/tmp UUID=6670aaf5-a4ca-429b-8028-a3c477869c75
/dev/vg1/home UUID=74aa737e-2a08-44c9-b9de-47d2fc1c5a39
bye
thomas
diff -Nur vanilla/usr/sbin/setup-storage patched/usr/sbin/setup-storage
--- vanilla/usr/sbin/setup-storage 2014-06-03 10:55:00.000000000 +0200
+++ patched/usr/sbin/setup-storage 2014-06-20 14:13:02.268812294 +0200
@@ -83,7 +83,14 @@
use Exec;
# enable debug mode, if requested using -d
-$opt_d and $FAI::debug = 1;
+if ($opt_d) {
+ $FAI::debug = 1;
+
+ # prepare Data::Dumper
+ require Data::Dumper;
+ $Data::Dumper::Indent = 1; # default is 2
+ $Data::Dumper::Sortkeys = 1; # default is 0
+}
# Really write any changes to disk
$opt_X and $FAI::no_dry_run = 1;
@@ -174,29 +181,20 @@
# debugging only: print the current configuration
if ($FAI::debug) {
- # for debugging purposes to print the hash structures
- use Data::Dumper;
+ print '='x80, "\n";
+ print " Current configuration\n";
+ print '-'x80, "\n";
print "Current disk layout\n";
-
- # make sure perl doesn't warn about it being used only once, same below
- our %current_config;
- print Dumper \%current_config;
-
+ print Data::Dumper->Dump([ \%FAI::current_config ], ['FAI::current_config']);
print "Current LVM layout\n";
-
- our %current_lvm_config;
- print Dumper \%current_lvm_config;
-
+ print Data::Dumper->Dump([ \%FAI::current_lvm_config ], ['FAI::current_lvm_config']);
print "Current RAID layout\n";
-
- our %current_raid_config;
- print Dumper \%current_raid_config;
-
+ print Data::Dumper->Dump([ \%FAI::current_raid_config ], ['FAI::current_raid_config']);
print "Current device tree\n";
+ print Data::Dumper->Dump([ \%FAI::current_dev_children ], ['FAI::current_dev_children']);
- our %current_dev_children;
- print Dumper \%current_dev_children;
+ print '='x80, "\n";
}
# compute the new LVM and partition sizes; do the partition sizes first to have
@@ -204,27 +202,40 @@
&FAI::compute_partition_sizes;
&FAI::compute_lv_sizes;
-# print the current contents of $FAI::configs
-$FAI::debug and print "Desired disk layout\n";
-$FAI::debug and print Dumper \%FAI::configs;
-$FAI::debug and print "Desired device tree\n";
-$FAI::debug and print Dumper \%FAI::dev_children;
-
# generate the command script
&FAI::build_disk_commands;
&FAI::build_raid_commands;
&FAI::build_lvm_commands;
&FAI::build_cryptsetup_commands;
-&FAI::order_commands;
+if ($FAI::debug) {
+ print '='x80, "\n";
+ print " before order_commands()\n";
+ print '-'x80, "\n";
+
+ print "D: Command stack\n";
+ print Data::Dumper->Dump([ \%FAI::commands ], ['FAI::commands']);
+ print "D: Partition table dependencies\n";
+ print Data::Dumper->Dump([ \%FAI::partition_table_deps ], ['%FAI::partition_table_deps']);
-# run all commands
-# debugging only: print the command script
+ print '='x80, "\n";
+}
+&FAI::order_commands;
if ($FAI::debug) {
+ print '='x80, "\n";
+ print " after order_commands()\n";
+ print '-'x80, "\n";
+
+ print "D: Command stack\n";
+ print Data::Dumper->Dump([ \%FAI::commands ], ['FAI::commands']);
+ print "D: Partition table dependencies\n";
+ print Data::Dumper->Dump([ \%FAI::partition_table_deps ], ['%FAI::partition_table_deps']);
+
+ print '='x80, "\n";
+
+ # check for missing commands
foreach (&numsort(keys %FAI::commands)) {
- defined($FAI::commands{$_}{cmd}) or &FAI::internal_error("Missing command entry for $_");
- print "$_:" . $FAI::commands{$_}{cmd} . "\n";
- defined($FAI::commands{$_}{pre}) and print "\tpre: " . $FAI::commands{$_}{pre} . "\n";
- defined($FAI::commands{$_}{post}) and print "\tpost: " . $FAI::commands{$_}{post} . "\n";
+ defined($FAI::commands{$_}{cmd})
+ or &FAI::internal_error("Missing command entry for $_");
}
}
diff -Nur vanilla/usr/share/fai/setup-storage/Commands.pm patched/usr/share/fai/setup-storage/Commands.pm
--- vanilla/usr/share/fai/setup-storage/Commands.pm 2014-06-03 10:55:00.000000000 +0200
+++ patched/usr/share/fai/setup-storage/Commands.pm 2014-06-20 13:58:18.903882941 +0200
@@ -661,13 +661,10 @@
}
}
- &FAI::push_command( "wipefs -a $vg/$lv",
- "vgchange_a_n_VG_$vg$pre_deps_cl",
- "wipefs_$vg/$lv");
- &FAI::push_command( "lvremove -f $vg/$lv",
- "wipefs_$vg/$lv",
- "lv_rm_$vg/$lv,self_cleared_/dev/$vg/$lv");
- $vg_setup_pre .= ",lv_rm_$vg/$lv";
+ &FAI::push_command( "lvremove -f /dev/$vg/$lv",
+ "vgchange_a_n_VG_$vg",
+ "lv_rm_/dev/$vg/$lv,self_cleared_/dev/$vg/$lv");
+ $vg_setup_pre .= ",lv_rm_/dev/$vg/$lv";
}
} else {
&FAI::push_command("true", "vgchange_a_n_VG_$vg",
@@ -686,13 +683,10 @@
join(",self_cleared_", @{ $FAI::current_dev_children{"/dev/$vg/$lv"} })
if (defined($FAI::current_dev_children{"/dev/$vg/$lv"}) &&
scalar(@{ $FAI::current_dev_children{"/dev/$vg/$lv"} }));
- &FAI::push_command( "wipefs -a $vg/$lv",
- "vgchange_a_n_VG_$vg$pre_deps_cl",
- "wipefs_$vg/$lv");
- &FAI::push_command( "lvremove -f $vg/$lv",
- "wipefs_$vg/$lv",
- "lv_rm_$vg/$lv,self_cleared_/dev/$vg/$lv");
- $vg_destroy_pre .= ",lv_rm_$vg/$lv";
+ &FAI::push_command( "lvremove -f /dev/$vg/$lv",
+ "vgchange_a_n_VG_$vg",
+ "lv_rm_/dev/$vg/$lv,self_cleared_/dev/$vg/$lv");
+ $vg_destroy_pre .= ",lv_rm_/dev/$vg/$lv";
}
&FAI::push_command( "vgremove $vg", "$vg_destroy_pre", "vg_removed_$vg");
@@ -721,6 +715,19 @@
################################################################################
sub build_lvm_commands {
+ if ($FAI::debug) {
+ print '='x80, "\n";
+ print " starting build_lvm_commands()\n";
+ print '-'x80, "\n";
+
+ print "D: Current device tree\n";
+ print Data::Dumper->Dump([ \%FAI::current_dev_children ], ['FAI::current_dev_children']);
+ print "D: Existing commands\n";
+ print Data::Dumper->Dump([ \%FAI::commands ], ['%FAI::commands']);
+
+ print '='x80, "\n";
+ }
+
# disable volumes if there are pre-existing ones
foreach my $d (keys %FAI::current_dev_children) {
next unless ($d =~ /^VG_(.+)$/);
@@ -734,12 +741,24 @@
scalar(@{ $FAI::current_dev_children{$c} }));
}
$pre_deps_vgc =~ s/^,//;
+ if ($FAI::debug) {
+ print "D: pushing command: CMD=\"vgchange -a n $1\", PRE=\"$pre_deps_vgc\", POST=\"$vg_pre\"\n";
+ }
&FAI::push_command("vgchange -a n $1", "$pre_deps_vgc", $vg_pre);
$vg_pre .= ",pv_sigs_removed_$vg" if (&FAI::cleanup_vg($vg));
my $pre_deps_cl = "";
+ if ($FAI::debug) {
+ print "D: current device children:\n";
+ for my $device ( @{$FAI::current_dev_children{$d}} ) {
+ print "D: - $device\n";
+ }
+ }
$pre_deps_cl = ",self_cleared_" .
join(",self_cleared_", @{ $FAI::current_dev_children{$d} })
if (scalar(@{ $FAI::current_dev_children{$d} }));
+ if ($FAI::debug) {
+ print "D: pushing command: CMD=\"true\", PRE=\"$vg_pre$pre_deps_cl\", POST=\"self_cleared_VG_$vg\"\n";
+ }
&FAI::push_command("true", "$vg_pre$pre_deps_cl", "self_cleared_VG_$vg");
}
@@ -755,6 +774,9 @@
# create the volume group or add/remove devices
&FAI::create_volume_group($config);
# enable the volume group
+ if ($FAI::debug) {
+ print "D: pushing command: CMD=\"vgchange -a y $vg\", PRE=\"vg_created_$vg\", POST=\"vg_enabled_$vg\"\n";
+ }
&FAI::push_command( "vgchange -a y $vg",
"vg_created_$vg", "vg_enabled_$vg" );
diff -Nur vanilla/usr/share/fai/setup-storage/Init.pm patched/usr/share/fai/setup-storage/Init.pm
--- vanilla/usr/share/fai/setup-storage/Init.pm 2014-06-03 10:55:00.000000000 +0200
+++ patched/usr/share/fai/setup-storage/Init.pm 2014-06-20 11:59:05.713608821 +0200
@@ -36,6 +36,8 @@
package FAI;
+use Capture::Tiny qw(:all);
+
################################################################################
#
# @brief Enable debugging by setting $debug to a value greater than 0
@@ -348,5 +350,76 @@
EOF
}
-1;
+################################################################################
+#
+# execute a shell command (automatically handle all perl-specific stuff)
+#
+# my $exitcode = execute('false');
+# my ($exitcode, $stdout, $stderr) = execute('cat', '/etc/services');
+#
+################################################################################
+sub execute {
+ my @command = @_;
+
+ my $command_str = join q{ }, @command;
+ my $cmd_exitcode;
+
+ my $cmd_start = time;
+ my ($stdout, $stderr) = capture { $cmd_exitcode = system @command; };
+ my $elapsed = time - $cmd_start;
+
+ my $retcode;
+ if ($cmd_exitcode == 0) {
+ $retcode = $cmd_exitcode;
+ }
+ elsif ($cmd_exitcode == -1) {
+ croak("'$command_str' failed to execute: $stderr");
+ }
+ elsif ($cmd_exitcode & 127) {
+ my $signal = $cmd_exitcode & 127;
+ if ($cmd_exitcode & 128) {
+ croak("'$command_str' died with signal $signal (coredump available)");
+ }
+ else {
+ croak("'$command_str' died with signal $signal");
+ }
+ }
+ else {
+ my $cmd_exit = $cmd_exitcode >> 8;
+ $retcode = $cmd_exit;
+ }
+
+ if (wantarray) {
+ return ($retcode, $stdout, $stderr);
+ }
+ else {
+ return $retcode;
+ }
+}
+
+################################################################################
+#
+# add the given device(s) to the device tree
+#
+# update_devicetree($parent, %child);
+# update_devicetree($parent, @children);
+#
+################################################################################
+sub update_devicetree {
+ my $parent = shift;
+ my @children = @_;
+
+ # add an entry for each each logical volume
+ if (@children) {
+ push @{ $FAI::current_dev_children{$parent} }, @children;
+ }
+ elsif (not exists $FAI::current_dev_children{$parent}) {
+ # at least initialize an empty list (to avoid undef)
+ $FAI::current_dev_children{$parent} = ();
+ }
+
+ return;
+}
+
+1;
diff -Nur vanilla/usr/share/fai/setup-storage/Volumes.pm patched/usr/share/fai/setup-storage/Volumes.pm
--- vanilla/usr/share/fai/setup-storage/Volumes.pm 2014-06-03 10:55:00.000000000 +0200
+++ patched/usr/share/fai/setup-storage/Volumes.pm 2014-06-20 14:15:27.551968787 +0200
@@ -33,6 +33,9 @@
package FAI;
+use Cwd qw(abs_path);
+
+
################################################################################
#
# @brief Collect all physical devices reference in the desired configuration
@@ -390,49 +393,38 @@
################################################################################
sub get_current_lvm {
- use Linux::LVM;
- use Cwd qw(abs_path);
-
- # get the existing volume groups
- foreach my $vg (get_volume_group_list()) {
- # initialise the hash entry
- $FAI::current_lvm_config{$vg}{physical_volumes} = ();
-
- # init device tree
- $FAI::current_dev_children{"VG_$vg"} = ();
-
- # store the vg size in MB
- my %vg_info = get_volume_group_information($vg);
- if (%vg_info) {
- $FAI::current_lvm_config{$vg}{size} = &FAI::convert_unit(
- $vg_info{vg_size} . $vg_info{vg_size_unit});
- } else {
- $FAI::current_lvm_config{$vg}{size} = "0";
- }
-
- # store the logical volumes and their sizes
- my %lv_info = get_logical_volume_information($vg);
- foreach my $lv_name (sort keys %lv_info) {
- my $short_name = $lv_name;
- $short_name =~ s{/dev/\Q$vg\E/}{};
- $FAI::current_lvm_config{$vg}{volumes}{$short_name}{size} =
- &FAI::convert_unit($lv_info{$lv_name}->{lv_size} .
- $lv_info{$lv_name}->{lv_size_unit});
- # add entry in device tree
- push @{ $FAI::current_dev_children{"VG_$vg"} }, $lv_name;
- }
+ # parse the current LVM configuration
+ my @output = _get_vgdisplay_output();
+ my %parsed = _parse_vgdisplay(@output);
+
+ if ($FAI::debug) {
+ require Data::Dumper;
+ $Data::Dumper::Indent = 1; # default is 2
+ $Data::Dumper::Sortkeys = 1; # default is 0
+ print Data::Dumper->Dump([ \%parsed ], [ 'parsed' ]);
+ }
- # store the physical volumes
- my %pv_info = get_physical_volume_information($vg);
- foreach my $pv_name (sort keys %pv_info) {
- push @{ $FAI::current_lvm_config{$vg}{physical_volumes} },
- abs_path($pv_name);
+ # update global variable with parsed result
+ %FAI::current_lvm_config = %parsed;
- # add entry in device tree
- push @{ $FAI::current_dev_children{abs_path($pv_name)} }, "VG_$vg";
- }
+ # update the device tree with LVM device hierarchy
+ for my $vg (sort keys %parsed) {
+ my $vg_key = "VG_$vg";
+
+ # add an entry for each each physical volume
+ my @pv_list = @{ $parsed{$vg}->{'physical_volumes'} };
+ for my $pv (@pv_list) {
+ update_devicetree($pv, $vg_key);
+ }
+
+ # add an entry for each each logical volume
+ # (sorting the keys is probably not necessary, but it doesn't hurt either)
+ my @lv_list = sort keys %{ $parsed{$vg}->{'volumes'} };
+ my @lv_devices = map { "/dev/$vg/$_" } @lv_list;
+ update_devicetree($vg_key, @lv_devices);
}
+ return;
}
################################################################################
@@ -644,6 +636,110 @@
}
}
+sub _make_lv_devicename {
+ my $vg = shift;
+ my $lv = shift;
+
+ # LVM 2.02.88 or below: LV Name = /dev/<vg>/<lv>
+ if ($lv =~ m{\A \Q/dev/$vg/ \z}xms) {
+ croak("Ancient version detected. Please upgrade to LVM2 2.02.89 or higher.");
+ }
+ # LVM 2.02.89 or higher: LV Name = <lv>, LV Path = /dev/<vg>/<lv>
+ elsif ($lv =~ m{\A [^/] \z}xms) {
+ return "/dev/$vg/$lv";
+ }
+ else {
+ croak("Unable to generate a device name for '$lv'");
+ }
+}
-1;
+sub _get_vgdisplay_output {
+
+ my @command = (
+ 'vgdisplay',
+ '-v',
+ );
+ my ($retcode, $stdout, $stderr) = execute(@command);
+
+ if ($retcode == 0) {
+ return (split /\n/xms, $stdout);
+ }
+ else {
+ croak("E: vgdisplay failed with exit code '$retcode'!");
+ }
+}
+
+sub _parse_vgdisplay {
+ my @output = @_;
+ chomp @output;
+
+ my %parsed;
+
+ my ($cur_section, $vg_name, $lv_name);
+ for my $line (@output) {
+
+ # strip leading and trailing whitespace; skip empty lines
+ $line =~ s/\A \s+ //xms;
+ $line =~ s/ \s+ \z//xms;
+ if (not length $line) {
+ next;
+ }
+
+ if ($line =~ /\A--- (\w+ \w+) ---\z/ms) {
+ $cur_section = $1;
+ }
+ elsif (defined $cur_section) {
+ my ($key, $value) = split /[ ]{2,}/xms, $line, 2;
+
+ if ($cur_section eq 'Volume group') {
+ if ($key eq 'VG Name') {
+ $vg_name = $value;
+ }
+ elsif ($key eq 'VG Size') {
+ # convert_unit does not handle whitespace
+ $value =~ s/\s//xmsg;
+ my $size_mib = &FAI::convert_unit($value);
+ $parsed{$vg_name}->{'size'} = $size_mib;
+ }
+ }
+ elsif ($cur_section eq 'Logical volume') {
+ if ($key eq 'LV Name') {
+ # LVM 2.02.89 or higher: LV Name = <lv>, LV Path = /dev/<vg>/<lv>
+ if ($value =~ m{\A ([^/]+) \z}xms) {
+ $lv_name = $1;
+ }
+ # probably an ancient LVM2 version (LV Name = /dev/<vg>/<lv>)
+ else {
+ croak("Unable to parse '$line'.");
+ }
+ }
+ elsif ($key eq 'VG Name' and $vg_name ne $value) {
+ croak('Parser error - Volume group does not match!');
+ }
+ elsif ($key eq 'LV Size') {
+ # convert_unit does not handle whitespace
+ $value =~ s/\s//xmsg;
+ my $size_mib = &FAI::convert_unit($value);
+ $parsed{$vg_name}->{'volumes'}->{$lv_name}->{'size'} = $size_mib;
+ }
+ }
+ elsif ($cur_section eq 'Physical volumes') {
+ if ($key eq 'PV Name') {
+ my $device = abs_path($value);
+ push @{ $parsed{$vg_name}->{'physical_volumes'} }, $device;
+ }
+ }
+ else {
+ croak 'Found unknown section in vgdisplay output!';
+ }
+ }
+ else {
+ croak 'Unable to parse vgdisplay output - please verify!';
+ }
+ }
+
+ return %parsed;
+}
+
+1;
