[Extensions] Fixed duplicate extension unique id (opensearch-project#…

…8228) (opensearch-project#8240) * Fixes duplicate extension unique id * Handled different extension unique id --------- (cherry picked from commit f21d73e) Signed-off-by: Owais Kazi <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dreamer-89 · Jun 23, 2023 · 8769720 · 8769720
1 parent 79bf769
commit 8769720
Showing 1 changed file with 4 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
@@ -533,7 +533,10 @@ public ConnectionManager.ConnectionValidator connectionValidatorForExtensionConn
     ) {
         return (newConnection, actualProfile, listener) -> {
             // We don't validate cluster names to allow for CCS connections.
-            threadPool.getThreadContext().putHeader("extension_unique_id", extensionUniqueId);
+            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 -> {
                 final DiscoveryNode remote = resp.discoveryNode;