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

bug 10998: maintain lb id in map table

Browse Source 
status 10998: resolved fixed
This commit is contained in:
Chiradeep Vittal 2011-08-05 17:37:11 -07:00
parent bb313a61f0
commit ec7c9a2f7e
3 changed files with 53 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
server/src/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java
View File

@ -245,7 +245,7 @@ public class ElasticLoadBalancerManagerImpl implements
try { try {
answers = _agentMgr.send(elbVm.getHostId(), cmds); answers = _agentMgr.send(elbVm.getHostId(), cmds);
} catch (OperationTimedoutException e) { } catch (OperationTimedoutException e) {
s_logger.warn("Timed Out", e); s_logger.warn("ELB: Timed Out", e);
throw new AgentUnavailableException( throw new AgentUnavailableException(
"Unable to send commands to virtual elbVm ", "Unable to send commands to virtual elbVm ",
elbVm.getHostId(), e); elbVm.getHostId(), e);
@ -321,7 +321,7 @@ public class ElasticLoadBalancerManagerImpl implements
return true; return true;
} }
if (rules.get(0).getPurpose() != Purpose.LoadBalancing) { if (rules.get(0).getPurpose() != Purpose.LoadBalancing) {
s_logger.warn("Not handling non-LB firewall rules"); s_logger.warn("ELB: Not handling non-LB firewall rules");
return false; return false;
} }
@ -396,12 +396,12 @@ public class ElasticLoadBalancerManagerImpl implements
} else if ("public".equalsIgnoreCase(traffType)){ } else if ("public".equalsIgnoreCase(traffType)){
_frontendTrafficType = TrafficType.Public; _frontendTrafficType = TrafficType.Public;
} else } else
throw new ConfigurationException("Traffic type for front end of load balancer has to be guest or public; found : " + traffType); throw new ConfigurationException("ELB: Traffic type for front end of load balancer has to be guest or public; found : " + traffType);
s_logger.info("Elastic Load Balancer: will balance on " + traffType ); s_logger.info("ELB: Elastic Load Balancer: will balance on " + traffType );
int gcIntervalMinutes = NumbersUtil.parseInt(configs.get(Config.ElasticLoadBalancerVmGcInterval.key()), 5); int gcIntervalMinutes = NumbersUtil.parseInt(configs.get(Config.ElasticLoadBalancerVmGcInterval.key()), 5);
if (gcIntervalMinutes < 5) if (gcIntervalMinutes < 5)
gcIntervalMinutes = 5; gcIntervalMinutes = 5;
s_logger.info("Elastic Load Balancer: scheduling GC to run every " + gcIntervalMinutes + " minutes" ); s_logger.info("ELB: Elastic Load Balancer: scheduling GC to run every " + gcIntervalMinutes + " minutes" );
_gcThreadPool = Executors.newScheduledThreadPool(1, new NamedThreadFactory("ELBVM-GC")); _gcThreadPool = Executors.newScheduledThreadPool(1, new NamedThreadFactory("ELBVM-GC"));
_gcThreadPool.scheduleAtFixedRate(new CleanupThread(), gcIntervalMinutes, gcIntervalMinutes, TimeUnit.MINUTES); _gcThreadPool.scheduleAtFixedRate(new CleanupThread(), gcIntervalMinutes, gcIntervalMinutes, TimeUnit.MINUTES);
_itMgr.registerGuru(VirtualMachine.Type.ElasticLoadBalancerVm, this); _itMgr.registerGuru(VirtualMachine.Type.ElasticLoadBalancerVm, this);
@ -443,7 +443,7 @@ public class ElasticLoadBalancerManagerImpl implements
guestNetwork = _networkDao.acquireInLockTable(guestNetworkId); guestNetwork = _networkDao.acquireInLockTable(guestNetworkId);
if (guestNetwork == null) { if (guestNetwork == null) {
throw new ConcurrentOperationException("Unable to acquire network configuration: " + guestNetworkId); throw new ConcurrentOperationException("Unable to acquire network lock: " + guestNetworkId);
} }
try { try {
@ -454,7 +454,7 @@ public class ElasticLoadBalancerManagerImpl implements
} }
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Starting a elastic ip vm for network configurations: " + guestNetwork + " in " + dest); s_logger.debug("Starting a ELB vm for network configurations: " + guestNetwork + " in " + dest);
} }
assert guestNetwork.getState() == Network.State.Implemented assert guestNetwork.getState() == Network.State.Implemented
|| guestNetwork.getState() == Network.State.Setup || guestNetwork.getState() == Network.State.Setup
@ -469,7 +469,7 @@ public class ElasticLoadBalancerManagerImpl implements
if (elbVm == null) { if (elbVm == null) {
long id = _routerDao.getNextInSequence(Long.class, "id"); long id = _routerDao.getNextInSequence(Long.class, "id");
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Creating the elastic LB vm " + id); s_logger.debug("Creating the ELB vm " + id);
} }
List<NetworkOfferingVO> offerings = _networkMgr.getSystemAccountNetworkOfferings(NetworkOfferingVO.SystemControlNetwork); List<NetworkOfferingVO> offerings = _networkMgr.getSystemAccountNetworkOfferings(NetworkOfferingVO.SystemControlNetwork);
@ -516,7 +516,7 @@ public class ElasticLoadBalancerManagerImpl implements
private DomainRouterVO stop(DomainRouterVO elbVm, boolean forced, User user, Account caller) throws ConcurrentOperationException, ResourceUnavailableException { private DomainRouterVO stop(DomainRouterVO elbVm, boolean forced, User user, Account caller) throws ConcurrentOperationException, ResourceUnavailableException {
s_logger.debug("Stopping elb vm " + elbVm); s_logger.debug("Stopping ELB vm " + elbVm);
try { try {
if (_itMgr.advanceStop( elbVm, forced, user, caller)) { if (_itMgr.advanceStop( elbVm, forced, user, caller)) {
return _routerDao.findById(elbVm.getId()); return _routerDao.findById(elbVm.getId());
@ -564,13 +564,13 @@ public class ElasticLoadBalancerManagerImpl implements
//TODO: this only works in the guest network. Handle the public network case also. //TODO: this only works in the guest network. Handle the public network case also.
List<NetworkOfferingVO> offerings = _networkOfferingDao.listByTrafficTypeAndGuestType(true, _frontendTrafficType, GuestIpType.Direct); List<NetworkOfferingVO> offerings = _networkOfferingDao.listByTrafficTypeAndGuestType(true, _frontendTrafficType, GuestIpType.Direct);
if (offerings == null || offerings.size() == 0) { if (offerings == null || offerings.size() == 0) {
s_logger.warn("Could not find system offering for direct networks of type " + _frontendTrafficType); s_logger.warn("ELB: Could not find system offering for direct networks of type " + _frontendTrafficType);
return null; return null;
} }
NetworkOffering frontEndOffering = offerings.get(0); NetworkOffering frontEndOffering = offerings.get(0);
List<NetworkVO> networks = _networksDao.listBy(Account.ACCOUNT_ID_SYSTEM, frontEndOffering.getId(), lb.getZoneId()); List<NetworkVO> networks = _networksDao.listBy(Account.ACCOUNT_ID_SYSTEM, frontEndOffering.getId(), lb.getZoneId());
if (networks == null || networks.size() == 0) { if (networks == null || networks.size() == 0) {
s_logger.warn("Could not find network of offering type " + frontEndOffering + " in zone " + lb.getZoneId()); s_logger.warn("ELB: Could not find network of offering type " + frontEndOffering + " in zone " + lb.getZoneId());
return null; return null;
} }
Network frontEndNetwork = networks.get(0); Network frontEndNetwork = networks.get(0);
@ -581,13 +581,13 @@ public class ElasticLoadBalancerManagerImpl implements
ipvo.setAssociatedWithNetworkId(frontEndNetwork.getId()); ipvo.setAssociatedWithNetworkId(frontEndNetwork.getId());
_ipAddressDao.update(ipvo.getId(), ipvo); _ipAddressDao.update(ipvo.getId(), ipvo);
txn.commit(); txn.commit();
s_logger.info("Acquired public IP for loadbalancing " + ip); s_logger.info("Acquired frontend IP for ELB " + ip);
return ip; return ip;
} }
public void releaseIp(long ipId, long userId, Account caller) { public void releaseIp(long ipId, long userId, Account caller) {
s_logger.info("Release public IP for loadbalancing " + ipId); s_logger.info("ELB: Release public IP for loadbalancing " + ipId);
IPAddressVO ipvo = _ipAddressDao.findById(ipId); IPAddressVO ipvo = _ipAddressDao.findById(ipId);
ipvo.setAssociatedWithNetworkId(null); ipvo.setAssociatedWithNetworkId(null);
_ipAddressDao.update(ipvo.getId(), ipvo); _ipAddressDao.update(ipvo.getId(), ipvo);
@ -595,14 +595,30 @@ public class ElasticLoadBalancerManagerImpl implements
_ipAddressDao.unassignIpAddress(ipId); _ipAddressDao.unassignIpAddress(ipId);
} }
protected NetworkVO getNetworkToDeployLb(Long ipId) {
IPAddressVO ipAddr = _ipAddressDao.findById(ipId);
Long networkId= ipAddr.getSourceNetworkId();
NetworkVO network=_networkDao.findById(networkId);
if (network.getGuestType() != GuestIpType.Direct) {
s_logger.info("ELB: not handling guest traffic of type " + network.getGuestType());
return null;
}
return network;
}
@Override @Override
@DB @DB
public LoadBalancer handleCreateLoadBalancerRule( CreateLoadBalancerRuleCmd lb, Account account) throws InsufficientAddressCapacityException, NetworkRuleConflictException { public LoadBalancer handleCreateLoadBalancerRule( CreateLoadBalancerRuleCmd lb, Account account) throws InsufficientAddressCapacityException, NetworkRuleConflictException {
Long ipId = lb.getSourceIpAddressId(); Long ipId = lb.getSourceIpAddressId();
if (ipId != null && getNetworkToDeployLb(ipId) == null) {
return null;
}
boolean newIp = false; boolean newIp = false;
account = _accountDao.acquireInLockTable(account.getId()); account = _accountDao.acquireInLockTable(account.getId());
if (account == null) { if (account == null) {
s_logger.warn("CreateLoadBalancer: Failed to acquire lock on account"); s_logger.warn("ELB: CreateLoadBalancer: Failed to acquire lock on account");
throw new CloudRuntimeException("Failed to acquire lock on account"); throw new CloudRuntimeException("Failed to acquire lock on account");
} }
try { try {
@ -616,27 +632,25 @@ public class ElasticLoadBalancerManagerImpl implements
throw new InvalidParameterValueException("Supplied LB name " + lb.getName() + " is not associated with IP " + lb.getSourceIpAddressId() ); throw new InvalidParameterValueException("Supplied LB name " + lb.getName() + " is not associated with IP " + lb.getSourceIpAddressId() );
} }
} else { } else {
s_logger.debug("Could not find any existing frontend ips for this account for this LB rule, acquiring a new frontent IP for ELB");
PublicIp ip = allocIp(lb, account); PublicIp ip = allocIp(lb, account);
ipId = ip.getId(); ipId = ip.getId();
newIp = true; newIp = true;
} }
} else { } else {
ipId = existingLbs.get(0).getSourceIpAddressId(); ipId = existingLbs.get(0).getSourceIpAddressId();
s_logger.debug("ELB: Found existing frontend ip for this account for this LB rule " + ipId);
} }
} else { } else {
s_logger.warn("Found existing load balancers matching requested new LB"); s_logger.warn("ELB: Found existing load balancers matching requested new LB");
throw new NetworkRuleConflictException("Found existing load balancers matching requested new LB"); throw new NetworkRuleConflictException("ELB: Found existing load balancers matching requested new LB");
} }
NetworkVO network = getNetworkToDeployLb(ipId);
IPAddressVO ipAddr = _ipAddressDao.findById(ipId); IPAddressVO ipAddr = _ipAddressDao.findById(ipId);
Long networkId= ipAddr.getSourceNetworkId(); long networkId = network.getId();
NetworkVO network=_networkDao.findById(networkId);
if (network.getGuestType() != GuestIpType.Direct) {
s_logger.info("Elastic LB Manager: not handling guest traffic of type " + network.getGuestType());
return null;
}
LoadBalancer result = null; LoadBalancer result = null;
try { try {
lb.setSourceIpAddressId(ipId); lb.setSourceIpAddressId(ipId);
@ -710,9 +724,9 @@ public class ElasticLoadBalancerManagerImpl implements
stop(elbVm, true, user, _systemAcct); stop(elbVm, true, user, _systemAcct);
gceed = true; gceed = true;
} catch (ConcurrentOperationException e) { } catch (ConcurrentOperationException e) {
s_logger.warn("Unable to stop unused elb vm " + elbVm + " due to ", e); s_logger.warn("Unable to stop unused ELB vm " + elbVm + " due to ", e);
} catch (ResourceUnavailableException e) { } catch (ResourceUnavailableException e) {
s_logger.warn("Unable to stop unused elb vm " + elbVm + " due to ", e); s_logger.warn("Unable to stop unused ELB vm " + elbVm + " due to ", e);
continue; continue;
} }
if (gceed) { if (gceed) {
@ -720,7 +734,7 @@ public class ElasticLoadBalancerManagerImpl implements
s_logger.info("Attempting to destroy ELB VM: " + elbVm); s_logger.info("Attempting to destroy ELB VM: " + elbVm);
_itMgr.expunge(elbVm, user, _systemAcct); _itMgr.expunge(elbVm, user, _systemAcct);
} catch (ResourceUnavailableException e) { } catch (ResourceUnavailableException e) {
s_logger.warn("Unable to destroy unused elb vm " + elbVm + " due to ", e); s_logger.warn("Unable to destroy unused ELB vm " + elbVm + " due to ", e);
gceed = false; gceed = false;
} }
} }
@ -746,9 +760,12 @@ public class ElasticLoadBalancerManagerImpl implements
@Override @Override
public void handleDeleteLoadBalancerRule(LoadBalancer lb, long userId, Account caller) { public void handleDeleteLoadBalancerRule(LoadBalancer lb, long userId, Account caller) {
s_logger.debug("ELB mgr: releasing ip " + lb.getSourceIpAddressId() + " since the LB rule is deleted"); List<LoadBalancerVO> remainingLbs = _loadBalancerDao.listByIpAddress(lb.getSourceIpAddressId());
if (remainingLbs.size() == 0) {
s_logger.debug("ELB mgr: releasing ip " + lb.getSourceIpAddressId() + " since no LB rules remain for this ip address");
releaseIp(lb.getSourceIpAddressId(), userId, caller); releaseIp(lb.getSourceIpAddressId(), userId, caller);
} }
}
@Override @Override
@ -802,12 +819,12 @@ public class ElasticLoadBalancerManagerImpl implements
// control command is sent over management network in VMware // control command is sent over management network in VMware
if (dest.getHost().getHypervisorType() == HypervisorType.VMware) { if (dest.getHost().getHypervisorType() == HypervisorType.VMware) {
if (s_logger.isInfoEnabled()) { if (s_logger.isInfoEnabled()) {
s_logger.info("Check if we need to add management server explicit route to elb vm. pod cidr: " + dest.getPod().getCidrAddress() + "/" + dest.getPod().getCidrSize() s_logger.info("Check if we need to add management server explicit route to ELB vm. pod cidr: " + dest.getPod().getCidrAddress() + "/" + dest.getPod().getCidrSize()
+ ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + _mgmtHost); + ", pod gateway: " + dest.getPod().getGateway() + ", management host: " + _mgmtHost);
} }
if (s_logger.isDebugEnabled()) { if (s_logger.isDebugEnabled()) {
s_logger.debug("Added management server explicit route to elb vm."); s_logger.debug("Added management server explicit route to ELB vm.");
} }
// always add management explicit route, for basic networking setup // always add management explicit route, for basic networking setup
buf.append(" mgmtcidr=").append(_mgmtCidr); buf.append(" mgmtcidr=").append(_mgmtCidr);

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

@ -381,15 +381,11 @@ public class LoadBalancingRulesManagerImpl implements LoadBalancingRulesManager,
throw new InvalidParameterValueException("Invalid algorithm: " + lb.getAlgorithm()); throw new InvalidParameterValueException("Invalid algorithm: " + lb.getAlgorithm());
} }
Long ipId = lb.getSourceIpAddressId(); LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
if (result == null){
if (ipId == null) { result = createLoadBalancer(lb);
return _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
} else {
return createLoadBalancer(lb);
} }
return result;
} }
public LoadBalancer createLoadBalancer(CreateLoadBalancerRuleCmd lb) throws NetworkRuleConflictException { public LoadBalancer createLoadBalancer(CreateLoadBalancerRuleCmd lb) throws NetworkRuleConflictException {

2
server/test/com/cloud/network/dao/ElbVmMapDaoTest.java
View File

@ -35,7 +35,7 @@ public class ElbVmMapDaoTest extends TestCase {
public void testFindLB() { public void testFindLB() {
ElasticLbVmMapDaoImpl dao = ComponentLocator.inject(ElasticLbVmMapDaoImpl.class); ElasticLbVmMapDaoImpl dao = ComponentLocator.inject(ElasticLbVmMapDaoImpl.class);
List<LoadBalancerVO> lbs = dao.listLbsForElbVm(5); List<LoadBalancerVO> lbs = dao.listLbsForElbVm(12);
if (lbs == null) { if (lbs == null) {
System.out.println("Not Found"); System.out.println("Not Found");
} else { } else {