return $cmd;
};
+sub run_rbd_command {
+ my ($cmd, %args) = @_;
+
+ my $lasterr;
+ my $errmsg = $args{errmsg} . ": " || "";
+ if (!exists($args{errfunc})) {
+ # ' error: 2014-02-06 11:51:59.839135 7f09f94d0760 -1 librbd: snap_unprotect: can't unprotect;
+ # at least 1 child(ren) in pool cephstor1
+ $args{errfunc} = sub {
+ my $line = shift;
+ if ($line =~ m/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]+ [\-\d]+ librbd: (.*)$/) {
+ $lasterr = "$1\n";
+ } else {
+ $lasterr = $line;
+ }
+ print STDERR $lasterr;
+ *STDERR->flush();
+ };
+ }
+
+ eval { run_command($cmd, %args); };
+ if (my $err = $@) {
+ die $errmsg . $lasterr if length($lasterr);
+ die $err;
+ }
+
+ return undef;
+}
+
sub rbd_ls {
my ($scfg, $storeid) = @_;
};
eval {
- run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
};
my $err = $@;
};
- run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
return ($size, $parent, $format, $protected);
}
}
sub path {
- my ($class, $scfg, $volname, $storeid) = @_;
+ my ($class, $scfg, $volname, $storeid, $snapname) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ $name .= '@'.$snapname if $snapname;
my $monhost = addslashes($scfg->{monhost});
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $newvolname = $basename ? "$basename/$newname" : "$newname";
my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', &$add_pool_to_disk($scfg, $name), &$add_pool_to_disk($scfg, $newname));
- run_command($cmd, errmsg => "rbd rename $name' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
my $running = undef; #fixme : is create_base always offline ?
if (!$protected){
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
- run_command($cmd, errmsg => "rbd protect $newname snap $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd protect $newname snap $snap' error");
}
return $newvolname;
my $newvol = "$basename/$name";
- my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', $basename, '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd clone $basename' error", errfunc => sub {});
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename), '--snap', $snap, &$add_pool_to_disk($scfg, $name));
+ run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
return $newvol;
}
$name = &$find_free_diskname($storeid, $scfg, $vmid);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', int(($size+1023)/1024), $name);
- run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--image-format' , 2, '--size', int(($size+1023)/1024), $name);
+ run_rbd_command($cmd, errmsg => "rbd create $name' error");
return $name;
}
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);
if ($protected){
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
- run_command($cmd, errmsg => "rbd unprotect $name snap $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd unprotect $name snap $snap' error");
}
}
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge', $name);
- run_command($cmd, errmsg => "rbd snap purge $volname' error", outfunc => sub {}, errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error");
$cmd = &$rbd_cmd($scfg, $storeid, 'rm', $name);
- run_command($cmd, errmsg => "rbd rm $volname' error", outfunc => sub {}, errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd rm '$volname' error");
return undef;
}
};
eval {
- run_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
+ run_rbd_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
};
my $total = $stats->{space} ? $stats->{space}*1024 : 0;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--size', ($size/1024/1024), $name);
- run_command($cmd, errmsg => "rbd resize $volname' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd resize '$volname' error");
return undef;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
return undef;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname to $snap' error", errfunc => sub {});
+ run_rbd_command($cmd, errmsg => "rbd snapshot $volname to $snap' error");
}
sub volume_snapshot_delete {
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
- run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+
+ run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
+
return undef;
}