Handled different extension unique id

Signed-off-by: Owais Kazi <[email protected]>
opensearch-project · Jun 23, 2023 · f15e242 · f15e242
1 parent dd90ecc
commit f15e242
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/transport/TransportService.java b/server/src/main/java/org/opensearch/transport/TransportService.java
@@ -544,7 +544,8 @@ public ConnectionManager.ConnectionValidator connectionValidatorForExtensionConn
     ) {
         return (newConnection, actualProfile, listener) -> {
             // We don't validate cluster names to allow for CCS connections.
-            if (Strings.isNullOrEmpty(threadPool.getThreadContext().getHeader("extension_unique_id"))) {
+            String currentId = threadPool.getThreadContext().getHeader("extension_unique_id");
+            if (Strings.isNullOrEmpty(currentId) || !extensionUniqueId.equals(currentId)) {
                 threadPool.getThreadContext().putHeader("extension_unique_id", extensionUniqueId);
             }
             handshake(newConnection, actualProfile.getHandshakeTimeout().millis(), cn -> true, ActionListener.map(listener, resp -> {