Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KNOX-2956 - Removing CM-specific 'advanced service discovery' handler and have everything process by the HXR parser #821

Merged
merged 1 commit into from
Dec 12, 2023
+96 −448
Merged

KNOX-2956 - Removing CM-specific 'advanced service discovery' handler and have everything process by the HXR parser #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions gateway-server/src/main/java/org/apache/knox/gateway/GatewayServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import org.apache.knox.gateway.topology.Topology;
import org.apache.knox.gateway.topology.TopologyEvent;
import org.apache.knox.gateway.topology.TopologyListener;
import org.apache.knox.gateway.topology.discovery.advanced.AdvancedServiceDiscoveryConfigurationMonitor;
import org.apache.knox.gateway.topology.hadoop.xml.HadoopXmlResourceMonitor;
import org.apache.knox.gateway.topology.hadoop.xml.HadoopXmlResourceParser;
import org.apache.knox.gateway.trace.AccessHandler;
Expand Down Expand Up @@ -719,10 +718,6 @@ public void run() {
private void handleHadoopXmlResources() {
final HadoopXmlResourceParser hadoopXmlResourceParser = new HadoopXmlResourceParser(config);
final HadoopXmlResourceMonitor hadoopXmlResourceMonitor = new HadoopXmlResourceMonitor(config, hadoopXmlResourceParser);
final AdvancedServiceDiscoveryConfigurationMonitor advancedServiceDiscoveryConfigurationMonitor = new AdvancedServiceDiscoveryConfigurationMonitor(config);
advancedServiceDiscoveryConfigurationMonitor.registerListener(hadoopXmlResourceParser);
advancedServiceDiscoveryConfigurationMonitor.registerListener(hadoopXmlResourceMonitor);
advancedServiceDiscoveryConfigurationMonitor.init();
hadoopXmlResourceMonitor.setupMonitor();
}

Expand Down
39 changes: 0 additions & 39 deletions ...nox/gateway/topology/discovery/advanced/AdvanceServiceDiscoveryConfigurationMessages.java
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions ...a/org/apache/knox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfig.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions ...nox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigChangeListener.java
View file
Open in desktop

This file was deleted.

116 changes: 0 additions & 116 deletions ...nox/gateway/topology/discovery/advanced/AdvancedServiceDiscoveryConfigurationMonitor.java
View file
Open in desktop

This file was deleted.

11 changes: 4 additions & 7 deletions .../src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ public interface HadoopXmlResourceMessages {
@Message(level = MessageLevel.ERROR, text = "Parsing XML configuration {0} failed: {1}")
void failedToParseXmlConfiguration(String path, String errorMessage, @StackTrace(level = MessageLevel.DEBUG) Exception e);

@Message(level = MessageLevel.DEBUG, text = "Processing Hadoop XML resource {0} (force = {1}; lastReloadTime = {2}; lastModified = {3})")
void processHadoopXmlResource(String descriptorPath, boolean force, FileTime lastReloadTime, FileTime lastModifiedTime);
@Message(level = MessageLevel.DEBUG, text = "Processing Hadoop XML resource {0} (lastReloadTime = {1}; lastModified = {2})")
void processHadoopXmlResource(String descriptorPath, FileTime lastReloadTime, FileTime lastModifiedTime);

@Message(level = MessageLevel.DEBUG, text = "Skipping Hadoop XML resource monitoring of {0} (force = {1}; lastReloadTime = {2}; lastModified = {3})")
void skipMonitorHadoopXmlResource(String descriptorPath, boolean force, FileTime lastReloadTime, FileTime lastModifiedTime);
@Message(level = MessageLevel.DEBUG, text = "Skipping Hadoop XML resource monitoring of {0} (lastReloadTime = {1}; lastModified = {2})")
void skipMonitorHadoopXmlResource(String descriptorPath, FileTime lastReloadTime, FileTime lastModifiedTime);

@Message(level = MessageLevel.ERROR, text = "Error while monitoring Hadoop style XML configuration {0}: {1}")
void failedToMonitorHadoopXmlResource(String descriptorPath, String errorMessage, @StackTrace(level = MessageLevel.DEBUG) Exception e);
Expand All @@ -71,9 +71,6 @@ public interface HadoopXmlResourceMessages {
@Message(level = MessageLevel.ERROR, text = "Error while producing Knox provider: {0}")
void failedToProduceKnoxProvider(String errorMessage, @StackTrace(level = MessageLevel.DEBUG) Exception e);

@Message(level = MessageLevel.WARN, text = "Service {0} is disabled. It will NOT be added in {1}")
void serviceDisabled(String serviceName, String descriptorName);

@Message(level = MessageLevel.INFO, text = "Updated advanced service discovery configuration for {0}.")
void updatedAdvanceServiceDiscoverytConfiguration(String topologyName);

Expand Down
Loading
Loading