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 ] Adds HttpPort setting to ExtensionInitializationRequest #7770

Closed
wants to merge 1 commit into from
Closed

[Extensions ] Adds HttpPort setting to ExtensionInitializationRequest #7770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions server/src/main/java/org/opensearch/discovery/InitializeExtensionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,27 @@
public class InitializeExtensionRequest extends TransportRequest {
private final DiscoveryNode sourceNode;
private final DiscoveryExtensionNode extension;
private final String httpPort;

public InitializeExtensionRequest(DiscoveryNode sourceNode, DiscoveryExtensionNode extension) {
public InitializeExtensionRequest(DiscoveryNode sourceNode, DiscoveryExtensionNode extension, String httpPort) {
this.sourceNode = sourceNode;
this.extension = extension;
this.httpPort = httpPort;
}

public InitializeExtensionRequest(StreamInput in) throws IOException {
super(in);
sourceNode = new DiscoveryNode(in);
extension = new DiscoveryExtensionNode(in);
httpPort = in.readString();
}

@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
sourceNode.writeTo(out);
extension.writeTo(out);
out.writeString(httpPort);
}

public DiscoveryNode getSourceNode() {
Expand All @@ -52,21 +56,27 @@ public DiscoveryExtensionNode getExtension() {
return extension;
}

public String getHttpPort() {
return httpPort;
}

@Override
public String toString() {
return "InitializeExtensionsRequest{" + "sourceNode=" + sourceNode + ", extension=" + extension + '}';
return "InitializeExtensionsRequest{" + "sourceNode=" + sourceNode + ", extension=" + extension + ", httpPort=" + httpPort + '}';
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
InitializeExtensionRequest that = (InitializeExtensionRequest) o;
return Objects.equals(sourceNode, that.sourceNode) && Objects.equals(extension, that.extension);
return Objects.equals(sourceNode, that.sourceNode)
&& Objects.equals(extension, that.extension)
&& Objects.equals(httpPort, that.httpPort);
}

@Override
public int hashCode() {
return Objects.hash(sourceNode, extension);
return Objects.hash(sourceNode, extension, httpPort);
}
}
4 changes: 3 additions & 1 deletion server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,13 @@ public String executor() {
};
try {
logger.info("Sending extension request type: " + REQUEST_EXTENSION_ACTION_NAME);
// Defaults httpPort to 9200 if not set via opensearch.yml configuration
String httpPort = environmentSettings.get("http.port") != null ? environmentSettings.get("http.port") : "9200";
transportService.connectToExtensionNode(extension);
transportService.sendRequest(
extension,
REQUEST_EXTENSION_ACTION_NAME,
new InitializeExtensionRequest(transportService.getLocalNode(), extension),
new InitializeExtensionRequest(transportService.getLocalNode(), extension, httpPort),
initializeExtensionResponseHandler
);
inProgressFuture.orTimeout(EXTENSION_REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS).join();
Expand Down
9 changes: 8 additions & 1 deletion server/src/test/java/org/opensearch/discovery/InitializeExtensionRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class InitializeExtensionRequestTests extends OpenSearchTestCase {

public void testInitializeExtensionRequest() throws Exception {
String expectedUniqueId = "test uniqueid";
String expectedHttpPort = "test httpPort";
Version expectedVersion = Version.fromString("2.0.0");
ExtensionDependency expectedDependency = new ExtensionDependency(expectedUniqueId, expectedVersion);
DiscoveryExtensionNode expectedExtensionNode = new DiscoveryExtensionNode(
Expand All @@ -46,9 +47,14 @@ public void testInitializeExtensionRequest() throws Exception {
Version.CURRENT
);

InitializeExtensionRequest initializeExtensionRequest = new InitializeExtensionRequest(expectedSourceNode, expectedExtensionNode);
InitializeExtensionRequest initializeExtensionRequest = new InitializeExtensionRequest(
expectedSourceNode,
expectedExtensionNode,
expectedHttpPort
);
assertEquals(expectedExtensionNode, initializeExtensionRequest.getExtension());
assertEquals(expectedSourceNode, initializeExtensionRequest.getSourceNode());
assertEquals(expectedHttpPort, initializeExtensionRequest.getHttpPort());

try (BytesStreamOutput out = new BytesStreamOutput()) {
initializeExtensionRequest.writeTo(out);
Expand All @@ -58,6 +64,7 @@ public void testInitializeExtensionRequest() throws Exception {

assertEquals(expectedExtensionNode, initializeExtensionRequest.getExtension());
assertEquals(expectedSourceNode, initializeExtensionRequest.getSourceNode());
assertEquals(expectedHttpPort, initializeExtensionRequest.getHttpPort());
}
}
}
Expand Down