[
https://issues.apache.org/jira/browse/KNOX-2304?focusedWorklogId=418776&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-418776
]
ASF GitHub Bot logged work on KNOX-2304:
----------------------------------------
Author: ASF GitHub Bot
Created on: 08/Apr/20 18:20
Start Date: 08/Apr/20 18:20
Worklog Time Spent: 10m
Work Description: pzampino commented on pull request #307: KNOX-2304 - CM
discovery cluster config monitor needs to be aware of …
URL: https://github.com/apache/knox/pull/307#discussion_r405723167
##########
File path:
gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/monitor/PollingConfigurationAnalyzer.java
##########
@@ -360,19 +370,43 @@ private DiscoveryApiClient getApiClient(final
ServiceDiscoveryConfig discoveryCo
// Record the new event query timestamp for this address/cluster
setEventQueryTimestamp(address, clusterName, Instant.now());
- // Query the event log from CM for service/cluster restart events
- List<ApiEvent> events =
queryRestartEvents(getApiClient(configCache.getDiscoveryConfig(address,
clusterName)),
+ // Query the event log from CM for service/cluster start events
+ List<ApiEvent> events =
queryEvents(getApiClient(configCache.getDiscoveryConfig(address, clusterName)),
clusterName,
lastTimestamp);
for (ApiEvent event : events) {
- restartEvents.add(new RestartEvent(event));
+ if(isRelevantEvent(event)) {
+ relevantEvents.add(new StartEvent(event));
+ }
+ }
+
+ return relevantEvents;
+ }
+
+ @SuppressWarnings("unchecked")
+ private boolean isRelevantEvent(ApiEvent event) {
+ boolean rc = false;
+ String command = null;
+ String status = null;
+ List<ApiEventAttribute> attributes = event.getAttributes();
+ Map<String,Object> map = getAttributeMap(attributes);
+ 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)) {
Review comment:
IIRC, && does have a higher precedence than ||, which could mean the default
grouping is `START_COMMAND.equals(command) || (RESTART_COMMAND.equals(command)
&&
SUCCEEDED_STATUS.equals(status)) || STARTED_STATUS.equals(status)`,
which probably still works in this case
----------------------------------------------------------------
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
Issue Time Tracking
-------------------
Worklog Id: (was: 418776)
Time Spent: 2.5h (was: 2h 20m)
> CM discovery - cluster config monitor needs to be aware of all relevant CM
> event types
> --------------------------------------------------------------------------------------
>
> Key: KNOX-2304
> URL: https://issues.apache.org/jira/browse/KNOX-2304
> Project: Apache Knox
> Issue Type: Bug
> Components: cm-discovery
> Affects Versions: 1.4.0
> Reporter: Philip Zampino
> Assignee: Philip Zampino
> Priority: Major
> Fix For: 1.4.0
>
> Time Spent: 2.5h
> Remaining Estimate: 0h
>
> The CM cluster config monitor currently only polls for restart events. There
> are other event types (e.g., start) that should trigger the configuration
> analysis and subsequently trigger re-discovery.
> Need to determine the full set of event types that apply, and update the
> polling query.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
