Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
Refactor the aws lb extension
Browse files Browse the repository at this point in the history
  • Loading branch information
@swgkg
swgkg committed Dec 8, 2015
1 parent 1e87b40 commit 298428b
Show file tree
Hide file tree
Showing 3 changed files with 136 additions and 156 deletions.
9 changes: 3 additions & 6 deletions ...ancer/modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,20 +471,17 @@ public LoadBalancerDescription getLoadBalancerDescription(
public List<Instance> getAttachedInstances(String loadBalancerName,
String region) {
try {
LoadBalancerDescription lbDescription = getLoadBalancerDescription(
loadBalancerName, region);
LoadBalancerDescription lbDescription = getLoadBalancerDescription(loadBalancerName, region);

if (lbDescription == null) {
log.warn("Could not find description of load balancer "
+ loadBalancerName);
log.warn("Could not find description of load balancer "+ loadBalancerName);
return null;
}

return lbDescription.getInstances();

} catch (AmazonClientException e) {
log.error("Could not find instances attached load balancer "
+ loadBalancerName, e);
log.error("Could not find instances attached load balancer "+ loadBalancerName, e);
}

return null;
Expand Down
259 changes: 121 additions & 138 deletions ...modules/aws-extension/src/main/java/org/apache/stratos/aws/extension/AWSLoadBalancer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,63 +80,13 @@ public boolean configure(Topology topology)
// Get the load balancer and update it.

if (log.isDebugEnabled()) {
log.debug("Load balancer for cluster " + cluster.getClusterId() + " is already present.");
log.debug(String.format("Load balancer for cluster %s is already present.", cluster.getClusterId()));
}

LoadBalancerInfo loadBalancerInfo = clusterIdToLoadBalancerMap.get(cluster.getClusterId());
if(updateExistingLoadBalancer(cluster)){
activeClusters.add(cluster.getClusterId());
}

String loadBalancerName = loadBalancerInfo.getName();
String region = loadBalancerInfo.getRegion();

// Get all the instances attached - Attach newly added instances to load balancer

// attachedInstances list is useful in finding out what are the new instances which
// should be attached to this load balancer.
List<Instance> attachedInstances = awsHelper.getAttachedInstances(loadBalancerName, region);

// clusterMembers stores all the members of a cluster.
Collection<Member> clusterMembers = cluster.getMembers();

if (clusterMembers.size() > 0) {
activeClusters.add(cluster.getClusterId());

List<Instance> instancesToAddToLoadBalancer = new ArrayList<Instance>();
List<String> availabilityZones = new ArrayList<String>();

for (Member member : clusterMembers) {
// if instance id of member is not in
// attachedInstances
// add this to instancesToAddToLoadBalancer
Instance instance = new Instance(awsHelper.getAWSInstanceName(member.getInstanceId()));

if (attachedInstances == null || !attachedInstances.contains(instance)) {
instancesToAddToLoadBalancer.add(instance);

if (log.isDebugEnabled()) {
log.debug("Instance " + awsHelper.getAWSInstanceName(member.getInstanceId()) +
" needs to be registered to load balancer " + loadBalancerName);
}

// LB Common Member has a property 'EC2_AVAILABILITY_ZONE' points to the ec2 availability zone
// for this member. Use the property value to update the LB about the relevant zone
String availabilityZone = getEC2AvaialbilityZoneOfMember(member);
if (availabilityZone != null) {
availabilityZones.add(availabilityZone);
}
}
}

if (instancesToAddToLoadBalancer.size() > 0) {
awsHelper.registerInstancesToLoadBalancer(
loadBalancerName,
instancesToAddToLoadBalancer, region);
}

// update LB with the zones
if (!availabilityZones.isEmpty() && !AWSExtensionContext.getInstance().isOperatingInVPC()) {
awsHelper.addAvailabilityZonesForLoadBalancer(loadBalancerName, availabilityZones, region);
}
}

} else {
// Create a new load balancer for this cluster
Expand All @@ -161,107 +111,37 @@ public boolean configure(Topology topology)
if (initialZones.isEmpty()) {
// initial availability zones not defined
// use the default (<region>a)
initialAvailabilityZones.add(awsHelper.getAvailabilityZoneFromRegion
(region));
initialAvailabilityZones.add(awsHelper.getAvailabilityZoneFromRegion(region));
} else {
// prepend the region and construct the availability zone list with
// full names (<region> + <zone>)
for (String zone : initialZones) {
initialAvailabilityZones.add(region + zone);
}
}
String loadBalancerDNSName =
createAWSLoadBalancer(loadBalancerName, region, listenersForThisCluster,initialAvailabilityZones);

// Returns DNS name of load balancer which was created.
// This is used in the domain mapping of this cluster.
String loadBalancerDNSName = awsHelper.createLoadBalancer(loadBalancerName, listenersForThisCluster,
region, initialAvailabilityZones, AWSExtensionContext.getInstance().isOperatingInVPC());

// enable connection draining (default) and cross zone load balancing (if specified in aws-extension.sh)
awsHelper.modifyLBAttributes(loadBalancerName, region, AWSExtensionContext.getInstance().
isCrossZoneLoadBalancingEnabled(), true);

// Add the inbound rule the security group of the load balancer
// For each listener, add a new rule with load balancer port as allowed protocol in the security group.
// if security group id is defined, directly use that
for (Listener listener : listenersForThisCluster) {
int port = listener.getLoadBalancerPort();

if (awsHelper.getLbSecurityGroupIdDefinedInConfiguration() != null && !awsHelper.
getLbSecurityGroupIdDefinedInConfiguration().isEmpty()) {
for (String protocol : awsHelper.getAllowedProtocolsForLBSecurityGroup()) {
awsHelper.addInboundRuleToSecurityGroup(awsHelper.getLbSecurityGroupIdDefinedInConfiguration(),
region, protocol, port);
}
} else if (awsHelper.getLbSecurityGroupName() != null && !awsHelper
.getLbSecurityGroupName().isEmpty()) {
for (String protocol : awsHelper.getAllowedProtocolsForLBSecurityGroup()) {
awsHelper.addInboundRuleToSecurityGroup(awsHelper.getSecurityGroupId(awsHelper
.getLbSecurityGroupName(), region), region, protocol, port);
}
}
}

log.info("Load balancer '" + loadBalancerDNSName + "' created for cluster '" + cluster.getClusterId());

// Register instances in the cluster to load balancer
List<Instance> instances = new ArrayList<Instance>();
List<String> availabilityZones = new ArrayList<String>();

for (Member member : clusterMembers) {
String instanceId = member.getInstanceId();

if (log.isDebugEnabled()) {
log.debug("Instance " + awsHelper.getAWSInstanceName(instanceId) + " needs to be registered to load balancer "
+ loadBalancerName);
}

Instance instance = new Instance();
instance.setInstanceId(awsHelper.getAWSInstanceName(instanceId));

instances.add(instance);
// LB Common Member has a property 'EC2_AVAILABILITY_ZONE' which points to the ec2 availability
// zone for this member. Use the property value to update the LB about the relevant zone
String availabilityZone = getEC2AvaialbilityZoneOfMember(member);
if (availabilityZone != null) {
availabilityZones.add(availabilityZone);
}
}
log.info(String.format("Load balancer %s created for cluster %s " , loadBalancerDNSName, cluster.getClusterId()));

awsHelper.registerInstancesToLoadBalancer(loadBalancerName, instances, region);

// update LB with the zones
if (!availabilityZones.isEmpty() && !AWSExtensionContext.getInstance().isOperatingInVPC()) {
awsHelper.addAvailabilityZonesForLoadBalancer(loadBalancerName, availabilityZones, region);
}

// add stickiness policy
if (awsHelper.getAppStickySessionCookie() != null && !awsHelper.getAppStickySessionCookie().isEmpty()) {
CreateAppCookieStickinessPolicyResult result = awsHelper.createStickySessionPolicy(loadBalancerName,
awsHelper.getAppStickySessionCookie(), Constants.STICKINESS_POLICY, region);

if (result != null) {
// Take a single port mapping from a member, and apply the policy for
// the LB Listener port (Proxy port of the port mapping)
awsHelper.applyPolicyToLBListenerPorts(aMember.getPorts(), loadBalancerName,
Constants.STICKINESS_POLICY, region);
}
}
if(addClusterMembersInfo(clusterMembers, loadBalancerName, region)){
activeClusters.add(cluster.getClusterId());
}

// persist LB info
try {
persistenceManager.persist(new LBInfoDTO(loadBalancerName, cluster.getClusterId(), region));

} catch (PersistenceException e) {
log.error("Unable to persist LB Information for " + loadBalancerName + ", cluster id " +
cluster.getClusterId());
log.error(String.format(
"Unable to persist LB Information for %s , cluster id %s " + loadBalancerName,
cluster.getClusterId()));
}

LoadBalancerInfo loadBalancerInfo = new LoadBalancerInfo(
loadBalancerName, region);
LoadBalancerInfo loadBalancerInfo = new LoadBalancerInfo(loadBalancerName, region);
clusterIdToLoadBalancerMap.put(cluster.getClusterId(),loadBalancerInfo);

clusterIdToLoadBalancerMap.put(cluster.getClusterId(),
loadBalancerInfo);
activeClusters.add(cluster.getClusterId());
}

pause(3000);
Expand Down Expand Up @@ -311,7 +191,111 @@ public boolean configure(Topology topology)
return true;
}

