Skip to content
Snippets Groups Projects
Commit 9515e285 authored by Guido Günther's avatar Guido Günther
Browse files

Only check for cluster fs if we're using a filesystem

Closes: #676328
parent 0c361401
No related branches found
No related tags found
No related merge requests found
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Wed, 6 Jun 2012 20:36:31 +0200
Subject: Only check for cluster fs if we're using a filesystem
otherwise migration fails for e.g. network filesystems like sheepdog
with:
error: Invalid relative path 'virt-name': Invalid argument
while we should fail with:
Migration may lead to data corruption if disks use cache != none
References:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=676328
https://www.redhat.com/archives/libvirt-users/2012-May/msg00088.html
---
src/qemu/qemu_migration.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 6f42823..a20f05c 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -840,10 +840,13 @@ qemuMigrationIsSafe(virDomainDefPtr def)
!disk->readonly &&
disk->cachemode != VIR_DOMAIN_DISK_CACHE_DISABLE) {
int cfs;
- if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
- continue;
- else if (cfs < 0)
- return false;
+
+ if (disk->type == VIR_DOMAIN_DISK_TYPE_FILE) {
+ if ((cfs = virStorageFileIsClusterFS(disk->src)) == 1)
+ continue;
+ else if (cfs < 0)
+ return false;
+ }
qemuReportError(VIR_ERR_MIGRATE_UNSAFE, "%s",
_("Migration may lead to data corruption if disks"
...@@ -9,3 +9,4 @@ virsh-Initialize-library-before-calling-virResetLast.patch ...@@ -9,3 +9,4 @@ virsh-Initialize-library-before-calling-virResetLast.patch
Disable-gnulib-s-test-nonplocking-pipe.sh.patch Disable-gnulib-s-test-nonplocking-pipe.sh.patch
Disable-failing-virnetsockettest.patch Disable-failing-virnetsockettest.patch
Don-t-fail-if-we-can-t-setup-avahi.patch Don-t-fail-if-we-can-t-setup-avahi.patch
Only-check-for-cluster-fs-if-we-re-using-a-filesyste.patch
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment