RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: add optional size argument to resize command

This commit is contained in:
Thomas Schoebel-Theuer 2013-04-24 15:38:53 +02:00
parent 803a1c8419
commit 46f815f54e
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/sy_old/mars_light.c
View File

@ -495,11 +495,6 @@ int _set_copy_params(struct mars_brick *_brick, void *private)
copy_brick->copy_start = cc->info[1].current_size;
if (cc->start_pos != -1) {
copy_brick->copy_start = cc->start_pos;
if (unlikely(cc->info[0].current_size != cc->info[1].current_size)) {
MARS_ERR("oops, devices have different size %lld != %lld at '%s'\n", cc->info[0].current_size, cc->info[1].current_size, cc->copy_path);
status = -EINVAL;
goto done;
}
if (unlikely(cc->start_pos > cc->info[0].current_size)) {
MARS_ERR("bad start position %lld is larger than actual size %lld on '%s'\n", cc->start_pos, cc->info[0].current_size, cc->copy_path);
status = -EINVAL;

23
userspace/marsadm
View File

@ -386,7 +386,9 @@ sub check_splitbrain {
sub get_size {
my $arg = shift;
return -1 unless $arg =~ m/^[0-9.]+[kmgtp]?$/i;
if (!$arg =~ m/^[0-9.]+[kmgtp]?$/i) {
ldie "size argument '$arg' must be a number, optionally followed by suffix k or m or g or t or p\n";
}
my $mod = $arg;
$arg =~ s/[^0-9]+$//;
$mod =~ s/^[0-9]+//;
@ -1037,7 +1039,13 @@ sub invalidate_res {
}
sub resize_res {
my ($cmd, $res) = @_;
my ($cmd, $res, $size_arg) = @_;
my $new_size = 0;
if ($size_arg) {
$new_size = get_size($size_arg);
ldie "optional size argument '$new_size' must be numeric and positive\n" unless scalar($new_size) > 0;
lprint "new size: $new_size bytes\n";
}
check_primary(@_);
my @actsizes = glob("$mars/resource-$res/actsize-*");
ldie "resource $res has no actsize-* symlinks\n" unless @actsizes;
@ -1051,8 +1059,11 @@ sub resize_res {
}
}
lprint "old_size=$old_size\n";
lprint "new_size=$min_size\n";
ldie "only increases of the size are possible\n" if $min_size <= $old_size && !$force;
lprint "min_size=$min_size\n";
$new_size = $min_size if !$new_size;
lprint "new_size=$new_size\n";
ldie "new size $new_size is higher than the minimum size of all volumes $min_size" if $new_size > $min_size; # no override with --force possible
ldie "only increases of the size are possible without --force\n" if $new_size <= $old_size && !$force;
foreach my $switch (glob("$mars/resource-$res/todo-*/sync")) {
my $this_switch = get_link($switch);
ldie "sync on '$switch' is switched on -- use marsadm pause-sync to stop\n" unless !$this_switch;
@ -1065,11 +1076,11 @@ sub resize_res {
foreach my $syncsize (@syncsizes) {
my $this_size = get_link($syncsize);
unlink("$syncsize.new");
symlink($min_size, "$syncsize.new") or ldie "cannot create size symlink '$syncsize.new'\n";
symlink($new_size, "$syncsize.new") or ldie "cannot create size symlink '$syncsize.new'\n";
rename("$syncsize.new", $syncsize) or ldie "cannot create size symlink '$syncsize'\n";;
}
unlink("$lnk.new");
symlink($min_size, "$lnk.new") or ldie "cannot create size symlink '$lnk.new'\n";
symlink($new_size, "$lnk.new") or ldie "cannot create size symlink '$lnk.new'\n";
rename("$lnk.new", $lnk) or ldie "cannot create size symlink '$lnk'\n";;
}