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

Redundant Router: Fix isVmAlive()

This commit is contained in:
Sheng Yang 2011-06-09 15:39:15 -07:00
parent e92d00d3bf
commit 7e2fe6b6c9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/src/com/cloud/ha/UserVmDomRInvestigator.java
View File

@ -78,16 +78,22 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl {
continue;
}
/* Any active domR should able to do so */
VirtualRouter router = _vnaMgr.getRoutersForNetwork(nic.getNetworkId()).get(0);
if (router == null) {
List<VirtualRouter> routers = _vnaMgr.getRoutersForNetwork(nic.getNetworkId());
if (routers == null || routers.isEmpty()) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Unable to find a router in network " + nic.getNetworkId() + " to ping " + vm);
}
continue;
}
Boolean result = testUserVM(vm, nic, router);
Boolean result = null;
for (VirtualRouter router : routers) {
result = testUserVM(vm, nic, router);
if (result != null) {
break;
}
}
if (result == null) {
continue;
}