apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-15 18:12:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6292: Fix live migration of KVM when vnc ip address

Browse Source 
changes

Submitted-by: Yoshikazu Nojima
This commit is contained in:
Marcus Sorensen 2014-03-27 16:45:42 -06:00
parent 6356f5fdb0
commit 7390f99afb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -3078,7 +3078,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
//run migration in thread so we can monitor it
s_logger.info("Live migration of instance " + vmName + " initiated");
ExecutorService executor = Executors.newFixedThreadPool(1);
Callable<Domain> worker = new MigrateKVMAsync(dm, dconn, vmName, cmd.getDestinationIp());
Callable<Domain> worker = new MigrateKVMAsync(dm, dconn, xmlDesc, vmName, cmd.getDestinationIp());
Future<Domain> migrateThread = executor.submit(worker);
executor.shutdown();
long sleeptime = 0;
@ -3173,12 +3173,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
private class MigrateKVMAsync implements Callable<Domain> {
Domain dm = null;
Connect dconn = null;
String dxml = "";
String vmName = "";
String destIp = "";
MigrateKVMAsync(Domain dm, Connect dconn, String vmName, String destIp) {
MigrateKVMAsync(Domain dm, Connect dconn, String dxml, String vmName, String destIp) {
this.dm = dm;
this.dconn = dconn;
this.dxml = dxml;
this.vmName = vmName;
this.destIp = destIp;
}
@ -3187,9 +3189,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
public Domain call() throws LibvirtException {
// set compression flag for migration if libvirt version supports it
if (dconn.getLibVirVersion() < 1003000) {
return dm.migrate(dconn, (1 << 0), vmName, "tcp:" + destIp, _migrateSpeed);
return dm.migrate(dconn, (1 << 0), dxml, vmName, "tcp:" + destIp, _migrateSpeed);
} else {
return dm.migrate(dconn, (1 << 0)|(1 << 11), vmName, "tcp:" + destIp, _migrateSpeed);
return dm.migrate(dconn, (1 << 0)|(1 << 11), dxml, vmName, "tcp:" + destIp, _migrateSpeed);
}
}
}