Merge pull request canonical#3325 from brauner/2017-05-16/handle_migr…

…ation_on_btrfs_between_different_lxd_versions storage: handle btrfs migration on different lxds
xyq18 · May 16, 2017 · 0bed938 · 0bed938
2 parents 36c02d7 + af09d58
commit 0bed938
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lxd/storage_btrfs.go b/lxd/storage_btrfs.go
@@ -1971,6 +1971,10 @@ func (s *storageBtrfs) MigrationSink(live bool, container container, snapshots [
 		}
 
 		receivedSnapshot := fmt.Sprintf("%s/.migration-send", btrfsPath)
+		// handle older lxd versions
+		if !shared.PathExists(receivedSnapshot) {
+			receivedSnapshot = fmt.Sprintf("%s/.root", btrfsPath)
+		}
 		if isSnapshot {
 			receivedSnapshot = fmt.Sprintf("%s/%s", btrfsPath, snapName)
 			err = s.btrfsPoolVolumesSnapshot(receivedSnapshot, targetPath, true)