You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2014/05/06 16:06:05 UTC
[3/3] git commit: updated refs/heads/4.4-forward to a708d5c
CLOUDSTACK-6531: stopping the router in case of command failures. Also added alerts for failures.
Signed-off-by: Jayapal <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/645516ee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/645516ee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/645516ee
Branch: refs/heads/4.4-forward
Commit: 645516ee78a8117dfa221caa0fc8d4dfe521af2b
Parents: a642fa1
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Mon May 5 15:31:35 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 19:35:34 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 52 ++++++++------------
1 file changed, 20 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/645516ee/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 80ca1cf..d877c6e 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -46,6 +46,7 @@ import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
+import org.apache.cloudstack.alert.AlertService;
import org.apache.cloudstack.alert.AlertService.AlertType;
import org.apache.cloudstack.api.command.admin.router.RebootRouterCmd;
import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
@@ -81,7 +82,6 @@ import com.cloud.agent.api.NetworkUsageAnswer;
import com.cloud.agent.api.NetworkUsageCommand;
import com.cloud.agent.api.PvlanSetupCommand;
import com.cloud.agent.api.StartupCommand;
-import com.cloud.agent.api.check.CheckSshAnswer;
import com.cloud.agent.api.check.CheckSshCommand;
import com.cloud.agent.api.routing.AggregationControlCommand;
import com.cloud.agent.api.routing.AggregationControlCommand.Action;
@@ -2807,22 +2807,23 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
public boolean finalizeStart(final VirtualMachineProfile profile, final long hostId, final Commands cmds, final ReservationContext context) {
DomainRouterVO router = _routerDao.findById(profile.getId());
- boolean result = true;
-
- Answer answer = cmds.getAnswer("checkSsh");
- if (answer != null && answer instanceof CheckSshAnswer) {
- final CheckSshAnswer sshAnswer = (CheckSshAnswer)answer;
- if (sshAnswer == null || !sshAnswer.getResult()) {
- s_logger.warn("Unable to ssh to the VM: " + sshAnswer.getDetails());
- result = false;
+ //process all the answers
+ for (Answer answer : cmds.getAnswers()) {
+ // handle any command failures
+ if (!answer.getResult()) {
+ String cmdClassName = answer.getClass().getCanonicalName().replace("Answer", "Command");
+ String errorMessage = "Command: " + cmdClassName + " failed while starting virtual router";
+ String errorDetails = "Details: " + answer.getDetails() + " " + answer.toString();
+ //add alerts for the failed commands
+ _alertMgr.sendAlert(AlertService.AlertType.ALERT_TYPE_DOMAIN_ROUTER, router.getDataCenterId(), router.getPodIdToDeployIn(), errorMessage, errorDetails);
+ s_logger.warn(errorMessage);
+ //Stop the router if any of the commands failed
+ return false;
}
- } else {
- result = false;
- }
- if (result == false) {
- return result;
}
+ // at this point, all the router command are successful.
+ boolean result = true;
//Get guest networks info
final List<Network> guestNetworks = new ArrayList<Network>();
@@ -2837,24 +2838,11 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
}
}
}
-
- if (!result) {
- return result;
- }
-
- answer = cmds.getAnswer("getDomRVersion");
- if (answer != null && answer instanceof GetDomRVersionAnswer) {
- final GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer)answer;
- if (answer == null || !answer.getResult()) {
- s_logger.warn("Unable to get the template/scripts version of router " + router.getInstanceName() + " due to: " + versionAnswer.getDetails());
- result = false;
- } else {
- router.setTemplateVersion(versionAnswer.getTemplateVersion());
- router.setScriptsVersion(versionAnswer.getScriptsVersion());
- router = _routerDao.persist(router, guestNetworks);
- }
- } else {
- result = false;
+ if (result) {
+ GetDomRVersionAnswer versionAnswer = (GetDomRVersionAnswer)cmds.getAnswer("getDomRVersion");
+ router.setTemplateVersion(versionAnswer.getTemplateVersion());
+ router.setScriptsVersion(versionAnswer.getScriptsVersion());
+ router = _routerDao.persist(router, guestNetworks);
}
return result;