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

Merge branch '4.14'

Browse Source
This commit is contained in:
Daan Hoogland 2020-11-06 17:25:13 +01:00
commit a8b4d9d0e1
1 changed files with 64 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -29,6 +29,8 @@ import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import com.cloud.offerings.NetworkOfferingServiceMapVO;
import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd; import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd; import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;
@ -209,6 +211,8 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
@Inject @Inject
NetworkDao _networkDao; NetworkDao _networkDao;
@Inject @Inject
NetworkOfferingServiceMapDao _networkOfferingServiceDao;
@Inject
FirewallRulesDao _firewallDao; FirewallRulesDao _firewallDao;
@Inject @Inject
DomainService _domainMgr; DomainService _domainMgr;
@ -260,6 +264,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
@Inject @Inject
NicSecondaryIpDao _nicSecondaryIpDao; NicSecondaryIpDao _nicSecondaryIpDao;
private static final int DNS_PORT = 53;
// Will return a string. For LB Stickiness this will be a json, for // Will return a string. For LB Stickiness this will be a json, for
// autoscale this will be "," separated values // autoscale this will be "," separated values
@Override @Override
@ -1598,65 +1603,73 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
// LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, // LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb,
// lbOwner, lb.getNetworkId()); // lbOwner, lb.getNetworkId());
LoadBalancer result = null; LoadBalancer result = null;
if (result == null) { IpAddress systemIp = null;
IpAddress systemIp = null; NetworkOffering off = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());
NetworkOffering off = _entityMgr.findById(NetworkOffering.class, network.getNetworkOfferingId());
if (off.isElasticLb() && ipVO == null && network.getVpcId() == null) { if (srcPortStart == DNS_PORT && ipVO.isSourceNat()) {
systemIp = _ipAddrMgr.assignSystemIp(networkId, lbOwner, true, false); List<NetworkOfferingServiceMapVO> offeringServices = _networkOfferingServiceDao.listByNetworkOfferingId(network.getNetworkOfferingId());
if (systemIp != null) { for (NetworkOfferingServiceMapVO serviceMapVo: offeringServices) {
ipVO = _ipAddressDao.findById(systemIp.getId()); if (serviceMapVo.getService().equals(Service.Dns.getName())) {
throw new InvalidParameterValueException("Error adding load balancer rule, cannot add port 53 with network service offering having DNS service and Source NAT.");
} }
} }
}
// Validate ip address if (off.isElasticLb() && ipVO == null && network.getVpcId() == null) {
if (ipVO == null) { systemIp = _ipAddrMgr.assignSystemIp(networkId, lbOwner, true, false);
throw new InvalidParameterValueException("Unable to create load balance rule; can't find/allocate source IP"); if (systemIp != null) {
} else if (ipVO.isOneToOneNat()) { ipVO = _ipAddressDao.findById(systemIp.getId());
throw new NetworkRuleConflictException("Can't do load balance on ip address: " + ipVO.getAddress()); }
}
// Validate ip address
if (ipVO == null) {
throw new InvalidParameterValueException("Unable to create load balance rule; can't find/allocate source IP");
} else if (ipVO.isOneToOneNat()) {
throw new NetworkRuleConflictException("Can't do load balance on ip address: " + ipVO.getAddress());
}
boolean performedIpAssoc = false;
try {
if (ipVO.getAssociatedWithNetworkId() == null) {
boolean assignToVpcNtwk = network.getVpcId() != null && ipVO.getVpcId() != null && ipVO.getVpcId().longValue() == network.getVpcId();
if (assignToVpcNtwk) {
// set networkId just for verification purposes
_networkModel.checkIpForService(ipVO, Service.Lb, networkId);
s_logger.debug("The ip is not associated with the VPC network id=" + networkId + " so assigning");
ipVO = _ipAddrMgr.associateIPToGuestNetwork(ipAddrId, networkId, false);
performedIpAssoc = true;
}
} else {
_networkModel.checkIpForService(ipVO, Service.Lb, null);
} }
boolean performedIpAssoc = false; if (ipVO.getAssociatedWithNetworkId() == null) {
try { throw new InvalidParameterValueException("Ip address " + ipVO + " is not assigned to the network " + network);
if (ipVO.getAssociatedWithNetworkId() == null) { }
boolean assignToVpcNtwk = network.getVpcId() != null && ipVO.getVpcId() != null && ipVO.getVpcId().longValue() == network.getVpcId();
if (assignToVpcNtwk) {
// set networkId just for verification purposes
_networkModel.checkIpForService(ipVO, Service.Lb, networkId);
s_logger.debug("The ip is not associated with the VPC network id=" + networkId + " so assigning"); result = createPublicLoadBalancer(xId, name, description, srcPortStart, defPortStart, ipVO.getId(), protocol, algorithm, openFirewall, CallContext.current(),
ipVO = _ipAddrMgr.associateIPToGuestNetwork(ipAddrId, networkId, false); lbProtocol, forDisplay);
performedIpAssoc = true; } catch (Exception ex) {
} s_logger.warn("Failed to create load balancer due to ", ex);
} else { if (ex instanceof NetworkRuleConflictException) {
_networkModel.checkIpForService(ipVO, Service.Lb, null); throw (NetworkRuleConflictException)ex;
} }
if (ipVO.getAssociatedWithNetworkId() == null) { if (ex instanceof InvalidParameterValueException) {
throw new InvalidParameterValueException("Ip address " + ipVO + " is not assigned to the network " + network); throw (InvalidParameterValueException)ex;
} }
result = createPublicLoadBalancer(xId, name, description, srcPortStart, defPortStart, ipVO.getId(), protocol, algorithm, openFirewall, CallContext.current(), } finally {
lbProtocol, forDisplay); if (result == null && systemIp != null) {
} catch (Exception ex) { s_logger.debug("Releasing system IP address " + systemIp + " as corresponding lb rule failed to create");
s_logger.warn("Failed to create load balancer due to ", ex); _ipAddrMgr.handleSystemIpRelease(systemIp);
if (ex instanceof NetworkRuleConflictException) { }
throw (NetworkRuleConflictException)ex; // release ip address if ipassoc was perfored
} if (performedIpAssoc) {
ipVO = _ipAddressDao.findById(ipVO.getId());
if (ex instanceof InvalidParameterValueException) { _vpcMgr.unassignIPFromVpcNetwork(ipVO.getId(), networkId);
throw (InvalidParameterValueException)ex;
}
} finally {
if (result == null && systemIp != null) {
s_logger.debug("Releasing system IP address " + systemIp + " as corresponding lb rule failed to create");
_ipAddrMgr.handleSystemIpRelease(systemIp);
}
// release ip address if ipassoc was perfored
if (performedIpAssoc) {
ipVO = _ipAddressDao.findById(ipVO.getId());
_vpcMgr.unassignIPFromVpcNetwork(ipVO.getId(), networkId);
}
} }
} }