honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EC2 Discovery should optionally bind to nodes who are members of all groups, closes #345.

This commit is contained in:
kimchy 2010-09-01 15:07:26 +03:00
parent 7709cd1bc2
commit 38cae95ebc
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/cloud/aws/src/main/java/org/elasticsearch/discovery/ec2/AwsEc2UnicastHostsProvider.java
View File

@ -53,6 +53,8 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni
private final String ports; private final String ports;
private final boolean bindAnyGroup;
private final ImmutableSet<String> groups; private final ImmutableSet<String> groups;
private final ImmutableSet<String> availabilityZones; private final ImmutableSet<String> availabilityZones;
@ -66,6 +68,7 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni
this.hostType = HostType.valueOf(componentSettings.get("host_type", "private_ip").toUpperCase()); this.hostType = HostType.valueOf(componentSettings.get("host_type", "private_ip").toUpperCase());
this.ports = componentSettings.get("ports", "9300-9302"); this.ports = componentSettings.get("ports", "9300-9302");
this.bindAnyGroup = componentSettings.getAsBoolean("any_group", true);
Set<String> groups = Sets.newHashSet(componentSettings.getAsArray("groups")); Set<String> groups = Sets.newHashSet(componentSettings.getAsArray("groups"));
if (componentSettings.get("groups") != null) { if (componentSettings.get("groups") != null) {
groups.addAll(Strings.commaDelimitedListToSet(componentSettings.get("groups"))); groups.addAll(Strings.commaDelimitedListToSet(componentSettings.get("groups")));
@ -89,10 +92,18 @@ public class AwsEc2UnicastHostsProvider extends AbstractComponent implements Uni
if (!groups.isEmpty()) { if (!groups.isEmpty()) {
// lets see if we can filter based on groups // lets see if we can filter based on groups
List<String> groupNames = reservation.getGroupNames(); List<String> groupNames = reservation.getGroupNames();
if (Collections.disjoint(groups, groupNames)) { if (bindAnyGroup) {
logger.trace("filtering out reservation {} based on groups {}, not part of {}", reservation.getReservationId(), groupNames, groups); if (Collections.disjoint(groups, groupNames)) {
// continue to the next reservation logger.trace("filtering out reservation {} based on groups {}, not part of {}", reservation.getReservationId(), groupNames, groups);
continue; // continue to the next reservation
continue;
}
} else {
if (!groupNames.containsAll(groups)) {
logger.trace("filtering out reservation {} based on groups {}, does not include all of {}", reservation.getReservationId(), groupNames, groups);
// continue to the next reservation
continue;
}
} }
} }