private String getEC2AvaialbilityZoneOfMember(Member member) {
private Boolean addClusterMembersInfo(Collection<Member> clusterMembers, String loadBalancerName, String region) {
Boolean isUpdated=false;
// Register instances in the cluster to load balancer
List<Instance> instances = new ArrayList<Instance>();
List<String> availabilityZones = new ArrayList<String>();

for (Member member : clusterMembers) {
isUpdated=true;
String instanceId = member.getInstanceId();

if (log.isDebugEnabled()) {
log.debug("Instance " + awsHelper.getAWSInstanceName(instanceId) + " needs to be registered to load balancer "
+ loadBalancerName);
}

Instance instance = new Instance();
instance.setInstanceId(awsHelper.getAWSInstanceName(instanceId));

instances.add(instance);
// LB Common Member has a property 'EC2_AVAILABILITY_ZONE' which points to the ec2 availability
// zone for this member. Use the property value to update the LB about the relevant zone
String availabilityZone = getEC2AvaialbilityZoneOfMember(member);
if (availabilityZone != null) {
availabilityZones.add(availabilityZone);
}

// add stickiness policy
if (awsHelper.getAppStickySessionCookie() != null && !awsHelper.getAppStickySessionCookie().isEmpty()) {
CreateAppCookieStickinessPolicyResult result = awsHelper.createStickySessionPolicy(loadBalancerName, awsHelper.getAppStickySessionCookie(),
Constants.STICKINESS_POLICY,
region);

if (result != null) {
// Take a single port mapping from a member, and apply the policy for
// the LB Listener port (Proxy port of the port mapping)
awsHelper.applyPolicyToLBListenerPorts(member.getPorts(), loadBalancerName,
Constants.STICKINESS_POLICY, region);
}
}

}

awsHelper.registerInstancesToLoadBalancer(loadBalancerName, instances, region);

// update LB with the zones
if (!availabilityZones.isEmpty() && !AWSExtensionContext.getInstance().isOperatingInVPC()) {
awsHelper.addAvailabilityZonesForLoadBalancer(loadBalancerName, availabilityZones, region);
}
return isUpdated;
}

private String createAWSLoadBalancer(String loadBalancerName, String region, List<Listener> listenersForThisCluster,
Set<String> initialAvailabilityZones) throws LoadBalancerExtensionException {
// Returns DNS name of load balancer which was created.
// This is used in the domain mapping of this cluster.
String loadBalancerDNSName = awsHelper.createLoadBalancer(loadBalancerName, listenersForThisCluster,
region, initialAvailabilityZones, AWSExtensionContext.getInstance().isOperatingInVPC());

// enable connection draining (default) and cross zone load balancing (if specified in aws-extension.sh)
awsHelper.modifyLBAttributes(loadBalancerName, region, AWSExtensionContext.getInstance().
isCrossZoneLoadBalancingEnabled(), true);
// Add the inbound rule the security group of the load balancer
// For each listener, add a new rule with load balancer port as allowed protocol in the security group.
// if security group id is defined, directly use that
for (Listener listener : listenersForThisCluster) {
int port = listener.getLoadBalancerPort();

if (awsHelper.getLbSecurityGroupIdDefinedInConfiguration() != null && !awsHelper.getLbSecurityGroupIdDefinedInConfiguration().isEmpty()) {
for (String protocol : awsHelper.getAllowedProtocolsForLBSecurityGroup()) {
awsHelper.addInboundRuleToSecurityGroup(awsHelper.getLbSecurityGroupIdDefinedInConfiguration(),
region, protocol, port);
}
} else if (awsHelper.getLbSecurityGroupName() != null && !awsHelper
.getLbSecurityGroupName().isEmpty()) {
for (String protocol : awsHelper.getAllowedProtocolsForLBSecurityGroup()) {
awsHelper.addInboundRuleToSecurityGroup(awsHelper.getSecurityGroupId(awsHelper.getLbSecurityGroupName(),region), region, protocol,port);
}
}
}

return loadBalancerDNSName;
}

private Boolean updateExistingLoadBalancer(Cluster cluster) {
Boolean isUpdated=false;
LoadBalancerInfo loadBalancerInfo = clusterIdToLoadBalancerMap.get(cluster.getClusterId());

String loadBalancerName = loadBalancerInfo.getName();
String region = loadBalancerInfo.getRegion();

// Get all the instances attached - Attach newly added instances to load balancer

// attachedInstances list is useful in finding out what are the new instances which
// should be attached to this load balancer.
List<Instance> attachedInstances = awsHelper.getAttachedInstances(loadBalancerName, region);

// clusterMembers stores all the members of a cluster.
Collection<Member> clusterMembers = cluster.getMembers();

isUpdated= addClusterMembersInfo(clusterMembers, loadBalancerName, region);

return isUpdated;
}

private String getEC2AvaialbilityZoneOfMember(Member member) {
if (member.getProperties() != null) {
return member.getProperties().getProperty(Constants.EC2_AVAILABILITY_ZONE_PROPERTY);
}
Expand All @@ -324,7 +308,6 @@ private String getEC2AvaialbilityZoneOfMember(Member member) {
* nothing but logs the message.
*/
public void start() throws LoadBalancerExtensionException {

log.info("AWS load balancer extension started.");
}

Expand Down
Loading

0 comments on commit 298428b

Please sign in to comment.