Merge pull request #6480 from luiseufrasio/FISH-7132-fix-jms-high-ava…

…ilability-deployment-groups FISH-7132 : config refs list being handled
payara · Nov 15, 2023 · 9b22bd2 · 9b22bd2
2 parents 7c5eff9 + a9f33a3
commit 9b22bd2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java b/nucleus/admin/config-api/src/main/java/org/glassfish/config/support/DomainXmlPreParser.java
@@ -89,6 +89,7 @@ private DomainXmlPreParserException(String s) {
     private List<ClusterData> clusters = new LinkedList<>();
     private List<DeploymentGroupData> deploymentGroups = new LinkedList<>();
     private List<String> configNames = new LinkedList<>();
+    private Map<String, String> mapServerConfig = new HashMap<>();
     private ClusterData cluster;
     private DeploymentGroupData deploymentGroup;
     private String instanceName;
@@ -150,6 +151,10 @@ final List<String> getDGServerNames() {
         return deploymentGroup.dgServerRefs;
     }
 
+    public Map<String, String> getMapServerConfig() {
+        return this.mapServerConfig;
+    }
+
     final String getConfigName() {
         if(!valid)
             return null;
@@ -275,9 +280,11 @@ private void handleServer() {
         String configRef = getConfigRef();
 
         printf("SERVER: " + name + ", ref= " + configRef);
+        mapServerConfig.put(name, configRef);
 
-        if (instanceName.equals(name))
+        if (instanceName.equals(name)) {
             serverConfigRef = configRef;
+        }
     }
 
     private void handleDeploymentGroups() throws XMLStreamException {

diff --git a/...eus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java b/...eus/admin/config-api/src/main/java/org/glassfish/config/support/InstanceReaderFilter.java
@@ -43,6 +43,8 @@
 
 import com.sun.enterprise.util.StringUtils;
 import java.net.*;
+import java.util.List;
+import java.util.Map;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -133,7 +135,16 @@ private boolean handleServer(XMLStreamReader r) {
     private boolean handleConfig(XMLStreamReader reader) {
         String name = reader.getAttributeValue(null, NAME);
 
-        return !dxpp.getConfigName().equals(name);
+        Map<String, String> mapServerConfig = dxpp.getMapServerConfig();
+        boolean isConfigFromServerInDG = false;
+        List<String> dgServerNames = dxpp.getDGServerNames();
+        for (String server : mapServerConfig.keySet()) {
+            if (dgServerNames.contains(server) && mapServerConfig.get(server).equals(name)) {
+                isConfigFromServerInDG = true;
+            }
+        }
+
+        return !(dxpp.getConfigName().equals(name) || isConfigFromServerInDG);
     }
 
     /**