[knox] branch master updated: KNOX-2949 - Topology file is not deleted after deleting descriptor via hadoop xml resource (#785)

[amagyar]

This is an automated email from the ASF dual-hosted git repository.

amagyar 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 7d18bc4fa KNOX-2949 - Topology file is not deleted after deleting 
descriptor via hadoop xml resource (#785)
7d18bc4fa is described below

commit 7d18bc4fad938aee6fca4d114ce15e21dbaa8874
Author: Attila Magyar <m.magy...@gmail.com>
AuthorDate: Thu Aug 17 11:01:17 2023 +0200

    KNOX-2949 - Topology file is not deleted after deleting descriptor via 
hadoop xml resource (#785)
---
 .../knox/gateway/topology/hadoop/xml/HadoopXmlResourceMonitor.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceMonitor.java
 
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceMonitor.java
index 79c494e15..be5a40516 100644
--- 
a/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceMonitor.java
+++ 
b/gateway-topology-hadoop-xml/src/main/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceMonitor.java
@@ -54,6 +54,7 @@ public class HadoopXmlResourceMonitor implements 
AdvancedServiceDiscoveryConfigC
   private static final HadoopXmlResourceMessages LOG = 
MessagesFactory.get(HadoopXmlResourceMessages.class);
   private final String sharedProvidersDir;
   private final String descriptorsDir;
+  private final String topologyDir;
   private final long monitoringInterval;
   private final HadoopXmlResourceParser hadoopXmlResourceParser;
   private final Map<Path, FileTime> lastReloadTimes;
@@ -63,6 +64,7 @@ public class HadoopXmlResourceMonitor implements 
AdvancedServiceDiscoveryConfigC
     this.hadoopXmlResourceParser = hadoopXmlResourceParser;
     this.sharedProvidersDir = gatewayConfig.getGatewayProvidersConfigDir();
     this.descriptorsDir = gatewayConfig.getGatewayDescriptorsDir();
+    this.topologyDir = gatewayConfig.getGatewayTopologyDir();
     this.monitoringInterval = 
gatewayConfig.getClouderaManagerDescriptorsMonitoringInterval();
     this.lastReloadTimes = new ConcurrentHashMap<>();
   }
@@ -109,6 +111,7 @@ public class HadoopXmlResourceMonitor implements 
AdvancedServiceDiscoveryConfigC
     final HadoopXmlResourceParserResult result = 
hadoopXmlResourceParser.parse(descriptorFilePath);
     processSharedProviders(result);
     processDescriptors(result);
+    processDeleted(topologyDir, result.getDeletedDescriptors(), ".xml");
     processDeleted(descriptorsDir, result.getDeletedDescriptors(), ".json");
     processDeleted(sharedProvidersDir, result.getDeletedProviders(), ".json");
   }