[DT-2541] Support Elasticsearch 5 and OpenSearch 3 simultaneously #2765
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package org.broadinstitute.consent.http.configurations; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| import jakarta.validation.constraints.NotNull; | ||
| import java.util.List; | ||
|
|
||
| @JsonIgnoreProperties(ignoreUnknown = true) | ||
| public class OpenSearchConfiguration { | ||
|
|
||
| @NotNull private String indexName; | ||
|
|
||
| @NotNull private List<String> servers; | ||
|
|
||
| @NotNull private String datasetIndexName; | ||
|
|
||
| /** This is configurable for testing purposes */ | ||
| private int port = 9201; | ||
|
|
||
| public List<String> getServers() { | ||
| return servers; | ||
| } | ||
|
|
||
| public void setServers(List<String> servers) { | ||
| this.servers = servers; | ||
| } | ||
|
|
||
| public String getIndexName() { | ||
| return indexName; | ||
| } | ||
|
|
||
| public void setIndexName(String indexName) { | ||
| this.indexName = indexName; | ||
| } | ||
|
|
||
| public int getPort() { | ||
| return port; | ||
| } | ||
|
|
||
| public void setPort(int port) { | ||
| this.port = port; | ||
| } | ||
|
|
||
| public String getDatasetIndexName() { | ||
| return datasetIndexName; | ||
| } | ||
|
|
||
| public void setDatasetIndexName(String datasetIndexName) { | ||
| this.datasetIndexName = datasetIndexName; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package org.broadinstitute.consent.http.health; | ||
|
|
||
| import static org.broadinstitute.consent.http.service.ontology.OpenSearchSupport.jsonHeader; | ||
|
|
||
| import com.codahale.metrics.health.HealthCheck; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.JsonParser; | ||
| import com.google.inject.Inject; | ||
| import io.dropwizard.lifecycle.Managed; | ||
| import java.io.IOException; | ||
| import java.nio.charset.Charset; | ||
| import org.apache.commons.io.IOUtils; | ||
| import org.broadinstitute.consent.http.configurations.OpenSearchConfiguration; | ||
| import org.broadinstitute.consent.http.service.ontology.OpenSearchSupport; | ||
| import org.opensearch.client.Request; | ||
| import org.opensearch.client.RequestOptions; | ||
| import org.opensearch.client.Response; | ||
| import org.opensearch.client.RestClient; | ||
|
|
||
| public class OpenSearchHealthCheck extends HealthCheck implements Managed { | ||
|
|
||
| private final RestClient client; | ||
|
|
||
| @Override | ||
| public void start() throws Exception {} | ||
|
Check failure on line 25 in src/main/java/org/broadinstitute/consent/http/health/OpenSearchHealthCheck.java
|
||
|
|
||
| @Override | ||
| public void stop() throws Exception { | ||
| if (client != null) { | ||
| client.close(); | ||
| } | ||
| } | ||
|
|
||
| @Inject | ||
| public OpenSearchHealthCheck(OpenSearchConfiguration config) { | ||
| this.client = OpenSearchSupport.createRestClient(config); | ||
| } | ||
|
|
||
| @Override | ||
| protected Result check() throws Exception { | ||
| try { | ||
| RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder(); | ||
| builder.addHeader(jsonHeader.getName(), jsonHeader.getValue()); | ||
| Request request = new Request("GET", OpenSearchSupport.getClusterHealthPath()); | ||
| request.setOptions(builder.build()); | ||
| Response esResponse = client.performRequest(request); | ||
| if (esResponse.getStatusLine().getStatusCode() != 200) { | ||
| return Result.unhealthy( | ||
| "Invalid health check request: " + esResponse.getStatusLine().getReasonPhrase()); | ||
| } | ||
| String stringResponse = | ||
| IOUtils.toString(esResponse.getEntity().getContent(), Charset.defaultCharset()); | ||
| JsonObject jsonResponse = JsonParser.parseString(stringResponse).getAsJsonObject(); | ||
| String status = jsonResponse.get("status").getAsString(); | ||
| if (status.equalsIgnoreCase("red")) { | ||
| return Result.unhealthy("ClusterHealth is RED\n" + jsonResponse); | ||
| } | ||
| if (status.equalsIgnoreCase("yellow")) { | ||
| return Result.healthy("ClusterHealth is YELLOW\n" + jsonResponse); | ||
| } | ||
| } catch (IOException e) { | ||
| return Result.unhealthy("Unable to connect to OpenSearch"); | ||
| } | ||
| return Result.healthy("ClusterHealth is GREEN"); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we are staging the OpenSearch rollout over time and we don't have values for production, this will likely cause the app to fail on startup.