This is an automated email from the ASF dual-hosted git repository. smolnar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push: new 55af417 KNOX-2353 - Disabled CM descriptor monitoring and advanced service discovery changes monitoring by default (#322) 55af417 is described below commit 55af417331cab572203df9a0d2933a954609096d Author: Sandor Molnar <smol...@apache.org> AuthorDate: Wed Apr 22 14:01:57 2020 +0200 KNOX-2353 - Disabled CM descriptor monitoring and advanced service discovery changes monitoring by default (#322) --- .../org/apache/knox/gateway/ClouderaManagerIntegrationMessages.java | 3 +++ .../gateway/cm/descriptor/ClouderaManagerDescriptorMonitor.java | 2 ++ .../advanced/AdvanceServiceDiscoveryConfigurationMessages.java | 3 +++ .../advanced/AdvancedServiceDiscoveryConfigurationMonitor.java | 2 ++ .../java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java | 6 ++---- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/ClouderaManagerIntegrationMessages.java b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/ClouderaManagerIntegrationMessages.java index 747d48b..697e0ea 100644 --- a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/ClouderaManagerIntegrationMessages.java +++ b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/ClouderaManagerIntegrationMessages.java @@ -27,6 +27,9 @@ public interface ClouderaManagerIntegrationMessages { @Message(level = MessageLevel.INFO, text = "Monitoring Cloudera Manager descriptors in {0} ...") void monitoringClouderaManagerDescriptor(String path); + @Message(level = MessageLevel.INFO, text = "Monitoring Cloudera Manager descriptors is disabled.") + void disableMonitoringClouderaManagerDescriptor(); + @Message(level = MessageLevel.INFO, text = "Parsing Cloudera Manager descriptor {0}. Looking up {1}...") void parseClouderaManagerDescriptor(String path, String topologyName); diff --git a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/cm/descriptor/ClouderaManagerDescriptorMonitor.java b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/cm/descriptor/ClouderaManagerDescriptorMonitor.java index fc498a7..15f74af 100644 --- a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/cm/descriptor/ClouderaManagerDescriptorMonitor.java +++ b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/cm/descriptor/ClouderaManagerDescriptorMonitor.java @@ -64,6 +64,8 @@ public class ClouderaManagerDescriptorMonitor implements AdvancedServiceDiscover final ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(new BasicThreadFactory.Builder().namingPattern("ClouderaManagerDescriptorMonitor-%d").build()); executorService.scheduleAtFixedRate(() -> monitorClouderaManagerDescriptors(null), 0, monitoringInterval, TimeUnit.MILLISECONDS); LOG.monitoringClouderaManagerDescriptor(descriptorsDir); + } else { + LOG.disableMonitoringClouderaManagerDescriptor(); } } diff --git a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java index cc55f28..85e9b40 100644 --- a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java +++ b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java @@ -27,6 +27,9 @@ public interface AdvanceServiceDiscoveryConfigurationMessages { @Message(level = MessageLevel.INFO, text = "Monitoring {0}/{1}* for advanced service discovery configuration changes.") void monitorStarted(String directory, String prefix); + @Message(level = MessageLevel.INFO, text = "Monitoring advanced service discovery configuration changes is disabled.") + void disableMonitoring(); + @Message(level = MessageLevel.ERROR, text = "Error while monitoring CM advanced configuration: {1}") void failedToMonitorClouderaManagerAdvancedConfiguration(String errorMessage, @StackTrace(level = MessageLevel.DEBUG) Exception e); diff --git a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigurationMonitor.java b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigurationMonitor.java index 0488fc6..c314a4d 100644 --- a/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigurationMonitor.java +++ b/gateway-cm-integration/src/main/java/org/apache/knox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigurationMonitor.java @@ -71,6 +71,8 @@ public class AdvancedServiceDiscoveryConfigurationMonitor { final ScheduledExecutorService executorService = newSingleThreadScheduledExecutor(new BasicThreadFactory.Builder().namingPattern("AdvancedServiceDiscoveryConfigurationMonitor-%d").build()); executorService.scheduleAtFixedRate(() -> monitorAdvancedServiceConfigurations(), 0, monitoringInterval, TimeUnit.MILLISECONDS); LOG.monitorStarted(gatewayConfigurationDir, ADVANCED_CONFIGURATION_FILE_NAME_PREFIX); + } else { + LOG.disableMonitoring(); } } diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java index 60f0a01..951d8d4 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/config/impl/GatewayConfigImpl.java @@ -243,9 +243,7 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig { private static final String TOKEN_STATE_SERVER_MANAGED = GATEWAY_CONFIG_FILE_PREFIX + ".knox.token.exp.server-managed"; private static final String CLOUDERA_MANAGER_DESCRIPTORS_MONITOR_INTERVAL = GATEWAY_CONFIG_FILE_PREFIX + ".cloudera.manager.descriptors.monitor.interval"; - private static final long DEFAULT_CLOUDERA_MANAGER_DESCRIPTORS_MONITOR_INTERVAL = 30000L; private static final String CLOUDERA_MANAGER_ADVANCED_SERVICE_DISCOVERY_CONF_MONITOR_INTERVAL = GATEWAY_CONFIG_FILE_PREFIX + ".cloudera.manager.advanced.service.discovery.config.monitor.interval"; - private static final long DEFAULT_CLOUDERA_MANAGER_ADVANCED_SERVICE_DISCOVERY_CONF_MONITOR_INTERVAL = 30000L; private static final String KNOX_TOKEN_EVICTION_INTERVAL = GATEWAY_CONFIG_FILE_PREFIX + ".knox.token.eviction.interval"; private static final String KNOX_TOKEN_EVICTION_GRACE_PERIOD = GATEWAY_CONFIG_FILE_PREFIX + ".knox.token.eviction.grace.period"; @@ -1114,12 +1112,12 @@ public class GatewayConfigImpl extends Configuration implements GatewayConfig { @Override public long getClouderaManagerDescriptorsMonitoringInterval() { - return getLong(CLOUDERA_MANAGER_DESCRIPTORS_MONITOR_INTERVAL, DEFAULT_CLOUDERA_MANAGER_DESCRIPTORS_MONITOR_INTERVAL); + return getLong(CLOUDERA_MANAGER_DESCRIPTORS_MONITOR_INTERVAL, -1L); } @Override public long getClouderaManagerAdvancedServiceDiscoveryConfigurationMonitoringInterval() { - return getLong(CLOUDERA_MANAGER_ADVANCED_SERVICE_DISCOVERY_CONF_MONITOR_INTERVAL, DEFAULT_CLOUDERA_MANAGER_ADVANCED_SERVICE_DISCOVERY_CONF_MONITOR_INTERVAL); + return getLong(CLOUDERA_MANAGER_ADVANCED_SERVICE_DISCOVERY_CONF_MONITOR_INTERVAL, -1L); } @Override