rpms/virt-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't fail if the second node is unavailable, just act as the local libvirt is the only one

Browse Source
This commit is contained in:
Daniel Berteaud 2013-07-28 19:39:48 +02:00
parent 8f674c07d1
commit b58b095631
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
virt-backup
View File

@ -176,8 +176,11 @@ $libvirt1 = Sys::Virt->new( uri => $connect[0] ) ||
die "Error connecting to libvirt on URI: $connect[0]"; die "Error connecting to libvirt on URI: $connect[0]";
if (defined $connect[1]){ if (defined $connect[1]){
$libvirt2 = Sys::Virt->new( uri => $connect[1] ) || $libvirt2 = '';
die "Error connecting to libvirt on URI: $connect[1]"; eval { $libvirt2 = Sys::Virt->new( uri => $connect[1] ); };
if ($@ && $opts{debug}){
print "Error connecting to libvirt on URI: $connect[1], lets hope is out of order\n";
}
} }
our $libvirt = $libvirt1; our $libvirt = $libvirt1;
@ -192,7 +195,7 @@ foreach our $vm (@vms){
# If we've passed two connect URI, and our VM is not # If we've passed two connect URI, and our VM is not
# running on the first one, check on the second one # running on the first one, check on the second one
if (!$dom->is_active && defined $connect[1]){ if (!$dom->is_active && $libvirt2 ne ''){
$dom = $libvirt2->get_domain_by_name($vm) || $dom = $libvirt2->get_domain_by_name($vm) ||
die "Error opening $vm object"; die "Error opening $vm object";
@ -603,14 +606,14 @@ sub usage{
sub save_vm_state{ sub save_vm_state{
if ($dom->is_active()){ if ($dom->is_active()){
print "$vm is running, saving state....\n" if ($opts{debug}); print "$vm is running, saving state....\n" if ($opts{debug});
# if connect[1] is defined, you've passed several connection URI # if $libvirt2 is defined, you've passed several connection URI
# This means that you're running a dual hypervisor cluster # This means that you're running a dual hypervisor cluster
# And depending on the one running the current VM # And depending on the one running the current VM
# $backupdir might not be available # $backupdir might not be available
# whereas /var/lib/libvirt/qemu/save/ might # whereas /var/lib/libvirt/qemu/save/ might
# if you've mounted here a shared file system # if you've mounted here a shared file system
# (NFS, GlusterFS, GFS2, OCFS etc...) # (NFS, GlusterFS, GFS2, OCFS etc...)
if (defined $connect[1]){ if ($libvirt2 ne ''){
$dom->managed_save(); $dom->managed_save();
move "/var/lib/libvirt/qemu/save/$vm.save", "$backupdir/$vm.state"; move "/var/lib/libvirt/qemu/save/$vm.save", "$backupdir/$vm.state";
} }
@ -628,14 +631,14 @@ sub save_vm_state{
sub restore_vm{ sub restore_vm{
if (! $dom->is_active()){ if (! $dom->is_active()){
if (-e "$backupdir/$vm.state"){ if (-e "$backupdir/$vm.state"){
# if connect[1] is defined, you've passed several connection URI # if $libvirt2 is defined, you've passed several connection URI
# This means that you're running a dual hypervisor cluster # This means that you're running a dual hypervisor cluster
# And depending on the one running the current VM # And depending on the one running the current VM
# $backupdir might not be available # $backupdir might not be available
# whereas /var/lib/libvirt/qemu/save/ might # whereas /var/lib/libvirt/qemu/save/ might
# if you've mounted here a shared file system # if you've mounted here a shared file system
# (NFS, GlusterFS, GFS2, OCFS etc...) # (NFS, GlusterFS, GFS2, OCFS etc...)
if (defined $connect[1]){ if ($libvirt2){
copy "$backupdir/$vm.state", "/var/lib/libvirt/qemu/save/$vm.save"; copy "$backupdir/$vm.state", "/var/lib/libvirt/qemu/save/$vm.save";
start_vm(); start_vm();
} }