brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bostko <...@git.apache.org>
Subject [GitHub] brooklyn-server pull request #332: JcloudsLocation: Ability to supply extern...
Date Tue, 20 Sep 2016 15:06:07 GMT
Github user bostko commented on a diff in the pull request:

    https://github.com/apache/brooklyn-server/pull/332#discussion_r79633728
  
    --- Diff: locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
---
    @@ -2862,15 +2863,61 @@ protected String getFirstReachableAddress(NodeMetadata node, ConfigBag
setup) {
             String result;
             if (enabled) {
                 Duration timeout = "true".equals(pollForFirstReachable) ? Duration.FIVE_MINUTES
: Duration.of(pollForFirstReachable);
    -            result = JcloudsUtil.getFirstReachableAddress(node, timeout);
    -            LOG.debug("Using first-reachable address "+result+" for node "+node+" in
"+this);
    +
    +            Predicate<HostAndPort> pollForFirstReachableHostAndPortPredicate;
    +            if (setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE) != null) {
    +                LOG.debug("Using pollForFirstReachableAddress.predicate supplied from
config for location " + this + " "
    +                        + POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE.getName() + " :
" + setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE));
    +                pollForFirstReachableHostAndPortPredicate = setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE);
    +            } else {
    +                LOG.debug("Using pollForFirstReachableAddress.predicate.type supplied
from config for location " + this + " " + POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE_TYPE.getName()
    +                        + " : " + setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE_TYPE));
    +
    +                List<Constructor<?>> constructors = Arrays.asList(setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE_TYPE).getConstructors());
    +                Optional<Constructor<?>> emptyConstructor= Iterables.tryFind(constructors,
new Predicate<Constructor<?>>() {
    +                    @Override public boolean apply(Constructor<?> constructor)
{
    +                        return constructor.getParameterTypes().length == 0;
    +                    }
    +                });
    +                Optional<Constructor<?>> mapConstructor = Iterables.tryFind(constructors,
new Predicate<Constructor<?>>() {
    +                    @Override public boolean apply(Constructor<?> constructor)
{
    +                        if (constructor.getParameterTypes().length == 1) {
    +                            return constructor.getParameterTypes()[0].isAssignableFrom(Map.class);
    +                        } else {
    +                            return false;
    +                        }
    +                    }
    +                });
    +                if (mapConstructor.isPresent()) {
    +                    Map<String, Object> args = MutableMap.of();
    +                    ConfigUtils.addUnprefixedConfigKeyInConfigBack(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE.getName()
+ ".", setup, args);
    +                    try {
    +                        pollForFirstReachableHostAndPortPredicate = setup.get(POLL_FOR_FIRST_REACHABLE_ADDRESS_PREDICATE_TYPE).getConstructor(Map.class).newInstance(args);
    +                    } catch (ReflectiveOperationException e) {
    +                        throw Exceptions.propagate(e);
    +                    }
    +                } else {
    +                    try {
    +                        pollForFirstReachableHostAndPortPredicate = (Predicate<HostAndPort>)emptyConstructor.get().newInstance();
    +                    } catch (ReflectiveOperationException e) {
    +                        throw Exceptions.propagate(e);
    +                    }
    +                }
    --- End diff --
    
    NoSuchMethod exception is still being logged.
    Adding in the inner catch code like
    ```java
    if (NoSuchMethodException.class.isAssignableFrom(e.getCause().getClass())) {
      LOG.debug("No matching constructor", e);
    } 
    ```
    is too much I think.
    WDYT?


---
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