etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6248: remove domR from domrIP map before rebooting. This will stop WatachNetwork command until reboot is complete 

status 6248: resolved fixed
This commit is contained in:
kishan 2010-10-01 13:46:08 +05:30
parent e8a5872655
commit 175f508e20
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -2165,21 +2165,18 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
}
protected Answer execute(RebootRouterCommand cmd) {
Long bytesSent = 0L;
Long bytesRcvd = 0L;
if (VirtualMachineName.isValidRouterName(cmd.getVmName())) {
long[] stats = getNetworkStats(cmd.getVmName());
bytesSent = stats[0];
bytesRcvd = stats[1];
}
long[] stats = getNetworkStats(cmd.getVmName());
Long bytesSent = stats[0];
Long bytesRcvd = stats[1];
_domrIPMap.remove(cmd.getVmName());
RebootAnswer answer = (RebootAnswer) execute((RebootCommand) cmd);
answer.setBytesSent(bytesSent);
answer.setBytesReceived(bytesRcvd);
_domrIPMap.put(cmd.getVmName(), cmd.getPrivateIpAddress());
if (answer.getResult()) {
String cnct = connect(cmd.getVmName(), cmd.getPrivateIpAddress());
networkUsage(cmd.getPrivateIpAddress(), "create", null);
if (cnct == null) {
_domrIPMap.put(cmd.getVmName(), cmd.getPrivateIpAddress());
return answer;
} else {
return new Answer(cmd, false, cnct);