lmccay commented on a change in pull request #307: KNOX-2304 - CM discovery cluster config monitor needs to be aware of … URL: https://github.com/apache/knox/pull/307#discussion_r405598727
########## File path: gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/monitor/PollingConfigurationAnalyzer.java ########## @@ -365,12 +375,32 @@ private DiscoveryApiClient getApiClient(final ServiceDiscoveryConfig discoveryCo clusterName, lastTimestamp); for (ApiEvent event : events) { - restartEvents.add(new RestartEvent(event)); + List<ApiEventAttribute> attributes = event.getAttributes(); + Map<String,Object> map = getAttributeMap(attributes); + addIfRelevantEvent(restartEvents, event, map); } return restartEvents; } + @SuppressWarnings("unchecked") + private void addIfRelevantEvent(List<RestartEvent> restartEvents, ApiEvent event, Map<String, Object> map) { + String command = null; + String status = null; + command = (String) ((List<String>) map.get(COMMAND)).get(0); + status = (String) ((List<String>) map.get(COMMAND_STATUS)).get(0); + if (START_COMMAND.equals(command) || RESTART_COMMAND.equals(command) && + SUCCEEDED_STATUS.equals(status) || STARTED_STATUS.equals(status)) { + restartEvents.add(new RestartEvent(event)); + } + } + + private Map<String, Object> getAttributeMap(List<ApiEventAttribute> attributes) { + Map<String,Object> map = new HashMap<>(); + attributes.forEach(attr -> { map.put(attr.getName(), attr.getValues());}); Review comment: Yes, the map is redone for each event purposely. It is only a map of the attributes for the given event. The order of the events hasn't changed as a result of this patch and is driven by the REST API response and has nothing to do with the creation of this map. It works as intended. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services