brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grkvlt <...@git.apache.org>
Subject [GitHub] incubator-brooklyn pull request: DNS entity improvements
Date Thu, 23 Oct 2014 20:19:04 GMT
Github user grkvlt commented on a diff in the pull request:

    https://github.com/apache/incubator-brooklyn/pull/263#discussion_r19304549
  
    --- Diff: software/network/src/main/java/brooklyn/entity/network/bind/BindDnsServerImpl.java
---
    @@ -143,124 +167,133 @@ protected void preStart() {
             String reverseLookupDomain = Joiner.on('.').join(Iterables.skip(Lists.reverse(Lists.newArrayList(Splitter.on('.').split(reverse))),
1)) + ".in-addr.arpa";
             setAttribute(REVERSE_LOOKUP_DOMAIN, reverseLookupDomain);
     
    -        Map<?, ?> flags = MutableMap.builder()
    -                .build();
    -        policy = addPolicy(PolicySpec.create(MemberTrackingPolicy.class)
    +        addPolicy(PolicySpec.create(MemberTrackingPolicy.class)
                     .displayName("Address tracker")
                     .configure("sensorsToTrack", ImmutableSet.of(getConfig(HOSTNAME_SENSOR)))
    -                .configure("group", entities));
    +                .configure("group", getEntities()));
    +    }
     
    -        // For any entities that have already come up
    -        for (Entity member : entities.getMembers()) {
    -            if (Strings.isNonBlank(member.getAttribute(getConfig(HOSTNAME_SENSOR))))
added(member); // Ignore, unless hostname set
    -        }
    +    @Override
    +    public void postStart() {
    +        update();
         }
     
         public static class MemberTrackingPolicy extends AbstractMembershipTrackingPolicy
{
             @Override
             protected void onEntityChange(Entity member) {
    -            // TODO Should we guard to only call if service_up and if hostname set?
    -            ((BindDnsServerImpl)entity).added(member);
    +            if (LOG.isTraceEnabled()) {
    +                LOG.trace("State of {} on change: {}", member, member.getAttribute(Attributes.SERVICE_STATE_ACTUAL).name());
    +            }
    +            ((BindDnsServerImpl) entity).update();
             }
             @Override
             protected void onEntityAdded(Entity member) {
    -            if (Strings.isNonBlank(member.getAttribute(getConfig(HOSTNAME_SENSOR))))
{
    -                ((BindDnsServerImpl)entity).added(member); // Ignore, unless hostname
set
    +            if (LOG.isTraceEnabled()) {
    +                LOG.trace("State of {} on added: {}", member, member.getAttribute(Attributes.SERVICE_STATE_ACTUAL).name());
                 }
    -        }
    -        @Override
    -        protected void onEntityRemoved(Entity member) {
    -            ((BindDnsServerImpl)entity).removed(member);
    +            ((BindDnsServerImpl) entity).configureResolver(member);
             }
         }
     
    -    @Override
    -    public void postStart() {
    -        update();
    +    private class HasHostnameAndValidLifecycle implements Predicate<Entity> {
    +        @Override
    +        public boolean apply(Entity input) {
    +            switch (input.getAttribute(Attributes.SERVICE_STATE_ACTUAL)) {
    +            case STOPPED:
    +            case STOPPING:
    +            case DESTROYED:
    +                return false;
    +            }
    +            return input.getAttribute(getConfig(HOSTNAME_SENSOR)) != null;
    +        }
         }
     
    -    public void added(Entity member) {
    -        synchronized (mutex) {
    -            Optional<Location> location = Iterables.tryFind(member.getLocations(),
Predicates.instanceOf(SshMachineLocation.class));
    -            String hostname = member.getAttribute(getConfig(HOSTNAME_SENSOR));
    -            if (location.isPresent() && Strings.isNonBlank(hostname)) {
    -                SshMachineLocation machine = (SshMachineLocation) location.get();
    -                String address = machine.getAddress().getHostAddress();
    -                if (!entityLocations.containsKey(machine)) {
    -                    entityLocations.put(machine, member);
    -                    addressMappings.putIfAbsent(address, hostname);
    +    public void update() {
    +        Lifecycle serverState = getAttribute(Attributes.SERVICE_STATE_ACTUAL);
    +        if (Lifecycle.STOPPED.equals(serverState) || Lifecycle.STOPPING.equals(serverState)
    +                || Lifecycle.DESTROYED.equals(serverState) || !getAttribute(Attributes.SERVICE_UP))
{
    +            LOG.debug("Skipped update of {} when service state is {} and running is {}",
    +                    new Object[]{this, getAttribute(Attributes.SERVICE_STATE_ACTUAL),
getAttribute(SERVICE_UP)});
    +            return;
    +        }
    +        synchronized (this) {
    +            Iterable<Entity> availableEntities = FluentIterable.from(getEntities().getMembers())
    +                    .filter(new HasHostnameAndValidLifecycle());
    +            LOG.debug("{} updating with entities: {}", this, Joiner.on(", ").join(availableEntities));
    +            ImmutableListMultimap<String, Entity> hostnameToEntity = Multimaps.index(availableEntities,
    +                    EntityFunctions.attribute(getConfig(HOSTNAME_SENSOR)));
    +            Map<String, String> octetToName = Maps.newHashMap();
    +            BiMap<String, String> ipToARecord = HashBiMap.create();
    +            Multimap<String, String> aRecordToCnames = MultimapBuilder.hashKeys().arrayListValues().build();
    +            Multimap<String, String> ipToAllNames = MultimapBuilder.hashKeys().arrayListValues().build();
    +
    +            for (Map.Entry<String, Entity> e : hostnameToEntity.entries()) {
    +                String domainName = e.getKey();
    +                Maybe<SshMachineLocation> location = Machines.findUniqueSshMachineLocation(e.getValue().getLocations());
    +                if (!location.isPresent()) {
    +                    LOG.debug("Member {} of {} does not have an SSH location so will
not be configured", e.getValue(), this);
    +                    continue;
    +                }
    +                String address = location.get().getAddress().getHostAddress();
    +                ipToAllNames.put(address, domainName);
    +                if (!ipToARecord.containsKey(address)) {
    +                    ipToARecord.put(address, domainName);
                         if (getReverseLookupNetwork().contains(new Cidr(address + "/32")))
{
                             String octet = Iterables.get(Splitter.on('.').split(address),
3);
    --- End diff --
    
    Maybe this should go in `Cidr` or `Networking` as a convenience?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message