Merge remote-tracking branch 'upstream/main' into manager-timeout-clu…

…ster-api Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Apr 4, 2022 · 58b30d4 · 58b30d4
2 parents 4ce930a + f9ca90e
commit 58b30d4
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 31 deletions.
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -39,4 +39,4 @@ BWC_VERSION:
   - "1.3.0"
   - "1.3.1"
   - "1.3.2"
-  - "1.4.0"
+  - "2.0.0"
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -1,4 +1,4 @@
-opensearch        = 2.0.0
+opensearch        = 2.1.0
 lucene            = 9.1.0
 
 bundled_jdk_vendor = adoptium

diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -64,7 +64,7 @@ dependencies {
   api 'com.google.protobuf:protobuf-java-util:3.19.3'
   api 'com.google.protobuf:protobuf-java:3.19.3'
   api 'com.google.code.gson:gson:2.9.0'
-  api 'com.google.api.grpc:proto-google-common-protos:1.16.0'
+  api 'com.google.api.grpc:proto-google-common-protos:2.8.0'
   api 'com.google.api.grpc:proto-google-iam-v1:0.12.0'
   api 'com.google.cloud:google-cloud-core-http:1.93.3'
   api 'com.google.auth:google-auth-library-credentials:0.20.0'

diff --git a/plugins/repository-gcs/licenses/proto-google-common-protos-1.16.0.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-common-protos-1.16.0.jar.sha1
diff --git a/plugins/repository-gcs/licenses/proto-google-common-protos-2.8.0.jar.sha1 b/plugins/repository-gcs/licenses/proto-google-common-protos-2.8.0.jar.sha1
@@ -0,0 +1 @@
+8adcbc3c5c3b1b7af1cf1e8a25af26a516d62a4c
diff --git a/server/src/main/java/org/opensearch/Version.java b/server/src/main/java/org/opensearch/Version.java
@@ -81,9 +81,9 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_1_3_0 = new Version(1030099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_1_3_1 = new Version(1030199, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_1_3_2 = new Version(1030299, org.apache.lucene.util.Version.LUCENE_8_10_1);
-    public static final Version V_1_4_0 = new Version(1040099, org.apache.lucene.util.Version.LUCENE_8_10_1);
     public static final Version V_2_0_0 = new Version(2000099, org.apache.lucene.util.Version.LUCENE_9_1_0);
-    public static final Version CURRENT = V_2_0_0;
+    public static final Version V_2_1_0 = new Version(2010099, org.apache.lucene.util.Version.LUCENE_9_1_0);
+    public static final Version CURRENT = V_2_1_0;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());

diff --git a/server/src/main/java/org/opensearch/index/get/ShardGetService.java b/server/src/main/java/org/opensearch/index/get/ShardGetService.java
@@ -216,25 +216,20 @@ private GetResult innerGet(
         fetchSourceContext = normalizeFetchSourceContent(fetchSourceContext, gFields);
 
         Term uidTerm = new Term(IdFieldMapper.NAME, Uid.encodeId(id));
-        Engine.GetResult get = indexShard.get(
-            new Engine.Get(realtime, true, id, uidTerm).version(version)
-                .versionType(versionType)
-                .setIfSeqNo(ifSeqNo)
-                .setIfPrimaryTerm(ifPrimaryTerm)
-        );
-        if (get.exists() == false) {
-            get.close();
-        }
-
-        if (get == null || get.exists() == false) {
-            return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
-        }
 
-        try {
+        try (
+            Engine.GetResult get = indexShard.get(
+                new Engine.Get(realtime, true, id, uidTerm).version(version)
+                    .versionType(versionType)
+                    .setIfSeqNo(ifSeqNo)
+                    .setIfPrimaryTerm(ifPrimaryTerm)
+            )
+        ) {
+            if (get == null || get.exists() == false) {
+                return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
+            }
             // break between having loaded it from translog (so we only have _source), and having a document to load
             return innerGetLoadFromStoredFields(id, gFields, fetchSourceContext, get, mapperService);
-        } finally {
-            get.close();
         }
     }
 

diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
@@ -348,11 +348,7 @@ protected Node(
             Settings tmpSettings = Settings.builder()
                 .put(initialEnvironment.settings())
                 .put(Client.CLIENT_TYPE_SETTING_S.getKey(), CLIENT_TYPE)
-                .build();
-
-            // Enabling shard indexing backpressure node-attribute
-            tmpSettings = Settings.builder()
-                .put(tmpSettings)
+                // Enabling shard indexing backpressure node-attribute
                 .put(NODE_ATTRIBUTES.getKey() + SHARD_INDEXING_PRESSURE_ENABLED_ATTRIBUTE_KEY, "true")
                 .build();
 

diff --git a/test/framework/src/main/java/org/opensearch/test/VersionUtils.java b/test/framework/src/main/java/org/opensearch/test/VersionUtils.java
@@ -89,7 +89,7 @@ static Tuple<List<Version>, List<Version>> resolveReleasedVersions(Version curre
             stableVersions = previousMajor;
             // remove current
             moveLastToUnreleased(currentMajor, unreleasedVersions);
-        } else if (current.major != 1 && current.major != 2) {
+        } else if (current.major != 1) {
             // on a stable or release branch, ie N.x
             stableVersions = currentMajor;
             // remove the next maintenance bugfix

diff --git a/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java b/test/framework/src/main/java/org/opensearch/test/rest/OpenSearchRestTestCase.java
@@ -824,7 +824,8 @@ protected String getProtocol() {
     protected RestClient buildClient(Settings settings, HttpHost[] hosts) throws IOException {
         RestClientBuilder builder = RestClient.builder(hosts);
         configureClient(builder, settings);
-        builder.setStrictDeprecationMode(true);
+        // TODO: set the method argument to 'true' after PR https://github.com/opensearch-project/OpenSearch/pull/2683 merged.
+        builder.setStrictDeprecationMode(false);
         return builder.build();
     }
 

diff --git a/test/framework/src/test/java/org/opensearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/opensearch/test/VersionUtilsTests.java
@@ -284,15 +284,17 @@ public void testResolveReleasedVersionsAtNewMinorBranchIn2x() {
                 Arrays.asList(
                     TestNewMinorBranchIn6x.V_1_6_0,
                     TestNewMinorBranchIn6x.V_1_6_1,
-                    TestNewMinorBranchIn6x.V_1_6_2,
                     TestNewMinorBranchIn6x.V_2_0_0,
                     TestNewMinorBranchIn6x.V_2_0_1,
                     TestNewMinorBranchIn6x.V_2_1_0,
                     TestNewMinorBranchIn6x.V_2_1_1
                 )
             )
         );
-        assertThat(unreleased, equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_2_1_2, TestNewMinorBranchIn6x.V_2_2_0)));
+        assertThat(
+            unreleased,
+            equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_1_6_2, TestNewMinorBranchIn6x.V_2_1_2, TestNewMinorBranchIn6x.V_2_2_0))
+        );
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,4 +39,4 @@ BWC_VERSION: @@
       - "1.3.0"
       - "1.3.1"
       - "1.3.2"
-      - "1.4.0"
+      - "2.0.0"