rhtyd closed pull request #2416: CLOUDSTACK-10244: KVM online storage migration
fails
URL: https://github.com/apache/cloudstack/pull/2416
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
index 6ed56fb75ad..30f0e20ddd9 100644
---
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
+++
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtMigrateCommandWrapper.java
@@ -132,8 +132,11 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
vmsnapshots = libvirtComputingResource.cleanVMSnapshotMetadata(dm);
Map<String, MigrateCommand.MigrateDiskInfo> mapMigrateStorage =
command.getMigrateStorage();
+ // migrateStorage is declared as final because the replaceStorage
method may mutate mapMigrateStorage, but
+ // migrateStorage's value should always only be associated with
the initial state of mapMigrateStorage.
+ final boolean migrateStorage =
MapUtils.isNotEmpty(mapMigrateStorage);
- if (MapUtils.isNotEmpty(mapMigrateStorage)) {
+ if (migrateStorage) {
xmlDesc = replaceStorage(xmlDesc, mapMigrateStorage);
}
@@ -142,7 +145,7 @@ Use VIR_DOMAIN_XML_SECURE (value = 1) prior to v1.0.0.
//run migration in thread so we can monitor it
s_logger.info("Live migration of instance " + vmName + "
initiated");
final ExecutorService executor = Executors.newFixedThreadPool(1);
- final Callable<Domain> worker = new
MigrateKVMAsync(libvirtComputingResource, dm, dconn, xmlDesc,
MapUtils.isNotEmpty(mapMigrateStorage),
+ final Callable<Domain> worker = new
MigrateKVMAsync(libvirtComputingResource, dm, dconn, xmlDesc, migrateStorage,
command.isAutoConvergence(), vmName,
command.getDestinationIp());
final Future<Domain> migrateThread = executor.submit(worker);
executor.shutdown();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
