Merge branch 'main' into builder-get-flush-querycache

Signed-off-by: Sandesh Kumar <[email protected]>

Author: sandeshkr419

CHANGELOG.md

@@ -47,6 +47,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Refactor the Condition.Stats and DirectoryFileTransferTracker.Stats class to use the Builder pattern instead of constructors ([#19862](https://github.com/opensearch-project/OpenSearch/pull/19862))
 - Refactor the RemoteTranslogTransferTracker.Stats and RemoteSegmentTransferTracker.Stats class to use the Builder pattern instead of constructors ([#19837](https://github.com/opensearch-project/OpenSearch/pull/19837))
 - Refactor the GetStats, FlushStats and QueryCacheStats class to use the Builder pattern instead of constructors ([#19935](https://github.com/opensearch-project/OpenSearch/pull/19935))
+- Add RangeSemver for `dependencies` in `plugin-descriptor.properties` ([#19939](https://github.com/opensearch-project/OpenSearch/pull/19939))
 
 ### Fixed
 - Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))
@@ -73,7 +74,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.zookeeper:zookeeper` from 3.9.3 to 3.9.4 ([#19535](https://github.com/opensearch-project/OpenSearch/pull/19535))
 - Bump `com.azure:azure-storage-common` from 12.30.2 to 12.30.3 ([#19615](https://github.com/opensearch-project/OpenSearch/pull/19615))
 - Bump `peter-evans/create-issue-from-file` from 5 to 6 ([#19616](https://github.com/opensearch-project/OpenSearch/pull/19616))
-- Bump `com.squareup.okhttp3:okhttp` from 5.1.0 to 5.2.1 ([#19614](https://github.com/opensearch-project/OpenSearch/pull/19614))
+- Bump `com.squareup.okhttp3:okhttp` from 5.1.0 to 5.3.0 ([#19614](https://github.com/opensearch-project/OpenSearch/pull/19614), [#19944](https://github.com/opensearch-project/OpenSearch/pull/19944))
 - Bump `com.microsoft.azure:msal4j` from 1.21.0 to 1.23.1 ([#19688](https://github.com/opensearch-project/OpenSearch/pull/19688))
 - Bump `commons-net:commons-net` from 3.11.1 to 3.12.0 ([#19687](https://github.com/opensearch-project/OpenSearch/pull/19687))
 - Bump `org.apache.avro:avro` from 1.12.0 to 1.12.1 ([#19692](https://github.com/opensearch-project/OpenSearch/pull/19692))
@@ -90,14 +91,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `org.apache.commons:commons-text` from 1.13.1 to 1.14.0 ([#19871](https://github.com/opensearch-project/OpenSearch/pull/19871))
 - Exclude group com.microsoft.sqlserver from hadoop-minicluster ([#19889](https://github.com/opensearch-project/OpenSearch/pull/19889))
 
-- ### Deprecated
+### Deprecated
 - Deprecated existing constructors in ThreadPoolStats.Stats in favor of the new Builder ([#19317](https://github.com/opensearch-project/OpenSearch/pull/19317))
 - Deprecated existing constructors in IndexingStats.Stats in favor of the new Builder ([#19306](https://github.com/opensearch-project/OpenSearch/pull/19306))
 - Deprecated existing constructors in RefreshStats in favor of the new Builder ([#19835](https://github.com/opensearch-project/OpenSearch/pull/19835))
 - Deprecated existing constructors in DocStats and StoreStats in favor of the new Builder ([#19863](https://github.com/opensearch-project/OpenSearch/pull/19863))
 - Deprecated existing constructors in Condition.Stats and DirectoryFileTransferTracker.Stats in favor of the new Builder ([#19862](https://github.com/opensearch-project/OpenSearch/pull/19862))
 - Deprecated existing constructors in RemoteTranslogTransferTracker.Stats and RemoteSegmentTransferTracker.Stats in favor of the new Builder ([#19837](https://github.com/opensearch-project/OpenSearch/pull/19837))
 - Deprecated existing constructors in GetStats, FlushStats and QueryCacheStats in favor of the new Builder ([#19935](https://github.com/opensearch-project/OpenSearch/pull/19935))
+- Bump `com.google.api:gax-httpjson` from 2.69.0 to 2.72.1 ([#19943](https://github.com/opensearch-project/OpenSearch/pull/19943))
 
 ### Removed
 

libs/core/src/main/java/org/opensearch/semver/SemverRange.java

@@ -43,7 +43,7 @@
 @PublicApi(since = "2.13.0")
 public class SemverRange implements ToXContentFragment {
 
-    private static final Pattern RANGE_PATTERN = Pattern.compile("([\\[\\(])([\\d.]+)\\s*,\\s*([\\d.]+)([\\]\\)])");
+    public static final Pattern RANGE_PATTERN = Pattern.compile("([\\[\\(])([\\d.]+)\\s*,\\s*([\\d.]+)([\\]\\)])");
 
     private final Version rangeVersion;
     private final RangeOperator rangeOperator;

plugins/repository-gcs/build.gradle

@@ -66,8 +66,8 @@ dependencies {
   runtimeOnly "org.slf4j:slf4j-api:${versions.slf4j}" // 2.0.16 in bom
   runtimeOnly "commons-codec:commons-codec:${versions.commonscodec}" // 1.18.0 in bom
   implementation "com.google.api:api-common:2.52.0"
-  implementation "com.google.api:gax:2.69.0"
-  runtimeOnly "com.google.api:gax-httpjson:2.69.0"
+  implementation "com.google.api:gax:2.72.1"
+  runtimeOnly "com.google.api:gax-httpjson:2.72.1"
   implementation "org.threeten:threetenbp:1.7.0"
   runtimeOnly "com.google.protobuf:protobuf-java-util:${versions.protobuf}"
   runtimeOnly "com.google.protobuf:protobuf-java:${versions.protobuf}"

plugins/repository-gcs/licenses/gax-2.69.0.jar.sha1

@@ -0,0 +1 @@
+27357249073aa98ba8bcadba6ade835969a5442b

plugins/repository-gcs/licenses/gax-2.72.1.jar.sha1

@@ -0,0 +1 @@
+f6842f1cfe14d295a27561b3d34d468e6c5054b5

plugins/repository-gcs/licenses/gax-httpjson-2.69.0.jar.sha1

@@ -232,6 +232,7 @@ public IndexInput getIndexInput() throws IOException {
         @ExperimentalApi
         public CompletableFuture<IndexInput> asyncLoadIndexInput(Executor executor) {
             if (isClosed.get()) {
+                fileCache.decRef(request.getFilePath());
                 return CompletableFuture.failedFuture(new IllegalStateException("Already closed"));
             }
             if (isStarted.getAndSet(true) == false) {
@@ -252,6 +253,9 @@ public CompletableFuture<IndexInput> asyncLoadIndexInput(Executor executor) {
                     }
                     return null;
                 });
+            } else {
+                // Decreasing the extra ref count introduced by compute
+                fileCache.decRef(request.getFilePath());
             }
             return result;
         }

plugins/repository-gcs/licenses/gax-httpjson-2.72.1.jar.sha1

@@ -63,6 +63,8 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static org.opensearch.semver.SemverRange.RANGE_PATTERN;
+
 /**
  * An in-memory representation of the plugin descriptor.
  *
@@ -322,13 +324,17 @@ public static PluginInfo readFromProperties(final Path path) throws IOException
             if (dependenciesMap.keySet().stream().noneMatch(s -> s.equals("opensearch"))) {
                 throw new IllegalArgumentException("Only opensearch is allowed to be specified as a plugin dependency: " + dependenciesMap);
             }
-            String[] ranges = dependenciesMap.get("opensearch").split(",");
-            if (ranges.length != 1) {
+            String opensearchDependencyVersion = dependenciesMap.get("opensearch");
+            String[] ranges = opensearchDependencyVersion.split(",");
+            String opensearchVersion = ranges[0];
+            if (RANGE_PATTERN.matcher(opensearchDependencyVersion).matches()) {
+                opensearchVersion = opensearchDependencyVersion;
+            } else if (ranges.length != 1) {
                 throw new IllegalArgumentException(
-                    "Exactly one range is allowed to be specified in dependencies for the plugin [\" + name + \"]"
+                    "Exactly one range is allowed to be specified in dependencies for the plugin [" + name + "]"
                 );
             }
-            opensearchVersionRanges.add(SemverRange.fromString(ranges[0].trim()));
+            opensearchVersionRanges.add(SemverRange.fromString(opensearchVersion.trim()));
         }
 
         final String javaVersionString = propsMap.remove("java.version");

server/src/main/java/org/opensearch/index/store/remote/utils/TransferManager.java

@@ -324,6 +324,18 @@ public void testRefCount() throws Exception {
         assertEquals(Optional.of(1), Optional.of(fileCache.getRef(blobFetchRequest.getFilePath())));
     }
 
+    public void testRefMultipleCount() throws Exception {
+        List<BlobFetchRequest.BlobPart> blobParts = new ArrayList<>();
+        String blobname = "test-blob";
+        blobParts.add(new BlobFetchRequest.BlobPart("blob", 0, EIGHT_MB));
+        BlobFetchRequest blobFetchRequest = BlobFetchRequest.builder().fileName(blobname).directory(directory).blobParts(blobParts).build();
+        transferManager.fetchBlob(blobFetchRequest);
+        assertNotNull(fileCache.getRef(blobFetchRequest.getFilePath()));
+        transferManager.fetchBlobAsync(blobFetchRequest).join();
+        waitUntil(() -> fileCache.getRef(blobFetchRequest.getFilePath()) == 1, 10, TimeUnit.SECONDS);
+        assertEquals(Optional.of(1), Optional.of(fileCache.getRef(blobFetchRequest.getFilePath())));
+    }
+
     protected abstract void initializeTransferManager() throws IOException;
 
     protected abstract void mockExceptionWhileReading() throws IOException;