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:51:56 UTC
[1/4] git commit: updated refs/heads/master to 59bf355
Repository: cloudstack
Updated Branches:
refs/heads/master 59eed9ef7 -> 59bf35591
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/59bf3559
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59bf3559
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59bf3559
Branch: refs/heads/master
Commit: 59bf3559196a9452a1a048849f4f9971753d373b
Parents: 4083634
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Mon May 5 15:31:35 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 20:08:30 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 52 ++++++++------------
1 file changed, 20 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59bf3559/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 49da7ec..2e7b5a1 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;
@@ -2811,22 +2811,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>();
@@ -2841,24 +2842,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;
[4/4] git commit: updated refs/heads/master to 59bf355
Posted by ja...@apache.org.
CLOUDSTACK-6364 Added ip address validation
Also updated to assign vm primary ip to lb rule when vmid is passed virtualmachineid
and vm id ip details in vmidipmap
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11591582
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11591582
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11591582
Branch: refs/heads/master
Commit: 11591582d5fe27a824bb148e5a405724c0a6a614
Parents: 59eed9e
Author: Jayapal <ja...@apache.org>
Authored: Wed Apr 9 16:38:02 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 20:08:30 2014 +0530
----------------------------------------------------------------------
.../AssignToLoadBalancerRuleCmd.java | 6 ++
.../lb/LoadBalancingRulesManagerImpl.java | 61 ++++++++++++--------
2 files changed, 43 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11591582/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
index a519993..db4d70e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
@@ -23,6 +23,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import com.cloud.utils.net.NetUtils;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
@@ -142,6 +143,11 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
throw new InvalidParameterValueException("Unable to find virtual machine ID: " + vmId);
}
+ //check wether the given ip is valid ip or not
+ if (vmIp == null || !NetUtils.isValidIp(vmIp)) {
+ throw new InvalidParameterValueException("Invalid ip address "+ vmIp +" passed in vmidipmap for " +
+ "vmid " + vmId);
+ }
Long longVmId = lbvm.getId();
List<String> ipsList = null;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11591582/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
index 44047bf..dd0ac5e 100755
--- a/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
+++ b/server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -986,20 +986,6 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
// check for conflict
Set<Long> passedInstanceIds = vmIdIpMap.keySet();
for (Long instanceId : passedInstanceIds) {
- if (existingVmIdIps.containsKey(instanceId)) {
- // now check for ip address
- List<String> mappedIps = existingVmIdIps.get(instanceId);
- List<String> newIps = vmIdIpMap.get(instanceId);
-
- if (newIps != null) {
- for (String newIp: newIps) {
- if (mappedIps.contains(newIp)) {
- throw new InvalidParameterValueException("VM " + instanceId + " with " + newIp +" is already mapped to load balancer.");
- }
- }
- }
- }
-
UserVm vm = _vmDao.findById(instanceId);
if (vm == null || vm.getState() == State.Destroyed || vm.getState() == State.Expunging) {
InvalidParameterValueException ex = new InvalidParameterValueException("Invalid instance id specified");
@@ -1036,28 +1022,55 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
}
String priIp = nicInSameNetwork.getIp4Address();
+
+ if (existingVmIdIps.containsKey(instanceId)) {
+ // now check for ip address
+ List<String> mappedIps = existingVmIdIps.get(instanceId);
+ List<String> newIps = vmIdIpMap.get(instanceId);
+
+ if (newIps == null) {
+ newIps = new ArrayList<String>();
+ newIps.add(priIp);
+ }
+
+ for (String newIp: newIps) {
+ if (mappedIps.contains(newIp)) {
+ throw new InvalidParameterValueException("VM " + instanceId + " with " + newIp +" is already mapped to load balancer.");
+ }
+ }
+ }
+
List<String> vmIpsList = vmIdIpMap.get(instanceId);
String vmLbIp = null;
- if (vmIpsList == null) {
- vmIpsList = new ArrayList<String>();
- vmIpsList.add(priIp);
- vmIdIpMap.put(instanceId, vmIpsList);
- } else {
- // skip the primary ip from vm secondary ip comparisions
- if (vmIpsList.contains(priIp)) {
- vmIpsList.remove(priIp);
- }
+ if (vmIpsList != null) {
//check if the ips belongs to nic secondary ip
for (String ip: vmIpsList) {
+ // skip the primary ip from vm secondary ip comparisions
+ if (ip.equals(priIp)) {
+ continue;
+ }
if(_nicSecondaryIpDao.findByIp4AddressAndNicId(ip,nicInSameNetwork.getId()) == null) {
throw new InvalidParameterValueException("VM ip "+ ip + " specified does not belong to " +
"nic in network " + nicInSameNetwork.getNetworkId());
}
}
+ } else {
+ vmIpsList = new ArrayList<String>();
+ vmIpsList.add(priIp);
+ }
+
+ // when vm id is passed in instance ids and in vmidipmap
+ // assign for primary ip and ip passed in vmidipmap
+ if (instanceIds != null ) {
+ if (instanceIds.contains(instanceId)) {
+ vmIpsList.add(priIp);
+ }
}
+ vmIdIpMap.put(instanceId, vmIpsList);
+
if (s_logger.isDebugEnabled()) {
s_logger.debug("Adding " + vm + " to the load balancer pool");
}
@@ -1072,7 +1085,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
public void doInTransactionWithoutResult(TransactionStatus status) {
for (Long vmId : vmIds) {
- final List<String> lbVmIps = newMap.get(vmId);
+ final Set<String> lbVmIps = new HashSet<String>(newMap.get(vmId));
for (String vmIp: lbVmIps) {
LoadBalancerVMMapVO map = new LoadBalancerVMMapVO(loadBalancer.getId(), vmId, vmIp, false);
map = _lb2VmMapDao.persist(map);
[3/4] git commit: updated refs/heads/master to 59bf355
Posted by ja...@apache.org.
CLOUDSTACK-6578: Fixed issue in delete remote access vpn command
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40836344
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40836344
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40836344
Branch: refs/heads/master
Commit: 40836344de54091d795817f41a4fa136ecdb0f5d
Parents: b9b623b
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:56:59 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 20:08:30 2014 +0530
----------------------------------------------------------------------
.../com/cloud/network/vpn/RemoteAccessVpnService.java | 2 +-
.../api/command/user/vpn/DeleteRemoteAccessVpnCmd.java | 6 +++++-
.../cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 12 ++++++++++--
3 files changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40836344/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
index acf007b..decf8c4 100644
--- a/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
+++ b/api/src/com/cloud/network/vpn/RemoteAccessVpnService.java
@@ -33,7 +33,7 @@ public interface RemoteAccessVpnService {
RemoteAccessVpn createRemoteAccessVpn(long vpnServerAddressId, String ipRange, boolean openFirewall, Boolean forDisplay) throws NetworkRuleConflictException;
- void destroyRemoteAccessVpnForIp(long vpnServerAddressId, Account caller) throws ResourceUnavailableException;
+ boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException;
RemoteAccessVpn startRemoteAccessVpn(long vpnServerAddressId, boolean openFirewall) throws ResourceUnavailableException;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40836344/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
index f894124..37b7b5a 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpn/DeleteRemoteAccessVpnCmd.java
@@ -20,6 +20,8 @@ import org.apache.log4j.Logger;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
@@ -91,7 +93,9 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
@Override
public void execute() throws ResourceUnavailableException {
- _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount());
+ if (! _ravService.destroyRemoteAccessVpnForIp(publicIpId, CallContext.current().getCallingAccount())) {
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete remote access vpn");
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/40836344/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index 0f734dd..9d9118c 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -285,15 +285,16 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
@Override
@DB
- public void destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
+ public boolean destroyRemoteAccessVpnForIp(long ipId, Account caller) throws ResourceUnavailableException {
final RemoteAccessVpnVO vpn = _remoteAccessVpnDao.findByPublicIpAddress(ipId);
if (vpn == null) {
s_logger.debug("there are no Remote access vpns for public ip address id=" + ipId);
- return;
+ return true;
}
_accountMgr.checkAccess(caller, AccessType.OperateEntry, vpn);
+ RemoteAccessVpn.State prevState = vpn.getState();
vpn.setState(RemoteAccessVpn.State.Removed);
_remoteAccessVpnDao.update(vpn.getId(), vpn);
@@ -305,6 +306,12 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
break;
}
}
+ }catch (ResourceUnavailableException ex) {
+ vpn.setState(prevState);
+ _remoteAccessVpnDao.update(vpn.getId(), vpn);
+ s_logger.debug("Failed to stop the vpn " + vpn.getId() + " , so reverted state to "+
+ RemoteAccessVpn.State.Running);
+ success = false;
} finally {
if (success) {
//Cleanup corresponding ports
@@ -366,6 +373,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
}
}
+ return success;
}
@Override
[2/4] git commit: updated refs/heads/master to 59bf355
Posted by ja...@apache.org.
CLOUDSTACK-6577: Disable service monitoring in RVR
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b9b623bc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b9b623bc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b9b623bc
Branch: refs/heads/master
Commit: b9b623bccc6819f4a8f96054c51ecc5d3f1db944
Parents: 1159158
Author: Jayapal <ja...@apache.org>
Authored: Mon May 5 13:45:51 2014 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue May 6 20:08:30 2014 +0530
----------------------------------------------------------------------
.../VirtualNetworkApplianceManagerImpl.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9b623bc/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 5e4c6a5..49da7ec 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -2485,6 +2485,19 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
if (reprogramGuestNtwks) {
finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId, null);
finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId);
+
+ NetworkOffering offering = _networkOfferingDao.findById((_networkDao.findById(guestNetworkId)).getNetworkOfferingId());
+ //service monitoring is currently not added in RVR
+ if (!offering.getRedundantRouter()) {
+ String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
+
+ if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) {
+ finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, true);
+ } else {
+ finalizeMonitorServiceOnStrat(cmds, profile, router, provider, guestNetworkId, false);
+ }
+ }
+
}
finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
@@ -2495,15 +2508,6 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
}
- String serviceMonitringSet = SetServiceMonitor.valueIn(router.getDataCenterId());
- //String serviceMonitringSet = _configDao.getValue(Config.EnableServiceMonitoring.key());
-
- if (serviceMonitringSet != null && serviceMonitringSet.equalsIgnoreCase("true")) {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), true);
- } else {
- finalizeMonitorServiceOnStrat(cmds, profile, router, provider, routerGuestNtwkIds.get(0), false);
- }
-
return true;
}