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

[Extensions] Fixed duplicate extension unique id #8228

Merged
merged 2 commits into from
Jun 23, 2023
Merged

[Extensions] Fixed duplicate extension unique id #8228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd90ecc
Fixes duplicate extension unique id
owaiskazi19 Jun 22, 2023
f15e242
Handled different extension unique id
owaiskazi19 Jun 23, 2023
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: 4 additions & 1 deletion server/src/main/java/org/opensearch/transport/TransportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,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);
owaiskazi19 marked this conversation as resolved.
Show resolved Hide resolved
}
handshake(newConnection, actualProfile.getHandshakeTimeout().millis(), cn -> true, ActionListener.map(listener, resp -> {
final DiscoveryNode remote = resp.discoveryNode;

Expand Down