Add 2.9 release notes and fix complitation issues (#307)

Signed-off-by: Rishav Sagar <[email protected]> Co-authored-by: Rishav Sagar <[email protected]>
opensearch-project · Jul 11, 2023 · 68e7110 · 68e7110
1 parent 8945588
commit 68e7110
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 20 deletions.
diff --git a/release-notes/opensearch-asynchronous-search.release-notes-2.9.0.0.md b/release-notes/opensearch-asynchronous-search.release-notes-2.9.0.0.md
@@ -0,0 +1,6 @@
+## Version 2.9.0.0 2023-07-18
+
+Compatible with OpenSearch 2.9.0
+
+### Maintenance
+* Increment version to 2.9.0 ([300](https://github.com/opensearch-project/asynchronous-search/pull/300))
diff --git a/...nsearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceContext.java b/...nsearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceContext.java
@@ -12,7 +12,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.opensearch.Version;
 import org.opensearch.action.search.SearchResponse;
 import org.opensearch.common.bytes.BytesReference;
 import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
@@ -82,7 +81,7 @@ public SearchResponse getSearchResponse() {
                             asynchronousSearchPersistenceModel.getResponse())));
             try (NamedWriteableAwareStreamInput wrapperStreamInput = new NamedWriteableAwareStreamInput(bytesReference.streamInput(),
                     namedWriteableRegistry)) {
-                wrapperStreamInput.setVersion(Version.readVersion(wrapperStreamInput));
+                wrapperStreamInput.setVersion(wrapperStreamInput.readVersion());
                 return new SearchResponse(wrapperStreamInput);
             } catch (IOException e) {
                 logger.error(() -> new ParameterizedMessage("Failed to parse search response for asynchronous search [{}] Response : [{}] ",
@@ -102,7 +101,7 @@ public Exception getSearchError() {
                         .decode(asynchronousSearchPersistenceModel.getError())));
         try (NamedWriteableAwareStreamInput wrapperStreamInput = new NamedWriteableAwareStreamInput(bytesReference.streamInput(),
                 namedWriteableRegistry)) {
-            wrapperStreamInput.setVersion(Version.readVersion(wrapperStreamInput));
+            wrapperStreamInput.setVersion(wrapperStreamInput.readVersion());
             return wrapperStreamInput.readException();
         } catch (IOException e) {
             logger.error(() -> new ParameterizedMessage("Failed to parse search error for asynchronous search [{}] Error : [{}] ",

diff --git a/...pensearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceModel.java b/...pensearch/search/asynchronous/context/persistence/AsynchronousSearchPersistenceModel.java
@@ -48,7 +48,7 @@ private String serializeResponse(SearchResponse response) throws IOException {
             return null;
         }
         try (BytesStreamOutput out = new BytesStreamOutput()) {
-            Version.writeVersion(Version.CURRENT, out);
+            out.writeVersion(Version.CURRENT);
             response.writeTo(out);
             byte[] bytes = BytesReference.toBytes(out.bytes());
             return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);
@@ -68,7 +68,7 @@ private String serializeError(Exception error) throws IOException {
             return null;
         }
         try (BytesStreamOutput out = new BytesStreamOutput()) {
-            Version.writeVersion(Version.CURRENT, out);
+            out.writeVersion(Version.CURRENT);
             out.writeException(error instanceof OpenSearchException ? error : new OpenSearchException(error));
             byte[] bytes = BytesReference.toBytes(out.bytes());
             return Base64.getUrlEncoder().withoutPadding().encodeToString(bytes);

diff --git a/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java b/...va/org/opensearch/search/asynchronous/management/AsynchronousSearchManagementService.java
@@ -23,7 +23,6 @@
 import org.opensearch.cluster.node.DiscoveryNode;
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.Randomness;
-import org.opensearch.common.collect.ImmutableOpenMap;
 import org.opensearch.common.component.AbstractLifecycleComponent;
 import org.opensearch.common.inject.Inject;
 import org.opensearch.common.io.stream.StreamInput;
@@ -46,6 +45,7 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
@@ -196,8 +196,8 @@ public final void performCleanUp() {
         try (ThreadContext.StoredContext ignore = threadContext.stashContext()) {
             // we have to execute under the system context so that if security is enabled the sync is authorized
             threadContext.markAsSystemContext();
-            ImmutableOpenMap<String, DiscoveryNode> dataNodes = clusterService.state().nodes().getDataNodes();
-            List<DiscoveryNode> nodes = Stream.of(dataNodes.values().toArray(DiscoveryNode.class))
+            final Map<String, DiscoveryNode> dataNodes = clusterService.state().nodes().getDataNodes();
+            List<DiscoveryNode> nodes = Stream.of(dataNodes.values().toArray(new DiscoveryNode[0]))
                     .collect(Collectors.toList());
             if (nodes == null || nodes.isEmpty()) {
                 logger.debug("Found empty data nodes with asynchronous search enabled attribute [{}] for response clean up", dataNodes);

diff --git a/...main/java/org/opensearch/search/asynchronous/request/SubmitAsynchronousSearchRequest.java b/...main/java/org/opensearch/search/asynchronous/request/SubmitAsynchronousSearchRequest.java
@@ -10,7 +10,7 @@
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
 import org.opensearch.common.unit.TimeValue;

diff --git a/src/main/java/org/opensearch/search/asynchronous/rest/RestAsynchronousSearchStatsAction.java b/src/main/java/org/opensearch/search/asynchronous/rest/RestAsynchronousSearchStatsAction.java
@@ -10,7 +10,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.client.node.NodeClient;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.rest.BaseRestHandler;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.rest.action.RestActions;

diff --git a/src/main/java/org/opensearch/search/asynchronous/task/AsynchronousSearchTask.java b/src/main/java/org/opensearch/search/asynchronous/task/AsynchronousSearchTask.java
@@ -11,7 +11,7 @@
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.search.SearchRequest;
 import org.opensearch.action.search.SearchTask;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.tasks.TaskId;
 
 import java.util.Map;

diff --git a/src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchStatsIT.java b/src/test/java/org/opensearch/search/asynchronous/integTests/AsynchronousSearchStatsIT.java
@@ -67,8 +67,8 @@ public void testNodewiseStats() throws InterruptedException {
         submitAsynchronousSearchRequest.waitForCompletionTimeout(TimeValue.timeValueSeconds(2));
         submitAsynchronousSearchRequest.keepOnCompletion(true);
         List<DiscoveryNode> dataNodes = new LinkedList<>();
-        clusterService().state().nodes().getDataNodes().iterator().forEachRemaining(node -> {
-            dataNodes.add(node.value);
+        clusterService().state().nodes().getDataNodes().values().iterator().forEachRemaining(node -> {
+            dataNodes.add(node);
         });
         assertFalse(dataNodes.isEmpty());
         DiscoveryNode randomDataNode = dataNodes.get(randomInt(dataNodes.size() - 1));
@@ -118,8 +118,8 @@ public void testStatsAcrossNodes() throws InterruptedException, ExecutionExcepti
                     client().prepareIndex(index).setId("3").setSource("field1", "quick"));
 
             List<DiscoveryNode> dataNodes = new LinkedList<>();
-            clusterService().state().nodes().getDataNodes().iterator().forEachRemaining(node -> {
-                dataNodes.add(node.value);
+            clusterService().state().nodes().getDataNodes().values().iterator().forEachRemaining(node -> {
+                dataNodes.add(node);
             });
             assertFalse(dataNodes.isEmpty());
             int numThreads = 20;
@@ -243,8 +243,8 @@ public void testThrottledAsynchronousSearchCount() throws InterruptedException,
                 client().prepareIndex(index).setId("3").setSource("field1", "quick"));
 
         List<DiscoveryNode> dataNodes = new LinkedList<>();
-        clusterService().state().nodes().getDataNodes().iterator().forEachRemaining(node -> {
-            dataNodes.add(node.value);
+        clusterService().state().nodes().getDataNodes().values().iterator().forEachRemaining(node -> {
+            dataNodes.add(node);
         });
         assertFalse(dataNodes.isEmpty());
         DiscoveryNode randomDataNode = dataNodes.get(randomInt(dataNodes.size() - 1));

diff --git a/src/test/java/org/opensearch/search/asynchronous/restIT/AsynchronousSearchRestTestCase.java b/src/test/java/org/opensearch/search/asynchronous/restIT/AsynchronousSearchRestTestCase.java
@@ -25,7 +25,7 @@
 import org.opensearch.client.ResponseException;
 import org.opensearch.common.CheckedFunction;
 import org.opensearch.common.Nullable;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.xcontent.DeprecationHandler;
 import org.opensearch.core.xcontent.NamedXContentRegistry;
@@ -222,7 +222,7 @@ protected void updateClusterSettings(String settingKey, Object value) throws Exc
                 .endObject()
                 .endObject();
         Request request = new Request("PUT", "_cluster/settings");
-        request.setJsonEntity(Strings.toString(builder));
+        request.setJsonEntity(org.opensearch.common.Strings.toString(builder));
         Response response = client().performRequest(request);
         assertEquals(RestStatus.OK, RestStatus.fromCode(response.getStatusLine().getStatusCode()));
     }

diff --git a/src/test/java/org/opensearch/search/asynchronous/utils/RestTestUtils.java b/src/test/java/org/opensearch/search/asynchronous/utils/RestTestUtils.java
@@ -25,7 +25,7 @@
 import org.opensearch.client.Request;
 import org.opensearch.cluster.health.ClusterHealthStatus;
 import org.opensearch.common.Priority;
-import org.opensearch.common.Strings;
+import org.opensearch.core.common.Strings;
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.lucene.uid.Versions;
 import org.opensearch.common.unit.TimeValue;