apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 13857: set vm migration speed as the network speed

Browse Source 
status 13857: resolved fixed
Reviewed-by: Frank
This commit is contained in:
Edison Su 2012-02-17 15:41:47 -08:00
parent 7181fed101
commit 86ce1b0675
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/conf/agent.properties
View File

@ -28,3 +28,6 @@ zone=default
#guid= a GUID to identify the agent #guid= a GUID to identify the agent
#vm.migrate.speed set the vm migrate speed, by default, it's the speed of guest network
#local.storage.path local storage path, by default, it's /var/lib/libvirt/images/
#cmds.timeout the timeout for time-consuming operations, such create/copy snapshot

22
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
View File

@ -243,6 +243,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
private String _dcId; private String _dcId;
private String _pod; private String _pod;
private String _clusterId; private String _clusterId;
private int _migrateSpeed;
private long _hvVersion; private long _hvVersion;
private KVMHAMonitor _monitor; private KVMHAMonitor _monitor;
@ -723,6 +724,25 @@ public class LibvirtComputingResource extends ServerResourceBase implements
_mountPoint = "/mnt"; _mountPoint = "/mnt";
} }
value = (String) params.get("vm.migrate.speed");
_migrateSpeed = NumbersUtil.parseInt(value, -1);
if (_migrateSpeed == -1) {
//get guest network device speed
_migrateSpeed = 0;
String speed = Script.runSimpleBashScript("ethtool " + _pifs.second() + " |grep Speed | cut -d \\ -f 2");
if (speed != null) {
String[] tokens = speed.split("M");
if (tokens.length == 2) {
try {
_migrateSpeed = Integer.parseInt(tokens[0]);
} catch (Exception e) {
}
s_logger.debug("device " + _pifs.second() + " has speed: " + String.valueOf(_migrateSpeed));
}
}
params.put("vm.migrate.speed", String.valueOf(_migrateSpeed));
}
saveProperties(params); saveProperties(params);
return true; return true;
@ -2004,7 +2024,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements
* VIR_MIGRATE_PERSIST_DEST(1<<3) * VIR_MIGRATE_PERSIST_DEST(1<<3)
*/ */
destDomain = dm.migrate(dconn, (1 << 0) | (1 << 3), vmName, "tcp:" destDomain = dm.migrate(dconn, (1 << 0) | (1 << 3), vmName, "tcp:"
+ cmd.getDestinationIp(), 0); + cmd.getDestinationIp(), _migrateSpeed);
} catch (LibvirtException e) { } catch (LibvirtException e) {
s_logger.debug("Can't migrate domain: " + e.getMessage()); s_logger.debug("Can't migrate domain: " + e.getMessage());
result = e.getMessage(); result = e.getMessage();