From e265355e8cf8399443b84104032af075953f1245 Mon Sep 17 00:00:00 2001
From: Varun Bansal <bansvaru@amazon.com>
Date: Fri, 19 Jan 2024 16:57:33 +0530
Subject: [PATCH 01/33] Allow empty translog for ITs testing no ingestion post
 refresh/commit (#11946)

Signed-off-by: bansvaru <bansvaru@amazon.com>
---
 .../RemoteStoreBaseIntegTestCase.java         |  9 +++++++
 .../remotestore/RemoteStoreRestoreIT.java     | 27 ++++++++++---------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
index d23e634bb3368..751de66a97806 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreBaseIntegTestCase.java
@@ -84,6 +84,10 @@ public class RemoteStoreBaseIntegTestCase extends OpenSearchIntegTestCase {
     );
 
     protected Map<String, Long> indexData(int numberOfIterations, boolean invokeFlush, String index) {
+        return indexData(numberOfIterations, invokeFlush, false, index);
+    }
+
+    protected Map<String, Long> indexData(int numberOfIterations, boolean invokeFlush, boolean emptyTranslog, String index) {
         long totalOperations = 0;
         long refreshedOrFlushedOperations = 0;
         long maxSeqNo = -1;
@@ -96,6 +100,11 @@ protected Map<String, Long> indexData(int numberOfIterations, boolean invokeFlus
             } else {
                 refresh(index);
             }
+
+            // skip indexing if last iteration as we dont want to have any data in remote translog
+            if (emptyTranslog && i == numberOfIterations - 1) {
+                continue;
+            }
             maxSeqNoRefreshedOrFlushed = maxSeqNo;
             indexingStats.put(MAX_SEQ_NO_REFRESHED_OR_FLUSHED + "-shard-" + shardId, maxSeqNoRefreshedOrFlushed);
             refreshedOrFlushedOperations = totalOperations;
diff --git a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java
index 7626e3dba6424..72296a1c01a24 100644
--- a/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRestoreIT.java
@@ -44,7 +44,7 @@ public class RemoteStoreRestoreIT extends BaseRemoteStoreRestoreIT {
      * @throws IOException IO Exception.
      */
     public void testRemoteTranslogRestoreWithNoDataPostCommit() throws Exception {
-        testRestoreFlow(1, true, randomIntBetween(1, 5));
+        testRestoreFlow(1, true, true, randomIntBetween(1, 5));
     }
 
     /**
@@ -52,7 +52,7 @@ public void testRemoteTranslogRestoreWithNoDataPostCommit() throws Exception {
      * @throws IOException IO Exception.
      */
     public void testRemoteTranslogRestoreWithNoDataPostRefresh() throws Exception {
-        testRestoreFlow(1, false, randomIntBetween(1, 5));
+        testRestoreFlow(1, false, true, randomIntBetween(1, 5));
     }
 
     /**
@@ -61,7 +61,7 @@ public void testRemoteTranslogRestoreWithNoDataPostRefresh() throws Exception {
      * @throws IOException IO Exception.
      */
     public void testRemoteTranslogRestoreWithRefreshedData() throws Exception {
-        testRestoreFlow(randomIntBetween(2, 5), false, randomIntBetween(1, 5));
+        testRestoreFlow(randomIntBetween(2, 5), false, false, randomIntBetween(1, 5));
     }
 
     /**
@@ -70,7 +70,7 @@ public void testRemoteTranslogRestoreWithRefreshedData() throws Exception {
      * @throws IOException IO Exception.
      */
     public void testRemoteTranslogRestoreWithCommittedData() throws Exception {
-        testRestoreFlow(randomIntBetween(2, 5), true, randomIntBetween(1, 5));
+        testRestoreFlow(randomIntBetween(2, 5), true, false, randomIntBetween(1, 5));
     }
 
     /**
@@ -78,7 +78,7 @@ public void testRemoteTranslogRestoreWithCommittedData() throws Exception {
      * @throws IOException IO Exception.
      */
     public void testRTSRestoreWithNoDataPostCommitPrimaryReplicaDown() throws Exception {
-        testRestoreFlowBothPrimaryReplicasDown(1, true, randomIntBetween(1, 5));
+        testRestoreFlowBothPrimaryReplicasDown(1, true, true, randomIntBetween(1, 5));
     }
 
     /**
@@ -86,7 +86,7 @@ public void testRTSRestoreWithNoDataPostCommitPrimaryReplicaDown() throws Except
      * @throws IOException IO Exception.
      */
     public void testRTSRestoreWithNoDataPostRefreshPrimaryReplicaDown() throws Exception {
-        testRestoreFlowBothPrimaryReplicasDown(1, false, randomIntBetween(1, 5));
+        testRestoreFlowBothPrimaryReplicasDown(1, false, true, randomIntBetween(1, 5));
     }
 
     /**
@@ -95,7 +95,7 @@ public void testRTSRestoreWithNoDataPostRefreshPrimaryReplicaDown() throws Excep
      * @throws IOException IO Exception.
      */
     public void testRTSRestoreWithRefreshedDataPrimaryReplicaDown() throws Exception {
-        testRestoreFlowBothPrimaryReplicasDown(randomIntBetween(2, 5), false, randomIntBetween(1, 5));
+        testRestoreFlowBothPrimaryReplicasDown(randomIntBetween(2, 5), false, false, randomIntBetween(1, 5));
     }
 
     /**
@@ -104,7 +104,7 @@ public void testRTSRestoreWithRefreshedDataPrimaryReplicaDown() throws Exception
      * @throws IOException IO Exception.
      */
     public void testRTSRestoreWithCommittedDataPrimaryReplicaDown() throws Exception {
-        testRestoreFlowBothPrimaryReplicasDown(randomIntBetween(2, 5), true, randomIntBetween(1, 5));
+        testRestoreFlowBothPrimaryReplicasDown(randomIntBetween(2, 5), true, false, randomIntBetween(1, 5));
     }
 
     private void restoreAndVerify(int shardCount, int replicaCount, Map<String, Long> indexStats) throws Exception {
@@ -122,9 +122,9 @@ private void restoreAndVerify(int shardCount, int replicaCount, Map<String, Long
      * @param invokeFlush If true, a flush is invoked. Otherwise, a refresh is invoked.
      * @throws IOException IO Exception.
      */
-    private void testRestoreFlow(int numberOfIterations, boolean invokeFlush, int shardCount) throws Exception {
+    private void testRestoreFlow(int numberOfIterations, boolean invokeFlush, boolean emptyTranslog, int shardCount) throws Exception {
         prepareCluster(1, 3, INDEX_NAME, 0, shardCount);
-        Map<String, Long> indexStats = indexData(numberOfIterations, invokeFlush, INDEX_NAME);
+        Map<String, Long> indexStats = indexData(numberOfIterations, invokeFlush, emptyTranslog, INDEX_NAME);
         assertEquals(shardCount, getNumShards(INDEX_NAME).totalNumShards);
 
         assertHitCount(client().prepareSearch(INDEX_NAME).setSize(0).get(), indexStats.get(REFRESHED_OR_FLUSHED_OPERATIONS));
@@ -141,9 +141,10 @@ private void testRestoreFlow(int numberOfIterations, boolean invokeFlush, int sh
      * @param invokeFlush If true, a flush is invoked. Otherwise, a refresh is invoked.
      * @throws IOException IO Exception.
      */
-    private void testRestoreFlowBothPrimaryReplicasDown(int numberOfIterations, boolean invokeFlush, int shardCount) throws Exception {
+    private void testRestoreFlowBothPrimaryReplicasDown(int numberOfIterations, boolean invokeFlush, boolean emptyTranslog, int shardCount)
+        throws Exception {
         prepareCluster(1, 2, INDEX_NAME, 1, shardCount);
-        Map<String, Long> indexStats = indexData(numberOfIterations, invokeFlush, INDEX_NAME);
+        Map<String, Long> indexStats = indexData(numberOfIterations, invokeFlush, emptyTranslog, INDEX_NAME);
         assertEquals(shardCount * 2, getNumShards(INDEX_NAME).totalNumShards);
 
         internalCluster().stopRandomNode(InternalTestCluster.nameFilter(replicaNodeName(INDEX_NAME)));
@@ -391,7 +392,7 @@ public void testRTSRestoreWithCommittedDataExcludeIndicesPatterns() throws Excep
      * @throws IOException IO Exception.
      */
     public void testRTSRestoreDataOnlyInTranslog() throws Exception {
-        testRestoreFlow(0, true, randomIntBetween(1, 5));
+        testRestoreFlow(0, true, false, randomIntBetween(1, 5));
     }
 
     public void testRateLimitedRemoteDownloads() throws Exception {

From 84f303b6069893cf9350556a4c316153ba526901 Mon Sep 17 00:00:00 2001
From: Neetika Singhal <neetiks@amazon.com>
Date: Fri, 19 Jan 2024 14:10:31 -0800
Subject: [PATCH 02/33] Fix memory leak issue in ReorganizingLongHash (#11953)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
---
 CHANGELOG.md                                      |  1 +
 .../common/util/ReorganizingLongHash.java         | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 822e4196adf5e..d0e2a115859c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -236,6 +236,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix issue when calling Delete PIT endpoint and no PITs exist ([#11711](https://github.com/opensearch-project/OpenSearch/pull/11711))
 - Fix tracing context propagation for local transport instrumentation ([#11490](https://github.com/opensearch-project/OpenSearch/pull/11490))
 - Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
+- Fix memory leak issue in ReorganizingLongHash ([#11953](https://github.com/opensearch-project/OpenSearch/issues/11953))
 
 ### Security
 
diff --git a/server/src/main/java/org/opensearch/common/util/ReorganizingLongHash.java b/server/src/main/java/org/opensearch/common/util/ReorganizingLongHash.java
index 86e7227cb6c85..fe053a26329e4 100644
--- a/server/src/main/java/org/opensearch/common/util/ReorganizingLongHash.java
+++ b/server/src/main/java/org/opensearch/common/util/ReorganizingLongHash.java
@@ -118,10 +118,17 @@ public ReorganizingLongHash(final long initialCapacity, final float loadFactor,
         mask = capacity - 1;
         grow = (long) (capacity * loadFactor);
         size = 0;
-
-        table = bigArrays.newLongArray(capacity, false);
-        table.fill(0, capacity, -1);  // -1 represents an empty slot
-        keys = bigArrays.newLongArray(initialCapacity, false);
+        try {
+            table = bigArrays.newLongArray(capacity, false);
+            table.fill(0, capacity, -1);  // -1 represents an empty slot
+            keys = bigArrays.newLongArray(initialCapacity, false);
+        } finally {
+            if (table == null || keys == null) {
+                // it's important to close the arrays initialized above to prevent memory leak
+                // refer: https://github.com/opensearch-project/OpenSearch/issues/10154
+                Releasables.closeWhileHandlingException(table, keys);
+            }
+        }
     }
 
     /**

From bea196f4af5a717a91385eab6db482611024910d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 09:09:09 -0500
Subject: [PATCH 03/33] Bump com.google.oauth-client:google-oauth-client from
 1.34.1 to 1.35.0 in /plugins/discovery-gce (#11960)

* Bump com.google.oauth-client:google-oauth-client

Bumps [com.google.oauth-client:google-oauth-client](https://github.com/googleapis/google-oauth-java-client) from 1.34.1 to 1.35.0.
- [Release notes](https://github.com/googleapis/google-oauth-java-client/releases)
- [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.34.1...v1.35.0)

---
updated-dependencies:
- dependency-name: com.google.oauth-client:google-oauth-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                                    | 1 +
 plugins/discovery-gce/build.gradle                              | 2 +-
 .../discovery-gce/licenses/google-oauth-client-1.34.1.jar.sha1  | 1 -
 .../discovery-gce/licenses/google-oauth-client-1.35.0.jar.sha1  | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 plugins/discovery-gce/licenses/google-oauth-client-1.34.1.jar.sha1
 create mode 100644 plugins/discovery-gce/licenses/google-oauth-client-1.35.0.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0e2a115859c3..3148681c18f2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -176,6 +176,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `Lucene` from 9.8.0 to 9.9.1 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421))
 - Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.1.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
+- Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
index c8b52d3afcd45..85efcc43fd65a 100644
--- a/plugins/discovery-gce/build.gradle
+++ b/plugins/discovery-gce/build.gradle
@@ -24,7 +24,7 @@ versions << [
 dependencies {
   api "com.google.apis:google-api-services-compute:v1-rev160-${versions.google}"
   api "com.google.api-client:google-api-client:${versions.google}"
-  api "com.google.oauth-client:google-oauth-client:1.34.1"
+  api "com.google.oauth-client:google-oauth-client:1.35.0"
   api "com.google.http-client:google-http-client:${versions.google}"
   api "com.google.http-client:google-http-client-jackson2:${versions.google}"
   api 'com.google.code.findbugs:jsr305:3.0.2'
diff --git a/plugins/discovery-gce/licenses/google-oauth-client-1.34.1.jar.sha1 b/plugins/discovery-gce/licenses/google-oauth-client-1.34.1.jar.sha1
deleted file mode 100644
index a8434bd380761..0000000000000
--- a/plugins/discovery-gce/licenses/google-oauth-client-1.34.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4a4f88c5e13143f882268c98239fb85c3b2c6cb2
\ No newline at end of file
diff --git a/plugins/discovery-gce/licenses/google-oauth-client-1.35.0.jar.sha1 b/plugins/discovery-gce/licenses/google-oauth-client-1.35.0.jar.sha1
new file mode 100644
index 0000000000000..a52e79088c7ca
--- /dev/null
+++ b/plugins/discovery-gce/licenses/google-oauth-client-1.35.0.jar.sha1
@@ -0,0 +1 @@
+2f52003156e40ba8be5f349a2716a77428896e69
\ No newline at end of file

From 761e13b621bd7463309979528d4d3768266bd7c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 12:39:43 -0500
Subject: [PATCH 04/33] Bump com.diffplug.spotless from 6.23.2 to 6.24.0
 (#11962)

* Bump com.diffplug.spotless from 6.23.2 to 6.24.0

Bumps com.diffplug.spotless from 6.23.2 to 6.24.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 1 +
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3148681c18f2f..98e3c5b5dd9ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -177,6 +177,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.1.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
+- Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
diff --git a/build.gradle b/build.gradle
index 296c30391af09..4d29ca8664af3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ plugins {
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "6.23.2" apply false
+  id "com.diffplug.spotless" version "6.24.0" apply false
   id "org.gradle.test-retry" version "1.5.4" apply false
   id "test-report-aggregation"
   id 'jacoco-report-aggregation'

From 304042f5cd55710151b3841df8248b084e0abe28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 14:07:34 -0500
Subject: [PATCH 05/33] Bump com.networknt:json-schema-validator from 1.1.0 to
 1.2.0 (#11963)

* Bump com.networknt:json-schema-validator from 1.1.0 to 1.2.0

Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/networknt/json-schema-validator/releases)
- [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md)
- [Commits](https://github.com/networknt/json-schema-validator/compare/1.1.0...1.2.0)

---
updated-dependencies:
- dependency-name: com.networknt:json-schema-validator
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md          | 2 +-
 buildSrc/build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98e3c5b5dd9ec..695e98cebbb38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -174,7 +174,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `net.java.dev.jna:jna` from 5.13.0 to 5.14.0 ([#11798](https://github.com/opensearch-project/OpenSearch/pull/11798))
 - Bump `lycheeverse/lychee-action` from 1.8.0 to 1.9.1 ([#11795](https://github.com/opensearch-project/OpenSearch/pull/11795), [#11887](https://github.com/opensearch-project/OpenSearch/pull/11887))
 - Bump `Lucene` from 9.8.0 to 9.9.1 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421))
-- Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.1.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886))
+- Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.2.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886), [#11963](https://github.com/opensearch-project/OpenSearch/pull/11963))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
 - Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 1cb21acd14af7..0562ecc6ee61b 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -118,7 +118,7 @@ dependencies {
   api 'com.avast.gradle:gradle-docker-compose-plugin:0.17.6'
   api "org.yaml:snakeyaml:${props.getProperty('snakeyaml')}"
   api 'org.apache.maven:maven-model:3.9.6'
-  api 'com.networknt:json-schema-validator:1.1.0'
+  api 'com.networknt:json-schema-validator:1.2.0'
   api 'org.jruby.jcodings:jcodings:1.0.58'
   api 'org.jruby.joni:joni:2.2.1'
   api "com.fasterxml.jackson.core:jackson-databind:${props.getProperty('jackson_databind')}"

From 17f20c6bfef3a8a88ce02749f23974044c32f55c Mon Sep 17 00:00:00 2001
From: Kunal Kotwani <kkotwani@amazon.com>
Date: Mon, 22 Jan 2024 11:23:03 -0800
Subject: [PATCH 06/33] [Github Action] Enhance version increment script to
 create tracking issue (#11926)

Signed-off-by: Kunal Kotwani <kkotwani@amazon.com>
---
 .github/workflows/version.yml | 109 +++++++++++++++++++++-------------
 1 file changed, 69 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/version.yml b/.github/workflows/version.yml
index a20c671c137b2..f4adef1ff06b0 100644
--- a/.github/workflows/version.yml
+++ b/.github/workflows/version.yml
@@ -1,28 +1,32 @@
 name: Increment Version
 
 on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'the tag'
+        required: true
+        type: string
   push:
     tags:
       - '*.*.*'
 
-permissions: {}
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
 jobs:
   build:
     if: github.repository == 'opensearch-project/OpenSearch'
     runs-on: ubuntu-latest
     steps:
-      - name: GitHub App token
-        id: github_app_token
-        uses: tibdex/github-app-token@v2.1.0
-        with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
-          installation_id: 22958780
-
-      - uses: actions/checkout@v4
-      - name: Fetch Tag and Version Information
+      - name: Fetch tag and version information
         run: |
           TAG=$(echo "${GITHUB_REF#refs/*/}")
+          if [ -n ${{ github.event.inputs.tag }} ]; then
+            TAG=${{ github.event.inputs.tag }}
+          fi
           CURRENT_VERSION_ARRAY=($(echo "$TAG" | tr . '\n'))
           BASE=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:2}")
           BASE_X=$(IFS=. ; echo "${CURRENT_VERSION_ARRAY[*]:0:1}.x")
@@ -44,24 +48,22 @@ jobs:
           echo "NEXT_VERSION=$NEXT_VERSION" >> $GITHUB_ENV
           echo "NEXT_VERSION_UNDERSCORE=$NEXT_VERSION_UNDERSCORE" >> $GITHUB_ENV
           echo "NEXT_VERSION_ID=$NEXT_VERSION_ID" >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
         with:
           ref: ${{ env.BASE }}
-          token: ${{ steps.github_app_token.outputs.token }}
 
-      - name: Increment Patch Version
-        run: |
-          echo Incrementing $CURRENT_VERSION to $NEXT_VERSION
-          echo "  - \"$CURRENT_VERSION\"" >> .ci/bwcVersions
-          sed -i "s/opensearch        = $CURRENT_VERSION/opensearch        = $NEXT_VERSION/g" buildSrc/version.properties
-          echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
-          sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n    public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
-          sed -i "s/CURRENT = $CURRENT_VERSION_UNDERSCORE;/CURRENT = $NEXT_VERSION_UNDERSCORE;/g" libs/core/src/main/java/org/opensearch/Version.java
+      - name: Increment Patch Version on Major.Minor branch
+        uses: peternied/opensearch-core-version-updater@v1
+        with:
+          previous-version: ${{ env.CURRENT_VERSION }}
+          new-version: ${{ env.NEXT_VERSION }}
+          update-current: true
 
-      - name: Create Pull Request
+      - name: Create PR for BASE
+        id: base_pr
         uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ steps.github_app_token.outputs.token }}
           base: ${{ env.BASE }}
           branch: 'create-pull-request/patch-${{ env.BASE }}'
           commit-message: Increment version to ${{ env.NEXT_VERSION }}
@@ -76,19 +78,18 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ env.BASE_X }}
-          token: ${{ steps.github_app_token.outputs.token }}
 
-      - name: Add bwc version to .X branch
-        run: |
-          echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
-          sed -i "s/- \"$CURRENT_VERSION\"/\0\n  - \"$NEXT_VERSION\"/g" .ci/bwcVersions
-          echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
-          sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n    public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
+      - name: Add Patch Version on Major.X branch
+        uses: peternied/opensearch-core-version-updater@v1
+        with:
+          previous-version: ${{ env.CURRENT_VERSION }}
+          new-version: ${{ env.NEXT_VERSION }}
+          update-current: false
 
-      - name: Create Pull Request
+      - name: Create PR for BASE_X
+        id: base_x_pr
         uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ steps.github_app_token.outputs.token }}
           base: ${{ env.BASE_X }}
           branch: 'create-pull-request/patch-${{ env.BASE_X }}'
           commit-message: Add bwc version ${{ env.NEXT_VERSION }}
@@ -103,19 +104,18 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: main
-          token: ${{ steps.github_app_token.outputs.token }}
 
-      - name: Add bwc version to main branch
-        run: |
-          echo Adding bwc version $NEXT_VERSION after $CURRENT_VERSION
-          sed -i "s/- \"$CURRENT_VERSION\"/\0\n  - \"$NEXT_VERSION\"/g" .ci/bwcVersions
-          echo Adding $NEXT_VERSION_UNDERSCORE after $CURRENT_VERSION_UNDERSCORE
-          sed -i "s/public static final Version $CURRENT_VERSION_UNDERSCORE = new Version(\([[:digit:]]\+\)\(.*\));/\0\n    public static final Version $NEXT_VERSION_UNDERSCORE = new Version($NEXT_VERSION_ID\2);/g" libs/core/src/main/java/org/opensearch/Version.java
+      - name: Add Patch Version on main branch
+        uses: peternied/opensearch-core-version-updater@v1
+        with:
+          previous-version: ${{ env.CURRENT_VERSION }}
+          new-version: ${{ env.NEXT_VERSION }}
+          update-current: false
 
-      - name: Create Pull Request
+      - name: Create PR for main
+        id: main_pr
         uses: peter-evans/create-pull-request@v5
         with:
-          token: ${{ steps.github_app_token.outputs.token }}
           base: main
           branch: 'create-pull-request/patch-main'
           commit-message: Add bwc version ${{ env.NEXT_VERSION }}
@@ -126,3 +126,32 @@ jobs:
           title: '[AUTO] [main] Add bwc version ${{ env.NEXT_VERSION }}.'
           body: |
             I've noticed that a new tag ${{ env.TAG }} was pushed, and added a bwc version ${{ env.NEXT_VERSION }}.
+
+      - name: Create tracking issue
+        id: create-issue
+        uses: actions/github-script@v6.4.0
+        with:
+          script: |
+            const body = `
+             ### Description
+             A new version of OpenSearch was released, to prepare for the next release new version numbers need to be updated in all active branches of development.
+
+             ### Exit Criteria
+             Review and merged the following pull requests
+             - [ ] ${{ steps.base_pr.outputs.pull-request-url }}
+             - [ ] ${{ steps.base_x_pr.outputs.pull-request-url }}
+             - [ ] ${{ steps.main_pr.outputs.pull-request-url }}
+
+             ### Additional Context
+             See project wide guidance on branching and versions [[link]](https://github.com/opensearch-project/.github/blob/main/RELEASING.md).
+            `
+            const { data: issue }= await github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["Build"],
+              title: "Increment version for ${{ env.NEXT_VERSION }}",
+              body: body
+            });
+            console.error(JSON.stringify(issue));
+            return issue.number;
+          result-encoding: string

From b0eab7579aaf7715c6eea7a3d1e206b7d1cb6760 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 17:07:03 -0800
Subject: [PATCH 07/33] Bump com.google.cloud:google-cloud-core from 2.5.10 to
 2.30.0 in /plugins/repository-gcs (#11961)

* Bump com.google.cloud:google-cloud-core in /plugins/repository-gcs

Bumps com.google.cloud:google-cloud-core from 2.5.10 to 2.30.0.

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                                    | 1 +
 plugins/repository-gcs/build.gradle                             | 2 +-
 .../repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1   | 1 +
 .../repository-gcs/licenses/google-cloud-core-2.5.10.jar.sha1   | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1
 delete mode 100644 plugins/repository-gcs/licenses/google-cloud-core-2.5.10.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 695e98cebbb38..3ab7ef4f10620 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -178,6 +178,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
 - Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
+- Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
index af6bf38cb065c..e0651da8d39c8 100644
--- a/plugins/repository-gcs/build.gradle
+++ b/plugins/repository-gcs/build.gradle
@@ -66,7 +66,7 @@ dependencies {
   api "com.google.auth:google-auth-library-credentials:${versions.google_auth}"
   api "com.google.auth:google-auth-library-oauth2-http:${versions.google_auth}"
 
-  api 'com.google.cloud:google-cloud-core:2.5.10'
+  api 'com.google.cloud:google-cloud-core:2.30.0'
   api 'com.google.cloud:google-cloud-core-http:2.23.0'
   api 'com.google.cloud:google-cloud-storage:1.113.1'
 
diff --git a/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1
new file mode 100644
index 0000000000000..10f8f90df108f
--- /dev/null
+++ b/plugins/repository-gcs/licenses/google-cloud-core-2.30.0.jar.sha1
@@ -0,0 +1 @@
+b48ea27cbdccd5f225d8a35ea28e2cd01c25918b
\ No newline at end of file
diff --git a/plugins/repository-gcs/licenses/google-cloud-core-2.5.10.jar.sha1 b/plugins/repository-gcs/licenses/google-cloud-core-2.5.10.jar.sha1
deleted file mode 100644
index 34c3dc6805500..0000000000000
--- a/plugins/repository-gcs/licenses/google-cloud-core-2.5.10.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-4d979bfe28551eb78cddae9282833ede147a9331
\ No newline at end of file

From 48fdb4f9fe5755f0e1f9beb18aa592fd8d46fc53 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Tue, 23 Jan 2024 08:44:13 -0500
Subject: [PATCH 08/33] Workaround for
 https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in
 JDK-21.0.2 (#11968)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 CHANGELOG.md                                  |  1 +
 .../util/concurrent/OpenSearchExecutors.java  | 24 +++++++++++++
 .../concurrent/OpenSearchExecutorsTests.java  | 36 +++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ab7ef4f10620..26427b013a1bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -210,6 +210,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Added Support for dynamically adding SearchRequestOperationsListeners with SearchRequestOperationsCompositeListenerFactory ([#11526](https://github.com/opensearch-project/OpenSearch/pull/11526))
 - Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
 - Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877))
+- Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2 ([#11968](https://github.com/opensearch-project/OpenSearch/pull/11968))
 
 ### Deprecated
 
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
index c95fb5b1044cc..6e45c3fb7b58d 100644
--- a/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
+++ b/server/src/main/java/org/opensearch/common/util/concurrent/OpenSearchExecutors.java
@@ -447,6 +447,30 @@ public boolean offer(E e) {
             }
         }
 
+        /**
+         * Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2.
+         */
+        @Override
+        public void put(E e) {
+            super.offer(e);
+        }
+
+        /**
+         * Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2.
+         */
+        @Override
+        public boolean offer(E e, long timeout, TimeUnit unit) {
+            return super.offer(e);
+        }
+
+        /**
+         * Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2.
+         */
+        @Override
+        public boolean add(E e) {
+            return super.offer(e);
+        }
+
     }
 
     /**
diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java
index 2063cd26a9e8e..4823ce7a238e3 100644
--- a/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java
+++ b/server/src/test/java/org/opensearch/common/util/concurrent/OpenSearchExecutorsTests.java
@@ -49,6 +49,7 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.lessThan;
+import static org.hamcrest.Matchers.lessThanOrEqualTo;
 
 /**
  * Tests for OpenSearchExecutors and its components like OpenSearchAbortPolicy.
@@ -279,6 +280,41 @@ public void testScaleDown() throws Exception {
         terminate(pool);
     }
 
+    /**
+     * The test case is adapted from https://bugs.openjdk.org/browse/JDK-8323659 reproducer.
+     */
+    public void testScaleUpWithSpawningTask() throws Exception {
+        ThreadPoolExecutor pool = OpenSearchExecutors.newScaling(
+            getClass().getName() + "/" + getTestName(),
+            0,
+            1,
+            between(1, 100),
+            randomTimeUnit(),
+            OpenSearchExecutors.daemonThreadFactory("test"),
+            threadContext
+        );
+        assertThat("Min property", pool.getCorePoolSize(), equalTo(0));
+        assertThat("Max property", pool.getMaximumPoolSize(), equalTo(1));
+
+        final CountDownLatch latch = new CountDownLatch(10);
+        class TestTask implements Runnable {
+            @Override
+            public void run() {
+                latch.countDown();
+                if (latch.getCount() > 0) {
+                    pool.execute(TestTask.this);
+                }
+            }
+        }
+        pool.execute(new TestTask());
+        latch.await();
+
+        assertThat("wrong pool size", pool.getPoolSize(), lessThanOrEqualTo(1));
+        assertThat("wrong active size", pool.getActiveCount(), lessThanOrEqualTo(1));
+
+        terminate(pool);
+    }
+
     public void testRejectionMessageAndShuttingDownFlag() throws InterruptedException {
         int pool = between(1, 10);
         int queue = between(0, 100);

From c529265033ae07fbcd935251b1db16f9354867eb Mon Sep 17 00:00:00 2001
From: gaobinlong <gbinlong@amazon.com>
Date: Wed, 24 Jan 2024 00:17:55 +0800
Subject: [PATCH 09/33] Fix flaky-test for CopyProcessorTests (#11982)

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
---
 .../ingest/common/CopyProcessorTests.java     | 30 +++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
index f271bdd342d0b..3259ba85ef340 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/CopyProcessorTests.java
@@ -14,6 +14,9 @@
 import org.opensearch.ingest.TestTemplateService;
 import org.opensearch.test.OpenSearchTestCase;
 
+import java.util.List;
+import java.util.Map;
+
 import static org.hamcrest.Matchers.equalTo;
 
 public class CopyProcessorTests extends OpenSearchTestCase {
@@ -26,8 +29,7 @@ public void testCopyExistingField() throws Exception {
         processor.execute(ingestDocument);
         assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
         Object sourceValue = ingestDocument.getFieldValue(sourceFieldName, Object.class);
-        assertThat(ingestDocument.getFieldValue(targetFieldName, Object.class), equalTo(sourceValue));
-        assertThat(ingestDocument.getFieldValue(sourceFieldName, Object.class), equalTo(sourceValue));
+        assertDeepCopiedObjectEquals(ingestDocument.getFieldValue(targetFieldName, Object.class), sourceValue);
 
         Processor processorWithEmptyTarget = createCopyProcessor(sourceFieldName, "", false, false, false);
         assertThrows(
@@ -75,7 +77,7 @@ public void testCopyWithRemoveSource() throws Exception {
         Processor processor = createCopyProcessor(sourceFieldName, targetFieldName, false, true, false);
         processor.execute(ingestDocument);
         assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
-        assertThat(ingestDocument.getFieldValue(targetFieldName, Object.class), equalTo(sourceValue));
+        assertDeepCopiedObjectEquals(ingestDocument.getFieldValue(targetFieldName, Object.class), sourceValue);
         assertThat(ingestDocument.hasField(sourceFieldName), equalTo(false));
     }
 
@@ -97,12 +99,30 @@ public void testCopyToExistingField() throws Exception {
         Processor processorWithTargetNullValue = createCopyProcessor(sourceFieldName, targetFieldWithNullValue, false, false, false);
         processorWithTargetNullValue.execute(ingestDocument);
         assertThat(ingestDocument.hasField(targetFieldWithNullValue), equalTo(true));
-        assertThat(ingestDocument.getFieldValue(targetFieldWithNullValue, Object.class), equalTo(sourceValue));
+        assertDeepCopiedObjectEquals(ingestDocument.getFieldValue(targetFieldWithNullValue, Object.class), sourceValue);
 
         Processor processorWithOverrideTargetIsTrue = createCopyProcessor(sourceFieldName, targetFieldName, false, false, true);
         processorWithOverrideTargetIsTrue.execute(ingestDocument);
         assertThat(ingestDocument.hasField(targetFieldName), equalTo(true));
-        assertThat(ingestDocument.getFieldValue(targetFieldName, Object.class), equalTo(sourceValue));
+        assertDeepCopiedObjectEquals(ingestDocument.getFieldValue(targetFieldName, Object.class), sourceValue);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static void assertDeepCopiedObjectEquals(Object expected, Object actual) {
+        if (expected instanceof Map) {
+            Map<String, Object> expectedMap = (Map<String, Object>) expected;
+            Map<String, Object> actualMap = (Map<String, Object>) actual;
+            assertEquals(expectedMap.size(), actualMap.size());
+            for (Map.Entry<String, Object> expectedEntry : expectedMap.entrySet()) {
+                assertDeepCopiedObjectEquals(expectedEntry.getValue(), actualMap.get(expectedEntry.getKey()));
+            }
+        } else if (expected instanceof List) {
+            assertArrayEquals(((List<?>) expected).toArray(), ((List<?>) actual).toArray());
+        } else if (expected instanceof byte[]) {
+            assertArrayEquals((byte[]) expected, (byte[]) actual);
+        } else {
+            assertEquals(expected, actual);
+        }
     }
 
     private static Processor createCopyProcessor(

From 4167ac5c94c57457bd225fe414f51d1d8fe66ed9 Mon Sep 17 00:00:00 2001
From: "Daniel (dB.) Doubrovkine" <dblock@amazon.com>
Date: Tue, 23 Jan 2024 12:38:49 -0500
Subject: [PATCH 10/33] Fix: remove unnecessary trailing slash from REST paths.
 (#11992)

Signed-off-by: dblock <dblock@amazon.com>
---
 .../action/admin/cluster/RestRemoteClusterInfoAction.java | 2 +-
 .../rest/action/admin/indices/RestPutMappingAction.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java
index 28edba4db387d..138f9fdf5c813 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/cluster/RestRemoteClusterInfoAction.java
@@ -53,7 +53,7 @@ public final class RestRemoteClusterInfoAction extends BaseRestHandler {
 
     @Override
     public List<Route> routes() {
-        return singletonList(new Route(GET, "_remote/info"));
+        return singletonList(new Route(GET, "/_remote/info"));
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
index 8fdf000139d89..0d805f5f3bfb8 100644
--- a/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
+++ b/server/src/main/java/org/opensearch/rest/action/admin/indices/RestPutMappingAction.java
@@ -66,10 +66,10 @@ public class RestPutMappingAction extends BaseRestHandler {
     public List<Route> routes() {
         return unmodifiableList(
             asList(
-                new Route(POST, "/{index}/_mapping/"),
-                new Route(PUT, "/{index}/_mapping/"),
-                new Route(POST, "/{index}/_mappings/"),
-                new Route(PUT, "/{index}/_mappings/")
+                new Route(POST, "/{index}/_mapping"),
+                new Route(PUT, "/{index}/_mapping"),
+                new Route(POST, "/{index}/_mappings"),
+                new Route(PUT, "/{index}/_mappings")
             )
         );
     }

From 79964c28901e337b4b0a31bed13a9b54e0720bd5 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Tue, 23 Jan 2024 15:36:48 -0500
Subject: [PATCH 11/33] OpenJDK Update (January 2024 Patch releases) (#11991)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 .../java/org/opensearch/gradle/test/DistroTestPlugin.java     | 4 ++--
 buildSrc/version.properties                                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
index 1ad7e056b6ae6..bc44f81a81aff 100644
--- a/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
+++ b/buildSrc/src/main/java/org/opensearch/gradle/test/DistroTestPlugin.java
@@ -77,9 +77,9 @@
 import java.util.stream.Stream;
 
 public class DistroTestPlugin implements Plugin<Project> {
-    private static final String SYSTEM_JDK_VERSION = "17.0.9+9";
+    private static final String SYSTEM_JDK_VERSION = "21.0.2+13";
     private static final String SYSTEM_JDK_VENDOR = "adoptium";
-    private static final String GRADLE_JDK_VERSION = "17.0.9+9";
+    private static final String GRADLE_JDK_VERSION = "21.0.2+13";
     private static final String GRADLE_JDK_VENDOR = "adoptium";
 
     // all distributions used by distro tests. this is temporary until tests are per distribution
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index dd7f2e1eaabf0..8f8e445b04437 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -2,7 +2,7 @@ opensearch        = 3.0.0
 lucene            = 9.9.1
 
 bundled_jdk_vendor = adoptium
-bundled_jdk = 21.0.1+12
+bundled_jdk = 21.0.2+13
 
 # optional dependencies
 spatial4j         = 0.7

From b61bd1415de4e7b961566a5ec8de6bc207ba34d0 Mon Sep 17 00:00:00 2001
From: gaobinlong <gbinlong@amazon.com>
Date: Wed, 24 Jan 2024 05:30:04 +0800
Subject: [PATCH 12/33] Fix typo in RemoveProcessor (#11983)

* Fix typo in RemoveProcessor

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

* Modify changelog

Signed-off-by: Gao Binlong <gbinlong@amazon.com>

---------

Signed-off-by: Gao Binlong <gbinlong@amazon.com>
---
 CHANGELOG.md                                                  | 2 +-
 .../java/org/opensearch/ingest/common/RemoveProcessor.java    | 4 ++--
 .../opensearch/ingest/common/RemoveProcessorFactoryTests.java | 4 ++--
 .../org/opensearch/ingest/common/RemoveProcessorTests.java    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26427b013a1bc..b8dce60ab5ce4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,7 +103,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add search query categorizer ([#10255](https://github.com/opensearch-project/OpenSearch/pull/10255))
 - Per request phase latency ([#10351](https://github.com/opensearch-project/OpenSearch/issues/10351))
 - Add cluster state stats ([#10670](https://github.com/opensearch-project/OpenSearch/pull/10670))
-- Remove ingest processor supports excluding fields ([#10967](https://github.com/opensearch-project/OpenSearch/pull/10967))
+- Remove ingest processor supports excluding fields ([#10967](https://github.com/opensearch-project/OpenSearch/pull/10967), [#11983](https://github.com/opensearch-project/OpenSearch/pull/11983))
 - [Tiered caching] Enabling serialization for IndicesRequestCache key object ([#10275](https://github.com/opensearch-project/OpenSearch/pull/10275))
 - [Tiered caching] Defining interfaces, listeners and extending IndicesRequestCache with Tiered cache support ([#10753](https://github.com/opensearch-project/OpenSearch/pull/10753))
 - [Remote cluster state] Restore cluster state version during remote state auto restore ([#10853](https://github.com/opensearch-project/OpenSearch/pull/10853))
diff --git a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
index d01dce02fca31..e6d151aec9be1 100644
--- a/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
+++ b/modules/ingest-common/src/main/java/org/opensearch/ingest/common/RemoveProcessor.java
@@ -72,7 +72,7 @@ public final class RemoveProcessor extends AbstractProcessor {
     ) {
         super(tag, description);
         if (fields == null && excludeFields == null || fields != null && excludeFields != null) {
-            throw new IllegalArgumentException("ether fields and excludeFields must be set");
+            throw new IllegalArgumentException("either fields or excludeFields must be set");
         }
         if (fields != null) {
             this.fields = new ArrayList<>(fields);
@@ -188,7 +188,7 @@ public RemoveProcessor create(
             final Object excludeField = ConfigurationUtils.readOptionalObject(config, "exclude_field");
 
             if (field == null && excludeField == null || field != null && excludeField != null) {
-                throw newConfigurationException(TYPE, processorTag, "field", "ether field or exclude_field must be set");
+                throw newConfigurationException(TYPE, processorTag, "field", "either field or exclude_field must be set");
             }
 
             boolean ignoreMissing = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_missing", false);
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java
index 179aef2feac0c..6332eeafc387c 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorFactoryTests.java
@@ -97,13 +97,13 @@ public void testCreateWithExcludeField() throws Exception {
             OpenSearchParseException.class,
             () -> factory.create(null, processorTag, null, config)
         );
-        assertThat(exception.getMessage(), equalTo("[field] ether field or exclude_field must be set"));
+        assertThat(exception.getMessage(), equalTo("[field] either field or exclude_field must be set"));
 
         Map<String, Object> config2 = new HashMap<>();
         config2.put("field", "field1");
         config2.put("exclude_field", "field2");
         exception = expectThrows(OpenSearchParseException.class, () -> factory.create(null, processorTag, null, config2));
-        assertThat(exception.getMessage(), equalTo("[field] ether field or exclude_field must be set"));
+        assertThat(exception.getMessage(), equalTo("[field] either field or exclude_field must be set"));
 
         Map<String, Object> config6 = new HashMap<>();
         config6.put("exclude_field", "exclude_field");
diff --git a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
index 78a3d36124d45..7fc1d3f2f0a3c 100644
--- a/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
+++ b/modules/ingest-common/src/test/java/org/opensearch/ingest/common/RemoveProcessorTests.java
@@ -203,7 +203,7 @@ public void testRemoveMetadataField() throws Exception {
 
     public void testCreateRemoveProcessorWithBothFieldsAndExcludeFields() throws Exception {
         assertThrows(
-            "ether fields and excludeFields must be set",
+            "either fields or excludeFields must be set",
             IllegalArgumentException.class,
             () -> new RemoveProcessor(randomAlphaOfLength(10), null, null, null, false)
         );
@@ -223,7 +223,7 @@ public void testCreateRemoveProcessorWithBothFieldsAndExcludeFields() throws Exc
         }
 
         assertThrows(
-            "ether fields and excludeFields must be set",
+            "either fields or excludeFields must be set",
             IllegalArgumentException.class,
             () -> new RemoveProcessor(randomAlphaOfLength(10), null, fields, excludeFields, false)
         );

From 30aa8bec12220e528d7fd635c78ea4d76c686917 Mon Sep 17 00:00:00 2001
From: Jay Deng <jayd0104@gmail.com>
Date: Tue, 23 Jan 2024 15:00:51 -0800
Subject: [PATCH 13/33] Disable index refresh for TermsFixedDocCountErrorIT
 (#11976)

Signed-off-by: Jay Deng <jayd0104@gmail.com>
---
 .../bucket/TermsFixedDocCountErrorIT.java     | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/TermsFixedDocCountErrorIT.java b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/TermsFixedDocCountErrorIT.java
index c1c99a9beb689..9f59167fe2d42 100644
--- a/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/TermsFixedDocCountErrorIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/search/aggregations/bucket/TermsFixedDocCountErrorIT.java
@@ -23,6 +23,7 @@
 import java.util.Collection;
 
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
+import static org.opensearch.index.IndexSettings.MINIMUM_REFRESH_INTERVAL;
 import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
 import static org.opensearch.search.aggregations.AggregationBuilders.terms;
 import static org.opensearch.test.OpenSearchIntegTestCase.Scope.TEST;
@@ -71,7 +72,10 @@ public void testSimpleAggErrorMultiShard() throws Exception {
         assertAcked(
             prepareCreate("idx_mshard_1").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_mshard_1").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();
@@ -89,7 +93,10 @@ public void testSimpleAggErrorMultiShard() throws Exception {
         assertAcked(
             prepareCreate("idx_mshard_2").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_mshard_2").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();
@@ -127,7 +134,10 @@ public void testSimpleAggErrorSingleShard() throws Exception {
         assertAcked(
             prepareCreate("idx_shard_error").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_shard_error").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();
@@ -170,7 +180,10 @@ public void testSliceLevelDocCountErrorSingleShard() throws Exception {
         assertAcked(
             prepareCreate("idx_slice_error").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_slice_error").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();
@@ -248,7 +261,10 @@ public void testSliceLevelDocCountErrorMultiShard() throws Exception {
         assertAcked(
             prepareCreate("idx_mshard_1").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_mshard_1").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();
@@ -288,7 +304,10 @@ public void testSliceLevelDocCountErrorMultiShard() throws Exception {
         assertAcked(
             prepareCreate("idx_mshard_2").setMapping(STRING_FIELD_NAME, "type=keyword")
                 .setSettings(
-                    Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                    Settings.builder()
+                        .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
+                        .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
+                        .put("index.refresh_interval", MINIMUM_REFRESH_INTERVAL)
                 )
         );
         client().prepareIndex("idx_mshard_2").setSource(jsonBuilder().startObject().field(STRING_FIELD_NAME, "A").endObject()).get();

From 7da8628323427e513a102beb1252ef60e1957443 Mon Sep 17 00:00:00 2001
From: Rishikesh Pasham <62345295+Rishikesh1159@users.noreply.github.com>
Date: Wed, 24 Jan 2024 05:58:53 -0800
Subject: [PATCH 14/33] [Searchable Snapshot] Add Relevant Error handling for
 Restore API with remote_snapshot. (#11840)

* Add Relevant Error handling for Restore API with remote_snapshot.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* update comment with more revelant info.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* apply spotless check.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Add null check

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* apply spotless check.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* fix error message in test.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* apply spotless check.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

---------

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
Signed-off-by: Rishikesh Pasham <62345295+Rishikesh1159@users.noreply.github.com>
---
 .../snapshots/SearchableSnapshotIT.java       | 42 +++++++++++++++++++
 .../opensearch/snapshots/RestoreService.java  | 11 +++++
 2 files changed, 53 insertions(+)

diff --git a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
index cb050e17cb237..21554a8e4fb15 100644
--- a/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/snapshots/SearchableSnapshotIT.java
@@ -60,6 +60,7 @@
 import static org.opensearch.action.admin.cluster.node.stats.NodesStatsRequest.Metric.FS;
 import static org.opensearch.core.common.util.CollectionUtils.iterableAsArrayList;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
@@ -789,6 +790,47 @@ public void testDefaultShardPreference() throws Exception {
         }
     }
 
+    public void testRestoreSearchableSnapshotWithIndexStoreTypeThrowsException() throws Exception {
+        final String snapshotName = "test-snap";
+        final String repoName = "test-repo";
+        final String indexName1 = "test-idx-1";
+        final int numReplicasIndex1 = randomIntBetween(1, 4);
+        final Client client = client();
+
+        internalCluster().ensureAtLeastNumDataNodes(numReplicasIndex1 + 1);
+        createIndexWithDocsAndEnsureGreen(numReplicasIndex1, 100, indexName1);
+
+        createRepositoryWithSettings(null, repoName);
+        takeSnapshot(client, snapshotName, repoName, indexName1);
+        deleteIndicesAndEnsureGreen(client, indexName1);
+
+        internalCluster().ensureAtLeastNumSearchNodes(numReplicasIndex1 + 1);
+
+        // set "index.store.type" to "remote_snapshot" in index settings of restore API and assert appropriate exception with error message
+        // is thrown.
+        final SnapshotRestoreException error = expectThrows(
+            SnapshotRestoreException.class,
+            () -> client.admin()
+                .cluster()
+                .prepareRestoreSnapshot(repoName, snapshotName)
+                .setRenamePattern("(.+)")
+                .setRenameReplacement("$1-copy")
+                .setIndexSettings(
+                    Settings.builder()
+                        .put(IndexModule.INDEX_STORE_TYPE_SETTING.getKey(), RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT)
+                )
+                .setWaitForCompletion(true)
+                .execute()
+                .actionGet()
+        );
+        assertThat(
+            error.getMessage(),
+            containsString(
+                "cannot restore remote snapshot with index settings \"index.store.type\" set to \"remote_snapshot\". Instead use \"storage_type\": \"remote_snapshot\" as argument to restore."
+            )
+        );
+    }
+
     /**
      * Asserts the cache folder count to match the number of shards and the number of indices within the cache folder
      * as provided.
diff --git a/server/src/main/java/org/opensearch/snapshots/RestoreService.java b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
index 9d2c7eb882fa1..bf2c7fc74be92 100644
--- a/server/src/main/java/org/opensearch/snapshots/RestoreService.java
+++ b/server/src/main/java/org/opensearch/snapshots/RestoreService.java
@@ -121,6 +121,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_VERSION_UPGRADED;
 import static org.opensearch.common.util.FeatureFlags.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY;
 import static org.opensearch.common.util.set.Sets.newHashSet;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.index.store.remote.directory.RemoteSnapshotDirectory.SEARCHABLE_SNAPSHOT_EXTENDED_COMPATIBILITY_MINIMUM_VERSION;
 import static org.opensearch.index.store.remote.filecache.FileCache.DATA_TO_FILE_CACHE_SIZE_RATIO_SETTING;
 import static org.opensearch.node.Node.NODE_SEARCH_CACHE_SIZE_SETTING;
@@ -226,6 +227,16 @@ public RestoreService(
      */
     public void restoreSnapshot(final RestoreSnapshotRequest request, final ActionListener<RestoreCompletionResponse> listener) {
         try {
+            // Setting INDEX_STORE_TYPE_SETTING as REMOTE_SNAPSHOT is intended to be a system-managed index setting that is configured when
+            // restoring a snapshot and should not be manually set by user.
+            String storeTypeSetting = request.indexSettings().get(INDEX_STORE_TYPE_SETTING.getKey());
+            if (storeTypeSetting != null && storeTypeSetting.equals(RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT.toString())) {
+                throw new SnapshotRestoreException(
+                    request.repository(),
+                    request.snapshot(),
+                    "cannot restore remote snapshot with index settings \"index.store.type\" set to \"remote_snapshot\". Instead use \"storage_type\": \"remote_snapshot\" as argument to restore."
+                );
+            }
             // Read snapshot info and metadata from the repository
             final String repositoryName = request.repository();
             Repository repository = repositoriesService.repository(repositoryName);

From b1f8b169c2f195012a08cfc6d79ef5e5a3c7f885 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Wed, 24 Jan 2024 12:10:18 -0500
Subject: [PATCH 15/33] Fix test cluster behavior @ClusterScope(scope =
 Scope.SUITE) and @OpenSearchIntegTestCase.SuiteScopeTestCase for
 parameterized test cases (#12000)

* Fix test cluster behavior @ClusterScope(scope = Scope.SUITE) and @OpenSearchIntegTestCase.SuiteScopeTestCase for parameterized test cases

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Address code review comments

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

* Added test cases for all supported test cluster scopes

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

---------

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 CHANGELOG.md                                  |  2 +-
 .../test/OpenSearchTestClusterRule.java       | 39 ++++++++++++--
 ...edDynamicSettingsOpenSearchIntegTests.java | 49 +++++++++++++++++
 ...zedStaticSettingsOpenSearchIntegTests.java | 53 +++++++++++++++++++
 ...edDynamicSettingsOpenSearchIntegTests.java | 50 +++++++++++++++++
 ...zedStaticSettingsOpenSearchIntegTests.java | 53 +++++++++++++++++++
 ...edDynamicSettingsOpenSearchIntegTests.java | 50 +++++++++++++++++
 ...zedStaticSettingsOpenSearchIntegTests.java | 53 +++++++++++++++++++
 8 files changed, 344 insertions(+), 5 deletions(-)
 create mode 100644 test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java
 create mode 100644 test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java
 create mode 100644 test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
 create mode 100644 test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java
 create mode 100644 test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
 create mode 100644 test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8dce60ab5ce4..0f5804ed3e632 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -209,7 +209,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Use slice_size == shard_size heuristic in terms aggs for concurrent segment search and properly calculate the doc_count_error ([#11732](https://github.com/opensearch-project/OpenSearch/pull/11732))
 - Added Support for dynamically adding SearchRequestOperationsListeners with SearchRequestOperationsCompositeListenerFactory ([#11526](https://github.com/opensearch-project/OpenSearch/pull/11526))
 - Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
-- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877))
+- Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877)), ([#12000](https://github.com/opensearch-project/OpenSearch/pull/12000))
 - Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2 ([#11968](https://github.com/opensearch-project/OpenSearch/pull/11968))
 
 ### Deprecated
diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
index dcdca8ab35dfc..57e9ccf22ab43 100644
--- a/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
+++ b/test/framework/src/main/java/org/opensearch/test/OpenSearchTestClusterRule.java
@@ -56,6 +56,8 @@
  * on the way cluster settings are being managed.
  */
 class OpenSearchTestClusterRule implements MethodRule {
+    // Maps each TestCluster instance to the exact test suite instance that triggered its creation
+    private final Map<TestCluster, OpenSearchIntegTestCase> suites = new IdentityHashMap<>();
     private final Map<Class<?>, TestCluster> clusters = new IdentityHashMap<>();
     private final Logger logger = LogManager.getLogger(getClass());
 
@@ -86,7 +88,13 @@ void afterClass() throws Exception {
                 printTestMessage("cleaning up after");
                 afterInternal(true, null);
                 OpenSearchTestCase.checkStaticState(true);
-                clusters.remove(getTestClass());
+                synchronized (clusters) {
+                    final TestCluster cluster = clusters.remove(getTestClass());
+                    IOUtils.closeWhileHandlingException(cluster);
+                    if (cluster != null) {
+                        suites.remove(cluster);
+                    }
+                }
             }
             StrictCheckSpanProcessor.validateTracingStateOnShutdown();
         } finally {
@@ -226,8 +234,11 @@ private static boolean isSuiteScopedTest(Class<?> clazz) {
         return clazz.getAnnotation(SuiteScopeTestCase.class) != null;
     }
 
-    private boolean hasParametersChanged(final ParameterizedOpenSearchIntegTestCase target) {
-        return !((ParameterizedOpenSearchIntegTestCase) suiteInstance).hasSameParametersAs(target);
+    private static boolean hasParametersChanged(
+        final ParameterizedOpenSearchIntegTestCase instance,
+        final ParameterizedOpenSearchIntegTestCase target
+    ) {
+        return !instance.hasSameParametersAs(target);
     }
 
     private boolean runTestScopeLifecycle() {
@@ -242,8 +253,24 @@ private TestCluster buildAndPutCluster(Scope currentClusterScope, long seed, Ope
             clearClusters(); // all leftovers are gone by now... this is really just a double safety if we miss something somewhere
             switch (currentClusterScope) {
                 case SUITE:
+                    if (testCluster != null && target instanceof ParameterizedOpenSearchIntegTestCase) {
+                        final OpenSearchIntegTestCase instance = suites.get(testCluster);
+                        if (instance != null) {
+                            assert instance instanceof ParameterizedOpenSearchIntegTestCase;
+                            if (hasParametersChanged(
+                                (ParameterizedOpenSearchIntegTestCase) instance,
+                                (ParameterizedOpenSearchIntegTestCase) target
+                            )) {
+                                IOUtils.closeWhileHandlingException(testCluster);
+                                printTestMessage("new instance of parameterized test class, recreating test cluster for suite");
+                                testCluster = null;
+                            }
+                        }
+                    }
+
                     if (testCluster == null) { // only build if it's not there yet
                         testCluster = buildWithPrivateContext(currentClusterScope, seed, target);
+                        suites.put(testCluster, target);
                     }
                     break;
                 case TEST:
@@ -310,6 +337,7 @@ private void clearClusters() throws Exception {
         synchronized (clusters) {
             if (!clusters.isEmpty()) {
                 IOUtils.close(clusters.values());
+                suites.clear();
                 clusters.clear();
             }
         }
@@ -363,7 +391,10 @@ private void initializeSuiteScope(OpenSearchIntegTestCase target, FrameworkMetho
             // Catching the case when parameterized test cases are run: the test class stays the same but the test instances changes.
             if (target instanceof ParameterizedOpenSearchIntegTestCase) {
                 assert suiteInstance instanceof ParameterizedOpenSearchIntegTestCase;
-                if (hasParametersChanged((ParameterizedOpenSearchIntegTestCase) target)) {
+                if (hasParametersChanged(
+                    (ParameterizedOpenSearchIntegTestCase) suiteInstance,
+                    (ParameterizedOpenSearchIntegTestCase) target
+                )) {
                     printTestMessage("new instance of parameterized test class, recreating cluster scope", method);
                     afterClass();
                     beforeClass();
diff --git a/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..4b864d820d9ec
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/ParameterizedDynamicSettingsOpenSearchIntegTests.java
@@ -0,0 +1,49 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class ParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public ParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..76e05d55a854b
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/ParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+public class ParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+
+    public ParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..e96eaec6e85a3
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.SuiteScopeTestCase
+public class SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public SuiteScopedParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..093be04d556b0
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.SuiteScopeTestCase
+public class SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+    public SuiteScopedParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..bd271b93ba674
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedDynamicSettingsOpenSearchIntegTests.java
@@ -0,0 +1,50 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
+public class TestScopedParameterizedDynamicSettingsOpenSearchIntegTests extends ParameterizedDynamicSettingsOpenSearchIntegTestCase {
+    public TestScopedParameterizedDynamicSettingsOpenSearchIntegTests(Settings dynamicSettings) {
+        super(dynamicSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final ClusterStateResponse cluster = client().admin().cluster().prepareState().all().get();
+        assertThat(
+            CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(cluster.getState().getMetadata().settings()),
+            equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+        );
+    }
+}
diff --git a/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java
new file mode 100644
index 0000000000000..014f96657ba03
--- /dev/null
+++ b/test/framework/src/test/java/org/opensearch/test/TestScopedParameterizedStaticSettingsOpenSearchIntegTests.java
@@ -0,0 +1,53 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.test;
+
+import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
+
+import org.opensearch.action.admin.cluster.node.info.NodeInfo;
+import org.opensearch.action.admin.cluster.node.info.NodesInfoResponse;
+import org.opensearch.common.settings.Settings;
+import org.opensearch.common.util.FeatureFlags;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
+import static org.hamcrest.CoreMatchers.equalTo;
+
+@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST)
+public class TestScopedParameterizedStaticSettingsOpenSearchIntegTests extends ParameterizedStaticSettingsOpenSearchIntegTestCase {
+    public TestScopedParameterizedStaticSettingsOpenSearchIntegTests(Settings staticSettings) {
+        super(staticSettings);
+    }
+
+    @ParametersFactory
+    public static Collection<Object[]> parameters() {
+        return Arrays.asList(
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
+            new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
+        );
+    }
+
+    @Override
+    protected Settings featureFlagSettings() {
+        return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
+    }
+
+    public void testSettings() throws IOException {
+        final NodesInfoResponse nodes = client().admin().cluster().prepareNodesInfo().get();
+        for (final NodeInfo node : nodes.getNodes()) {
+            assertThat(
+                CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(node.getSettings()),
+                equalTo(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.get(settings))
+            );
+        }
+    }
+}

From 76f7e73cffab0d0fbfb4bb0f24affd17b078d50a Mon Sep 17 00:00:00 2001
From: Sarat Vemulapalli <vemulapallisarat@gmail.com>
Date: Wed, 24 Jan 2024 12:36:22 -0800
Subject: [PATCH 16/33] Fixing Minio docker compose fixture (#12014)

Signed-off-by: Sarat Vemulapalli <vemsarat@amazon.com>
---
 test/fixtures/minio-fixture/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/fixtures/minio-fixture/docker-compose.yml b/test/fixtures/minio-fixture/docker-compose.yml
index e4d2faab9a657..539ca9471fa04 100644
--- a/test/fixtures/minio-fixture/docker-compose.yml
+++ b/test/fixtures/minio-fixture/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.2'
 services:
   minio-fixture:
     build:

From 829215c4a4660ee65026c40a0a01ebe100b3ee2c Mon Sep 17 00:00:00 2001
From: Prabhat <20185657+CaptainDredge@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:38:23 -0800
Subject: [PATCH 17/33] Added New DateTime parser implementation (#11465)

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
Co-authored-by: Prabhat Sharma <ptsharma@amazon.com>
---
 CHANGELOG.md                                  |   1 +
 NOTICE.txt                                    |   3 +
 .../common/time/DateFormatters.java           |  37 ++
 .../opensearch/common/time/FormatNames.java   |   1 +
 .../common/time/JavaDateFormatter.java        |  90 ++--
 .../time/OpenSearchDateTimeFormatter.java     |  85 ++++
 .../time/OpenSearchDateTimePrinter.java       |  30 ++
 .../RFC3339CompatibleDateTimeFormatter.java   | 428 ++++++++++++++++++
 .../joda/JavaJodaTimeDuellingTests.java       |   4 +-
 .../common/time/DateFormattersTests.java      | 154 ++++++-
 10 files changed, 796 insertions(+), 37 deletions(-)
 create mode 100644 server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java
 create mode 100644 server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java
 create mode 100644 server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f5804ed3e632..aa7675edb8cc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -133,6 +133,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump OpenTelemetry from 1.32.0 to 1.34.1 ([#11891](https://github.com/opensearch-project/OpenSearch/pull/11891))
 - Support index level allocation filtering for searchable snapshot index ([#11563](https://github.com/opensearch-project/OpenSearch/pull/11563))
 - Add `org.opensearch.rest.MethodHandlers` and `RestController#getAllHandlers` ([11876](https://github.com/opensearch-project/OpenSearch/pull/11876))
+- New DateTime format for RFC3339 compatible date fields ([#11465](https://github.com/opensearch-project/OpenSearch/pull/11465))
 
 ### Dependencies
 - Bumps jetty version to 9.4.52.v20230823 to fix GMS-2023-1857 ([#9822](https://github.com/opensearch-project/OpenSearch/pull/9822))
diff --git a/NOTICE.txt b/NOTICE.txt
index 6c7dc983f8c7a..d463b8f28561f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -10,3 +10,6 @@ Foundation (http://www.apache.org/).
 
 This product includes software developed by
 Joda.org (http://www.joda.org/).
+
+This product includes software developed by
+Morten Haraldsen (ethlo) (https://github.com/ethlo) under the Apache License, version 2.0.
diff --git a/server/src/main/java/org/opensearch/common/time/DateFormatters.java b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
index e74ab687b903b..527dce7677dd8 100644
--- a/server/src/main/java/org/opensearch/common/time/DateFormatters.java
+++ b/server/src/main/java/org/opensearch/common/time/DateFormatters.java
@@ -1299,6 +1299,41 @@ public class DateFormatters {
             .withResolverStyle(ResolverStyle.STRICT)
     );
 
+    /**
+     * Returns RFC 3339 a popular ISO 8601 profile compatible date time formatter and parser.
+     * This is not fully compatible to the existing spec, its more linient and closely follows w3c note on datetime
+     */
+
+    public static final DateFormatter RFC3339_LENIENT_DATE_FORMATTER = new JavaDateFormatter(
+        "rfc3339_lenient",
+        new OpenSearchDateTimeFormatter(STRICT_DATE_OPTIONAL_TIME_PRINTER),
+        new RFC3339CompatibleDateTimeFormatter(
+            new DateTimeFormatterBuilder().append(DATE_FORMATTER)
+                .optionalStart()
+                .appendLiteral('T')
+                .appendValue(HOUR_OF_DAY, 1, 2, SignStyle.NOT_NEGATIVE)
+                .appendLiteral(':')
+                .appendValue(MINUTE_OF_HOUR, 1, 2, SignStyle.NOT_NEGATIVE)
+                .optionalStart()
+                .appendLiteral(':')
+                .appendValue(SECOND_OF_MINUTE, 1, 2, SignStyle.NOT_NEGATIVE)
+                .optionalStart()
+                .appendFraction(NANO_OF_SECOND, 1, 9, true)
+                .optionalEnd()
+                .optionalStart()
+                .appendLiteral(',')
+                .appendFraction(NANO_OF_SECOND, 1, 9, false)
+                .optionalEnd()
+                .optionalStart()
+                .appendOffsetId()
+                .optionalEnd()
+                .optionalEnd()
+                .optionalEnd()
+                .toFormatter(Locale.ROOT)
+                .withResolverStyle(ResolverStyle.STRICT)
+        )
+    );
+
     private static final DateTimeFormatter HOUR_MINUTE_SECOND_FORMATTER = new DateTimeFormatterBuilder().append(HOUR_MINUTE_FORMATTER)
         .appendLiteral(":")
         .appendValue(SECOND_OF_MINUTE, 1, 2, SignStyle.NOT_NEGATIVE)
@@ -2152,6 +2187,8 @@ static DateFormatter forPattern(String input) {
             return STRICT_YEAR_MONTH;
         } else if (FormatNames.STRICT_YEAR_MONTH_DAY.matches(input)) {
             return STRICT_YEAR_MONTH_DAY;
+        } else if (FormatNames.RFC3339_LENIENT.matches(input)) {
+            return RFC3339_LENIENT_DATE_FORMATTER;
         } else {
             try {
                 return new JavaDateFormatter(
diff --git a/server/src/main/java/org/opensearch/common/time/FormatNames.java b/server/src/main/java/org/opensearch/common/time/FormatNames.java
index ba0a8fcf4a17a..ec5e825fc933e 100644
--- a/server/src/main/java/org/opensearch/common/time/FormatNames.java
+++ b/server/src/main/java/org/opensearch/common/time/FormatNames.java
@@ -44,6 +44,7 @@
  */
 public enum FormatNames {
     ISO8601(null, "iso8601"),
+    RFC3339_LENIENT(null, "rfc3339_lenient"),
     BASIC_DATE("basicDate", "basic_date"),
     BASIC_DATE_TIME("basicDateTime", "basic_date_time"),
     BASIC_DATE_TIME_NO_MILLIS("basicDateTimeNoMillis", "basic_date_time_no_millis"),
diff --git a/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java b/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
index f711b14aeb928..033ea280e6172 100644
--- a/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
+++ b/server/src/main/java/org/opensearch/common/time/JavaDateFormatter.java
@@ -36,6 +36,7 @@
 import org.opensearch.core.common.Strings;
 
 import java.text.ParsePosition;
+import java.time.DateTimeException;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -52,7 +53,6 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -70,11 +70,11 @@ class JavaDateFormatter implements DateFormatter {
 
     private final String format;
     private final String printFormat;
-    private final DateTimeFormatter printer;
-    private final List<DateTimeFormatter> parsers;
+    private final OpenSearchDateTimePrinter printer;
+    private final List<OpenSearchDateTimeFormatter> parsers;
     private final JavaDateFormatter roundupParser;
     private final Boolean canCacheLastParsedFormatter;
-    private volatile DateTimeFormatter lastParsedformatter = null;
+    private volatile OpenSearchDateTimeFormatter lastParsedformatter = null;
 
     /**
      * A round up formatter
@@ -83,11 +83,11 @@ class JavaDateFormatter implements DateFormatter {
      */
     static class RoundUpFormatter extends JavaDateFormatter {
 
-        RoundUpFormatter(String format, List<DateTimeFormatter> roundUpParsers) {
+        RoundUpFormatter(String format, List<OpenSearchDateTimeFormatter> roundUpParsers) {
             super(format, firstFrom(roundUpParsers), null, roundUpParsers);
         }
 
-        private static DateTimeFormatter firstFrom(List<DateTimeFormatter> roundUpParsers) {
+        private static OpenSearchDateTimeFormatter firstFrom(List<OpenSearchDateTimeFormatter> roundUpParsers) {
             return roundUpParsers.get(0);
         }
 
@@ -101,14 +101,18 @@ JavaDateFormatter getRoundupParser() {
     JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
+        OpenSearchDateTimePrinter printer,
         Boolean canCacheLastParsedFormatter,
-        DateTimeFormatter... parsers
+        OpenSearchDateTimeFormatter... parsers
     ) {
         this(format, printFormat, printer, ROUND_UP_BASE_FIELDS, canCacheLastParsedFormatter, parsers);
     }
 
     JavaDateFormatter(String format, DateTimeFormatter printer, DateTimeFormatter... parsers) {
+        this(format, format, wrapFormatter(printer), false, wrapAllFormatters(parsers));
+    }
+
+    JavaDateFormatter(String format, OpenSearchDateTimePrinter printer, OpenSearchDateTimeFormatter... parsers) {
         this(format, format, printer, false, parsers);
     }
 
@@ -127,19 +131,19 @@ JavaDateFormatter getRoundupParser() {
     JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
+        OpenSearchDateTimePrinter printer,
         BiConsumer<DateTimeFormatterBuilder, DateTimeFormatter> roundupParserConsumer,
         Boolean canCacheLastParsedFormatter,
-        DateTimeFormatter... parsers
+        OpenSearchDateTimeFormatter... parsers
     ) {
         if (printer == null) {
             throw new IllegalArgumentException("printer may not be null");
         }
-        long distinctZones = Arrays.stream(parsers).map(DateTimeFormatter::getZone).distinct().count();
+        long distinctZones = Arrays.stream(parsers).map(OpenSearchDateTimeFormatter::getZone).distinct().count();
         if (distinctZones > 1) {
             throw new IllegalArgumentException("formatters must have the same time zone");
         }
-        long distinctLocales = Arrays.stream(parsers).map(DateTimeFormatter::getLocale).distinct().count();
+        long distinctLocales = Arrays.stream(parsers).map(OpenSearchDateTimeFormatter::getLocale).distinct().count();
         if (distinctLocales > 1) {
             throw new IllegalArgumentException("formatters must have the same locale");
         }
@@ -149,12 +153,12 @@ JavaDateFormatter getRoundupParser() {
         this.canCacheLastParsedFormatter = canCacheLastParsedFormatter;
 
         if (parsers.length == 0) {
-            this.parsers = Collections.singletonList(printer);
+            this.parsers = Collections.singletonList((OpenSearchDateTimeFormatter) printer);
         } else {
             this.parsers = Arrays.asList(parsers);
         }
         List<DateTimeFormatter> roundUp = createRoundUpParser(format, roundupParserConsumer);
-        this.roundupParser = new RoundUpFormatter(format, roundUp);
+        this.roundupParser = new RoundUpFormatter(format, wrapAllFormatters(roundUp));
     }
 
     JavaDateFormatter(
@@ -163,7 +167,7 @@ JavaDateFormatter getRoundupParser() {
         BiConsumer<DateTimeFormatterBuilder, DateTimeFormatter> roundupParserConsumer,
         DateTimeFormatter... parsers
     ) {
-        this(format, format, printer, roundupParserConsumer, false, parsers);
+        this(format, format, wrapFormatter(printer), roundupParserConsumer, false, wrapAllFormatters(parsers));
     }
 
     /**
@@ -181,7 +185,8 @@ private List<DateTimeFormatter> createRoundUpParser(
     ) {
         if (format.contains("||") == false) {
             List<DateTimeFormatter> roundUpParsers = new ArrayList<>();
-            for (DateTimeFormatter parser : this.parsers) {
+            for (OpenSearchDateTimeFormatter customparser : this.parsers) {
+                DateTimeFormatter parser = customparser.getFormatter();
                 DateTimeFormatterBuilder builder = new DateTimeFormatterBuilder();
                 builder.append(parser);
                 roundupParserConsumer.accept(builder, parser);
@@ -201,12 +206,12 @@ public static DateFormatter combined(
         assert formatters.size() > 0;
         assert printFormatter != null;
 
-        List<DateTimeFormatter> parsers = new ArrayList<>(formatters.size());
-        List<DateTimeFormatter> roundUpParsers = new ArrayList<>(formatters.size());
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(formatters.size());
+        List<OpenSearchDateTimeFormatter> roundUpParsers = new ArrayList<>(formatters.size());
 
         assert printFormatter instanceof JavaDateFormatter;
         JavaDateFormatter javaPrintFormatter = (JavaDateFormatter) printFormatter;
-        DateTimeFormatter printer = javaPrintFormatter.getPrinter();
+        OpenSearchDateTimePrinter printer = javaPrintFormatter.getPrinter();
         for (DateFormatter formatter : formatters) {
             assert formatter instanceof JavaDateFormatter;
             JavaDateFormatter javaDateFormatter = (JavaDateFormatter) formatter;
@@ -227,9 +232,9 @@ public static DateFormatter combined(
     private JavaDateFormatter(
         String format,
         String printFormat,
-        DateTimeFormatter printer,
-        List<DateTimeFormatter> roundUpParsers,
-        List<DateTimeFormatter> parsers,
+        OpenSearchDateTimePrinter printer,
+        List<OpenSearchDateTimeFormatter> roundUpParsers,
+        List<OpenSearchDateTimeFormatter> parsers,
         Boolean canCacheLastParsedFormatter
     ) {
         this.format = format;
@@ -245,6 +250,15 @@ private JavaDateFormatter(
         DateTimeFormatter printer,
         List<DateTimeFormatter> roundUpParsers,
         List<DateTimeFormatter> parsers
+    ) {
+        this(format, format, wrapFormatter(printer), wrapAllFormatters(roundUpParsers), wrapAllFormatters(parsers), false);
+    }
+
+    private JavaDateFormatter(
+        String format,
+        OpenSearchDateTimePrinter printer,
+        List<OpenSearchDateTimeFormatter> roundUpParsers,
+        List<OpenSearchDateTimeFormatter> parsers
     ) {
         this(format, format, printer, roundUpParsers, parsers, false);
     }
@@ -253,7 +267,7 @@ JavaDateFormatter getRoundupParser() {
         return roundupParser;
     }
 
-    DateTimeFormatter getPrinter() {
+    OpenSearchDateTimePrinter getPrinter() {
         return printer;
     }
 
@@ -265,7 +279,7 @@ public TemporalAccessor parse(String input) {
 
         try {
             return doParse(input);
-        } catch (DateTimeParseException e) {
+        } catch (DateTimeException e) {
             throw new IllegalArgumentException("failed to parse date field [" + input + "] with format [" + format + "]", e);
         }
     }
@@ -289,14 +303,14 @@ private TemporalAccessor doParse(String input) {
             Object object = null;
             if (canCacheLastParsedFormatter && lastParsedformatter != null) {
                 ParsePosition pos = new ParsePosition(0);
-                object = lastParsedformatter.toFormat().parseObject(input, pos);
+                object = lastParsedformatter.parseObject(input, pos);
                 if (parsingSucceeded(object, input, pos)) {
                     return (TemporalAccessor) object;
                 }
             }
-            for (DateTimeFormatter formatter : parsers) {
+            for (OpenSearchDateTimeFormatter formatter : parsers) {
                 ParsePosition pos = new ParsePosition(0);
-                object = formatter.toFormat().parseObject(input, pos);
+                object = formatter.parseObject(input, pos);
                 if (parsingSucceeded(object, input, pos)) {
                     lastParsedformatter = formatter;
                     return (TemporalAccessor) object;
@@ -312,16 +326,28 @@ private boolean parsingSucceeded(Object object, String input, ParsePosition pos)
         return object != null && pos.getIndex() == input.length();
     }
 
+    private static OpenSearchDateTimeFormatter wrapFormatter(DateTimeFormatter formatter) {
+        return new OpenSearchDateTimeFormatter(formatter);
+    }
+
+    private static OpenSearchDateTimeFormatter[] wrapAllFormatters(DateTimeFormatter... formatters) {
+        return Arrays.stream(formatters).map(JavaDateFormatter::wrapFormatter).toArray(OpenSearchDateTimeFormatter[]::new);
+    }
+
+    private static List<OpenSearchDateTimeFormatter> wrapAllFormatters(List<DateTimeFormatter> formatters) {
+        return formatters.stream().map(JavaDateFormatter::wrapFormatter).collect(Collectors.toList());
+    }
+
     @Override
     public DateFormatter withZone(ZoneId zoneId) {
         // shortcurt to not create new objects unnecessarily
         if (zoneId.equals(zone())) {
             return this;
         }
-        List<DateTimeFormatter> parsers = new CopyOnWriteArrayList<>(
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(
             this.parsers.stream().map(p -> p.withZone(zoneId)).collect(Collectors.toList())
         );
-        List<DateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
+        List<OpenSearchDateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
             .stream()
             .map(p -> p.withZone(zoneId))
             .collect(Collectors.toList());
@@ -334,10 +360,10 @@ public DateFormatter withLocale(Locale locale) {
         if (locale.equals(locale())) {
             return this;
         }
-        List<DateTimeFormatter> parsers = new CopyOnWriteArrayList<>(
+        List<OpenSearchDateTimeFormatter> parsers = new ArrayList<>(
             this.parsers.stream().map(p -> p.withLocale(locale)).collect(Collectors.toList())
         );
-        List<DateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
+        List<OpenSearchDateTimeFormatter> roundUpParsers = this.roundupParser.getParsers()
             .stream()
             .map(p -> p.withLocale(locale))
             .collect(Collectors.toList());
@@ -396,7 +422,7 @@ public String toString() {
         return String.format(Locale.ROOT, "format[%s] locale[%s]", format, locale());
     }
 
-    Collection<DateTimeFormatter> getParsers() {
+    Collection<OpenSearchDateTimeFormatter> getParsers() {
         return parsers;
     }
 }
diff --git a/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java
new file mode 100644
index 0000000000000..3a629d8843949
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimeFormatter.java
@@ -0,0 +1,85 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.common.time;
+
+import java.text.Format;
+import java.text.ParsePosition;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalQuery;
+import java.util.Locale;
+
+/**
+* Wrapper class for DateTimeFormatter{@link java.time.format.DateTimeFormatter}
+* to allow for custom implementations for datetime parsing/formatting
+ */
+class OpenSearchDateTimeFormatter implements OpenSearchDateTimePrinter {
+    private final DateTimeFormatter formatter;
+
+    public OpenSearchDateTimeFormatter(String pattern) {
+        this.formatter = DateTimeFormatter.ofPattern(pattern, Locale.ROOT);
+    }
+
+    public OpenSearchDateTimeFormatter(String pattern, Locale locale) {
+        this.formatter = DateTimeFormatter.ofPattern(pattern, locale);
+    }
+
+    public OpenSearchDateTimeFormatter(DateTimeFormatter formatter) {
+        this.formatter = formatter;
+    }
+
+    public OpenSearchDateTimeFormatter withLocale(Locale locale) {
+        return new OpenSearchDateTimeFormatter(getFormatter().withLocale(locale));
+    }
+
+    public OpenSearchDateTimeFormatter withZone(ZoneId zoneId) {
+        return new OpenSearchDateTimeFormatter(getFormatter().withZone(zoneId));
+    }
+
+    public String format(TemporalAccessor temporal) {
+        return this.getFormatter().format(temporal);
+    }
+
+    public TemporalAccessor parse(CharSequence text, ParsePosition position) {
+        return this.getFormatter().parse(text, position);
+    }
+
+    public TemporalAccessor parse(CharSequence text) {
+        return this.getFormatter().parse(text);
+    }
+
+    public <T> T parse(CharSequence text, TemporalQuery<T> query) {
+        return this.getFormatter().parse(text, query);
+    }
+
+    public ZoneId getZone() {
+        return this.getFormatter().getZone();
+    }
+
+    public Locale getLocale() {
+        return this.getFormatter().getLocale();
+    }
+
+    public TemporalAccessor parse(String input) {
+        return formatter.parse(input);
+    }
+
+    public DateTimeFormatter getFormatter() {
+        return formatter;
+    }
+
+    public Format toFormat() {
+        return getFormatter().toFormat();
+    }
+
+    public Object parseObject(String text, ParsePosition pos) {
+        return getFormatter().toFormat().parseObject(text, pos);
+    }
+}
diff --git a/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java
new file mode 100644
index 0000000000000..350bae21b22b1
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/OpenSearchDateTimePrinter.java
@@ -0,0 +1,30 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.common.time;
+
+import java.time.ZoneId;
+import java.time.temporal.TemporalAccessor;
+import java.util.Locale;
+
+/**
+ * Interface for DateTimeFormatter{@link java.time.format.DateTimeFormatter}
+ * to allow for custom implementations for datetime formatting
+ */
+interface OpenSearchDateTimePrinter {
+
+    public OpenSearchDateTimePrinter withLocale(Locale locale);
+
+    public OpenSearchDateTimePrinter withZone(ZoneId zoneId);
+
+    public String format(TemporalAccessor temporal);
+
+    public Locale getLocale();
+
+    public ZoneId getZone();
+}
diff --git a/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java b/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java
new file mode 100644
index 0000000000000..98b87efd2380b
--- /dev/null
+++ b/server/src/main/java/org/opensearch/common/time/RFC3339CompatibleDateTimeFormatter.java
@@ -0,0 +1,428 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+/*
+ * Based on code from the Internet Time Utility project (https://github.com/ethlo/itu) under the Apache License, version 2.0.
+ * Copyright (C) 2017 Morten Haraldsen (ethlo)
+ * Modifications (C) OpenSearch Contributors. All Rights Reserved.
+ */
+
+package org.opensearch.common.time;
+
+import java.text.ParsePosition;
+import java.time.DateTimeException;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+import java.util.Arrays;
+import java.util.Locale;
+
+/**
+ * Defines a close profile of RFC3339 datetime format where the date is mandatory and the time is optional.
+ * <p>
+ * The returned formatter can only be used for parsing, printing is unsupported.
+ * <p>
+ * This parser can parse zoned datetimes.
+ * The parser is strict by default, thus time string {@code 24:00} cannot be parsed.
+ * <p>
+ * It accepts formats described by the following syntax:
+ * <pre>
+ * Year:
+ *       YYYY (eg 1997)
+ *    Year and month:
+ *       YYYY-MM (eg 1997-07)
+ *    Complete date:
+ *       YYYY-MM-DD (eg 1997-07-16)
+ *    Complete date plus hours and minutes:
+ *       YYYY-MM-DDThh:mmTZD (eg 1997-07-16T19:20+01:00)
+ *    Complete date plus hours, minutes and seconds:
+ *       YYYY-MM-DDThh:mm:ssTZD (eg 1997-07-16T19:20:30+01:00)
+ *    Complete date plus hours, minutes, seconds and a decimal fraction of a second
+ *       YYYY-MM-DDThh:mm:ss.sTZD (eg 1997-07-16T19:20:30.45+01:00)
+ *       YYYY-MM-DDThh:mm:ss,sTZD (eg 1997-07-16T19:20:30,45+01:00)
+ * where:
+ *
+ *      YYYY = four-digit year
+ *      MM   = two-digit month (01=January, etc.)
+ *      DD   = two-digit day of month (01 through 31)
+ *      hh   = two digits of hour (00 through 23) (am/pm NOT allowed)
+ *      mm   = two digits of minute (00 through 59)
+ *      ss   = two digits of second (00 through 59)
+ *      s    = one or more(max 9) digits representing a decimal fraction of a second
+ *      TZD  = time zone designator (Z or z or +hh:mm or -hh:mm)
+ * </pre>
+ */
+final class RFC3339CompatibleDateTimeFormatter extends OpenSearchDateTimeFormatter {
+    public static final char DATE_SEPARATOR = '-';
+    public static final char TIME_SEPARATOR = ':';
+    public static final char SEPARATOR_UPPER = 'T';
+    private static final char PLUS = '+';
+    private static final char MINUS = '-';
+    private static final char SEPARATOR_LOWER = 't';
+    private static final char SEPARATOR_SPACE = ' ';
+    private static final char FRACTION_SEPARATOR_1 = '.';
+    private static final char FRACTION_SEPARATOR_2 = ',';
+    private static final char ZULU_UPPER = 'Z';
+    private static final char ZULU_LOWER = 'z';
+
+    private ZoneId zone;
+
+    public RFC3339CompatibleDateTimeFormatter(String pattern) {
+        super(pattern);
+    }
+
+    public RFC3339CompatibleDateTimeFormatter(java.time.format.DateTimeFormatter formatter) {
+        super(formatter);
+    }
+
+    public RFC3339CompatibleDateTimeFormatter(java.time.format.DateTimeFormatter formatter, ZoneId zone) {
+        super(formatter);
+        this.zone = zone;
+    }
+
+    @Override
+    public OpenSearchDateTimeFormatter withZone(ZoneId zoneId) {
+        return new RFC3339CompatibleDateTimeFormatter(getFormatter().withZone(zoneId), zoneId);
+    }
+
+    @Override
+    public OpenSearchDateTimeFormatter withLocale(Locale locale) {
+        return new RFC3339CompatibleDateTimeFormatter(getFormatter().withLocale(locale));
+    }
+
+    @Override
+    public Object parseObject(String text, ParsePosition pos) {
+        try {
+            return parse(text);
+        } catch (DateTimeException e) {
+            return null;
+        }
+    }
+
+    @Override
+    public TemporalAccessor parse(final String dateTime) {
+        OffsetDateTime parsedDatetime = parse(dateTime, new ParsePosition(0));
+        return zone == null ? parsedDatetime : parsedDatetime.atZoneSameInstant(zone);
+    }
+
+    public OffsetDateTime parse(String date, ParsePosition pos) {
+        if (date == null) {
+            throw new IllegalArgumentException("date cannot be null");
+        }
+
+        final int len = date.length() - pos.getIndex();
+        if (len <= 0) {
+            throw new DateTimeParseException("out of bound parse position", date, pos.getIndex());
+        }
+        final char[] chars = date.substring(pos.getIndex()).toCharArray();
+
+        // Date portion
+
+        // YEAR
+        final int years = getYear(chars, pos);
+        if (4 == len) {
+            return OffsetDateTime.of(years, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // MONTH
+        consumeChar(chars, pos, DATE_SEPARATOR);
+        final int months = getMonth(chars, pos);
+        if (7 == len) {
+            return OffsetDateTime.of(years, months, 1, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // DAY
+        consumeChar(chars, pos, DATE_SEPARATOR);
+        final int days = getDay(chars, pos);
+        if (10 == len) {
+            return OffsetDateTime.of(years, months, days, 0, 0, 0, 0, ZoneOffset.UTC);
+        }
+
+        // HOURS
+        consumeChar(chars, pos, SEPARATOR_UPPER, SEPARATOR_LOWER, SEPARATOR_SPACE);
+        final int hours = getHour(chars, pos);
+
+        // MINUTES
+        consumeChar(chars, pos, TIME_SEPARATOR);
+        final int minutes = getMinute(chars, pos);
+        if (16 == len) {
+            throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+        }
+
+        // SECONDS or TIMEZONE
+        return handleTime(chars, pos, years, months, days, hours, minutes);
+    }
+
+    private static boolean isDigit(char c) {
+        return (c >= '0' && c <= '9');
+    }
+
+    private static int digit(char c) {
+        return c - '0';
+    }
+
+    private static int readInt(final char[] strNum, ParsePosition pos, int n) {
+        int start = pos.getIndex(), end = start + n;
+        if (end > strNum.length) {
+            pos.setErrorIndex(end);
+            throw new DateTimeParseException("Unexpected end of expression at position " + strNum.length, new String(strNum), end);
+        }
+
+        int result = 0;
+        for (int i = start; i < end; i++) {
+            final char c = strNum[i];
+            if (isDigit(c) == false) {
+                pos.setErrorIndex(i);
+                throw new DateTimeParseException("Character " + c + " is not a digit", new String(strNum), i);
+            }
+            int digit = digit(c);
+            result = result * 10 + digit;
+        }
+        pos.setIndex(end);
+        return result;
+    }
+
+    private static int readIntUnchecked(final char[] strNum, ParsePosition pos, int n) {
+        int start = pos.getIndex(), end = start + n;
+        int result = 0;
+        for (int i = start; i < end; i++) {
+            final char c = strNum[i];
+            int digit = digit(c);
+            result = result * 10 + digit;
+        }
+        pos.setIndex(end);
+        return result;
+    }
+
+    private static int getHour(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getMinute(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getDay(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static boolean isValidOffset(char[] chars, int offset) {
+        return offset < chars.length;
+    }
+
+    private static void consumeChar(char[] chars, ParsePosition pos, char expected) {
+        int offset = pos.getIndex();
+        if (isValidOffset(chars, offset) == false) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        if (chars[offset] != expected) {
+            throw new DateTimeParseException("Expected character " + expected + " at position " + offset, new String(chars), offset);
+        }
+        pos.setIndex(offset + 1);
+    }
+
+    private static void consumeNextChar(char[] chars, ParsePosition pos) {
+        int offset = pos.getIndex();
+        if (isValidOffset(chars, offset) == false) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+        pos.setIndex(offset + 1);
+    }
+
+    private static boolean checkPositionContains(char[] chars, ParsePosition pos, char... expected) {
+        int offset = pos.getIndex();
+        if (offset >= chars.length) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        boolean found = false;
+        for (char e : expected) {
+            if (chars[offset] == e) {
+                found = true;
+                break;
+            }
+        }
+        return found;
+    }
+
+    private static void consumeChar(char[] chars, ParsePosition pos, char... expected) {
+        int offset = pos.getIndex();
+        if (offset >= chars.length) {
+            throw new DateTimeParseException("Unexpected end of input", new String(chars), offset);
+        }
+
+        boolean found = false;
+        for (char e : expected) {
+            if (chars[offset] == e) {
+                found = true;
+                pos.setIndex(offset + 1);
+                break;
+            }
+        }
+        if (!found) {
+            throw new DateTimeParseException(
+                "Expected character " + Arrays.toString(expected) + " at position " + offset,
+                new String(chars),
+                offset
+            );
+        }
+    }
+
+    private static void assertNoMoreChars(char[] chars, ParsePosition pos) {
+        if (chars.length > pos.getIndex()) {
+            throw new DateTimeParseException("Trailing junk data after position " + pos.getIndex(), new String(chars), pos.getIndex());
+        }
+    }
+
+    private static ZoneOffset parseTimezone(char[] chars, ParsePosition pos) {
+        int offset = pos.getIndex();
+        final int left = chars.length - offset;
+        if (checkPositionContains(chars, pos, ZULU_LOWER, ZULU_UPPER)) {
+            consumeNextChar(chars, pos);
+            assertNoMoreChars(chars, pos);
+            return ZoneOffset.UTC;
+        }
+
+        if (left != 6) {
+            throw new DateTimeParseException("Invalid timezone offset", new String(chars, offset, left), offset);
+        }
+
+        final char sign = chars[offset];
+        consumeNextChar(chars, pos);
+        int hours = getHour(chars, pos);
+        consumeChar(chars, pos, TIME_SEPARATOR);
+        int minutes = getMinute(chars, pos);
+        if (sign == MINUS) {
+            if (hours == 0 && minutes == 0) {
+                throw new DateTimeParseException("Unknown 'Local Offset Convention' date-time not allowed", new String(chars), offset);
+            }
+            hours = -hours;
+            minutes = -minutes;
+        } else if (sign != PLUS) {
+            throw new DateTimeParseException("Invalid character starting at position " + offset, new String(chars), offset);
+        }
+
+        return ZoneOffset.ofHoursMinutes(hours, minutes);
+    }
+
+    private static OffsetDateTime handleTime(char[] chars, ParsePosition pos, int year, int month, int day, int hour, int minute) {
+        switch (chars[pos.getIndex()]) {
+            case TIME_SEPARATOR:
+                consumeChar(chars, pos, TIME_SEPARATOR);
+                return handleSeconds(year, month, day, hour, minute, chars, pos);
+
+            case PLUS:
+            case MINUS:
+            case ZULU_UPPER:
+            case ZULU_LOWER:
+                final ZoneOffset zoneOffset = parseTimezone(chars, pos);
+                return OffsetDateTime.of(year, month, day, hour, minute, 0, 0, zoneOffset);
+        }
+        throw new DateTimeParseException("Unexpected character " + " at position " + pos.getIndex(), new String(chars), pos.getIndex());
+    }
+
+    private static int getMonth(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getYear(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 4);
+    }
+
+    private static int getSeconds(final char[] chars, ParsePosition pos) {
+        return readInt(chars, pos, 2);
+    }
+
+    private static int getFractions(final char[] chars, final ParsePosition pos, final int len) {
+        final int fractions;
+        fractions = readIntUnchecked(chars, pos, len);
+        switch (len) {
+            case 0:
+                throw new DateTimeParseException("Must have at least 1 fraction digit", new String(chars), pos.getIndex());
+            case 1:
+                return fractions * 100_000_000;
+            case 2:
+                return fractions * 10_000_000;
+            case 3:
+                return fractions * 1_000_000;
+            case 4:
+                return fractions * 100_000;
+            case 5:
+                return fractions * 10_000;
+            case 6:
+                return fractions * 1_000;
+            case 7:
+                return fractions * 100;
+            case 8:
+                return fractions * 10;
+            default:
+                return fractions;
+        }
+    }
+
+    public static int indexOfNonDigit(final char[] text, int offset) {
+        for (int i = offset; i < text.length; i++) {
+            if (isDigit(text[i]) == false) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static void consumeDigits(final char[] text, ParsePosition pos) {
+        final int idx = indexOfNonDigit(text, pos.getIndex());
+        if (idx == -1) {
+            pos.setErrorIndex(text.length);
+        } else {
+            pos.setIndex(idx);
+        }
+    }
+
+    private static OffsetDateTime handleSeconds(int year, int month, int day, int hour, int minute, char[] chars, ParsePosition pos) {
+        // From here the specification is more lenient
+        final int seconds = getSeconds(chars, pos);
+        int currPos = pos.getIndex();
+        final int remaining = chars.length - currPos;
+        if (remaining == 0) {
+            // No offset
+            throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+        }
+
+        ZoneOffset offset = null;
+        int fractions = 0;
+        if (remaining == 1 && checkPositionContains(chars, pos, ZULU_LOWER, ZULU_UPPER)) {
+            consumeNextChar(chars, pos);
+            // Do nothing we are done
+            offset = ZoneOffset.UTC;
+            assertNoMoreChars(chars, pos);
+        } else if (remaining >= 1 && checkPositionContains(chars, pos, FRACTION_SEPARATOR_1, FRACTION_SEPARATOR_2)) {
+            // We have fractional seconds;
+            consumeNextChar(chars, pos);
+            ParsePosition initPosition = new ParsePosition(pos.getIndex());
+            consumeDigits(chars, pos);
+            if (pos.getErrorIndex() == -1) {
+                // We have an end of fractions
+                final int len = pos.getIndex() - initPosition.getIndex();
+                fractions = getFractions(chars, initPosition, len);
+                offset = parseTimezone(chars, pos);
+            } else {
+                throw new DateTimeParseException("No timezone offset information", new String(chars), pos.getIndex());
+            }
+        } else if (remaining >= 1 && checkPositionContains(chars, pos, PLUS, MINUS)) {
+            // No fractional sections
+            offset = parseTimezone(chars, pos);
+        } else {
+            throw new DateTimeParseException("Unexpected character at position " + (pos.getIndex()), new String(chars), pos.getIndex());
+        }
+
+        return OffsetDateTime.of(year, month, day, hour, minute, seconds, fractions, offset);
+    }
+}
diff --git a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
index e8ddfde11f4cc..4fd8986d0b428 100644
--- a/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
+++ b/server/src/test/java/org/opensearch/common/joda/JavaJodaTimeDuellingTests.java
@@ -779,7 +779,9 @@ public void testSamePrinterOutput() {
         DateTime jodaDate = new DateTime(year, month, day, hour, minute, second, DateTimeZone.UTC);
 
         for (FormatNames format : FormatNames.values()) {
-            if (format == FormatNames.ISO8601 || format == FormatNames.STRICT_DATE_OPTIONAL_TIME_NANOS) {
+            if (format == FormatNames.ISO8601
+                || format == FormatNames.STRICT_DATE_OPTIONAL_TIME_NANOS
+                || format == FormatNames.RFC3339_LENIENT) {
                 // Nanos aren't supported by joda
                 continue;
             }
diff --git a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
index 681daf1755890..85c9919275c3a 100644
--- a/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
+++ b/server/src/test/java/org/opensearch/common/time/DateFormattersTests.java
@@ -249,10 +249,19 @@ public void testEpochSecondParserWithFraction() {
     }
 
     public void testEpochMilliParsersWithDifferentFormatters() {
-        DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||epoch_millis");
-        TemporalAccessor accessor = formatter.parse("123");
-        assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
-        assertThat(formatter.pattern(), is("strict_date_optional_time||epoch_millis"));
+        {
+            DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||epoch_millis");
+            TemporalAccessor accessor = formatter.parse("123");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
+            assertThat(formatter.pattern(), is("strict_date_optional_time||epoch_millis"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||epoch_millis");
+            TemporalAccessor accessor = formatter.parse("123");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(123L));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||epoch_millis"));
+        }
     }
 
     public void testParsersWithMultipleInternalFormats() throws Exception {
@@ -317,6 +326,11 @@ public void testEqualsAndHashcode() {
         assertThat(epochMillisFormatter.hashCode(), is(DateFormatters.forPattern("epoch_millis").hashCode()));
         assertThat(epochMillisFormatter, sameInstance(DateFormatters.forPattern("epoch_millis")));
         assertThat(epochMillisFormatter, equalTo(DateFormatters.forPattern("epoch_millis")));
+
+        DateFormatter rfc339Formatter = DateFormatters.forPattern("rfc3339_lenient");
+        assertThat(rfc339Formatter.hashCode(), is(DateFormatters.forPattern("rfc3339_lenient").hashCode()));
+        assertThat(rfc339Formatter, sameInstance(DateFormatters.forPattern("rfc3339_lenient")));
+        assertThat(rfc339Formatter, equalTo(DateFormatters.forPattern("rfc3339_lenient")));
     }
 
     public void testSupportBackwardsJava8Format() {
@@ -461,6 +475,132 @@ public void testIso8601Parsing() {
         formatter.format(formatter.parse("2018-05-15T17:14:56,123456789+01:00"));
     }
 
+    public void testRFC3339Parsing() {
+        DateFormatter formatter = DateFormatters.forPattern("rfc3339_lenient");
+
+        // timezone not allowed with just date
+        formatter.format(formatter.parse("2018"));
+        formatter.format(formatter.parse("2018-05"));
+        formatter.format(formatter.parse("2018-05-15"));
+
+        formatter.format(formatter.parse("2018-05-15T17:14Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14z"));
+        formatter.format(formatter.parse("2018-05-15T17:14+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14-01:00"));
+
+        formatter.format(formatter.parse("2018-05-15T17:14:56Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56-01:00"));
+
+        // milliseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123-01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123+01:00"));
+
+        // microseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456+01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456-01:00"));
+
+        // nanoseconds can be separated using comma or decimal point
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456789Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56.123456789-01:00"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789Z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789z"));
+        formatter.format(formatter.parse("2018-05-15T17:14:56,123456789+01:00"));
+
+        // 1994-11-05T08:15:30-05:00 corresponds to November 5, 1994, 8:15:30 am, US Eastern Standard Time/
+        // 1994-11-05T13:15:30Z corresponds to the same instant.
+        final Instant instantA = DateFormatters.from(formatter.parse("1994-11-05T08:15:30-05:00")).toInstant();
+        final Instant instantB = DateFormatters.from(formatter.parse("1994-11-05T13:15:30Z")).toInstant();
+        assertThat(instantA, is(instantB));
+
+        // Invalid dates should throw an exception
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("abc"));
+        assertThat(e.getMessage(), is("failed to parse date field [abc] with format [rfc3339_lenient]"));
+        // Invalid offset
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56-00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56-00:00] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.+00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.+00:00] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56_00:00"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56_00:00] with format [rfc3339_lenient]"));
+        // No offset
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56] with format [rfc3339_lenient]"));
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.123"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.123] with format [rfc3339_lenient]"));
+        // No end of fraction
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.123"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.123] with format [rfc3339_lenient]"));
+        // Invalid fraction
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.abcZ"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.abcZ] with format [rfc3339_lenient]"));
+        // Invalid date
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("201805-15T17:14:56.123456+0000"));
+        assertThat(e.getMessage(), is("failed to parse date field [201805-15T17:14:56.123456+0000] with format [rfc3339_lenient]"));
+        // More than 9 digits of nanosecond resolution
+        e = expectThrows(IllegalArgumentException.class, () -> formatter.parse("2018-05-15T17:14:56.1234567891Z"));
+        assertThat(e.getMessage(), is("failed to parse date field [2018-05-15T17:14:56.1234567891Z] with format [rfc3339_lenient]"));
+    }
+
+    public void testRFC3339ParserWithDifferentFormatters() {
+        {
+            DateFormatter formatter = DateFormatter.forPattern("strict_date_optional_time||rfc3339_lenient");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(1526400896000L));
+            assertThat(formatter.pattern(), is("strict_date_optional_time||rfc3339_lenient"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||strict_date_optional_time");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56.123+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().toEpochMilli(), is(1526400896123L));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||strict_date_optional_time"));
+        }
+
+        {
+            DateFormatter formatter = DateFormatter.forPattern("rfc3339_lenient||strict_date_optional_time");
+            TemporalAccessor accessor = formatter.parse("2018-05-15T17:14:56.123456789+0100");
+            assertThat(DateFormatters.from(accessor).toInstant().getNano(), is(123456789));
+            assertThat(formatter.pattern(), is("rfc3339_lenient||strict_date_optional_time"));
+        }
+    }
+
+    public void testRFC3339ParserAgainstDifferentFormatters() {
+        DateFormatter rfc3339Formatter = DateFormatter.forPattern("rfc3339_lenient");
+        {
+            DateFormatter isoFormatter = DateFormatter.forPattern("strict_date_optional_time");
+
+            assertDateTimeEquals("2018-05-15T17:14Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56.123Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123-01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123-01:00", rfc3339Formatter, isoFormatter);
+
+            assertDateTimeEquals("2018-05-15T17:14:56.123456Z", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123456789+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56.123456789-01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123456789+01:00", rfc3339Formatter, isoFormatter);
+            assertDateTimeEquals("2018-05-15T17:14:56,123456789-01:00", rfc3339Formatter, isoFormatter);
+        }
+    }
+
     public void testRoundupFormatterWithEpochDates() {
         assertRoundupFormatter("epoch_millis", "1234567890", 1234567890L);
         // also check nanos of the epoch_millis formatter if it is rounded up to the nano second
@@ -683,4 +823,10 @@ public void testCamelCaseDeprecation() {
             }
         }
     }
+
+    void assertDateTimeEquals(String toTest, DateFormatter candidateParser, DateFormatter baselineParser) {
+        Instant gotInstant = DateFormatters.from(candidateParser.parse(toTest)).toInstant();
+        Instant expectedInstant = DateFormatters.from(baselineParser.parse(toTest)).toInstant();
+        assertThat(gotInstant, is(expectedInstant));
+    }
 }

From b4306b624e5546dd102a4ed45470564b31d5f3a0 Mon Sep 17 00:00:00 2001
From: Andrew Ross <andrross@amazon.com>
Date: Wed, 24 Jan 2024 18:16:45 -0800
Subject: [PATCH 18/33] Add calling class name to mock log appender (#12013)

Issue #10799 is caused by a stopped or unstarted appender still being
present in the static logger state. I have not been able to find the
improper usage of the log appender that would cause this error. To help
debug, this commit adds the calling class name to the mock log appender.
Any future occurrence should result in an error message with the class
name that incorrected configured the logger.

I've also added an override to the `stop()` method to force that callers
use the close() method that properly cleans up the logger state as
opposed to stopping the appender directly.

Signed-off-by: Andrew Ross <andrross@amazon.com>
---
 .../org/opensearch/test/MockLogAppender.java  | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
index 328aaf8a65b1f..59eda7a665d4c 100644
--- a/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
+++ b/test/framework/src/main/java/org/opensearch/test/MockLogAppender.java
@@ -35,6 +35,7 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.config.Property;
 import org.apache.logging.log4j.core.filter.RegexFilter;
 import org.opensearch.common.logging.Loggers;
 import org.opensearch.common.regex.Regex;
@@ -68,11 +69,19 @@ public class MockLogAppender extends AbstractAppender implements AutoCloseable {
      * write to a closed MockLogAppender instance.
      */
     public static MockLogAppender createForLoggers(Logger... loggers) throws IllegalAccessException {
-        return createForLoggers(".*(\n.*)*", loggers);
+        final String callingClass = Thread.currentThread().getStackTrace()[2].getClassName();
+        return createForLoggersInternal(callingClass, ".*(\n.*)*", loggers);
     }
 
     public static MockLogAppender createForLoggers(String filter, Logger... loggers) throws IllegalAccessException {
+        final String callingClass = Thread.currentThread().getStackTrace()[2].getClassName();
+        return createForLoggersInternal(callingClass, filter, loggers);
+    }
+
+    private static MockLogAppender createForLoggersInternal(String callingClass, String filter, Logger... loggers)
+        throws IllegalAccessException {
         final MockLogAppender appender = new MockLogAppender(
+            callingClass + "-mock-log-appender",
             RegexFilter.createFilter(filter, new String[0], false, null, null),
             Collections.unmodifiableList(Arrays.asList(loggers))
         );
@@ -83,8 +92,8 @@ public static MockLogAppender createForLoggers(String filter, Logger... loggers)
         return appender;
     }
 
-    private MockLogAppender(RegexFilter filter, List<Logger> loggers) {
-        super("mock", filter, null);
+    private MockLogAppender(String name, RegexFilter filter, List<Logger> loggers) {
+        super(name, filter, null, true, Property.EMPTY_ARRAY);
         /*
          * We use a copy-on-write array list since log messages could be appended while we are setting up expectations. When that occurs,
          * we would run into a concurrent modification exception from the iteration over the expectations in #append, concurrent with a
@@ -116,7 +125,14 @@ public void close() {
         for (Logger logger : loggers) {
             Loggers.removeAppender(logger, this);
         }
-        this.stop();
+        super.stop();
+    }
+
+    @Override
+    public void stop() {
+        // MockLogAppender should be used with try-with-resources to ensure
+        // proper clean up ordering and should never be stopped directly.
+        throw new UnsupportedOperationException("Use close() to ensure proper clean up ordering");
     }
 
     public interface LoggingExpectation {

From e017a9c48815aa3f3f2ec199a3a9f5793471b0ae Mon Sep 17 00:00:00 2001
From: Bhumika Saini <sabhumik@amazon.com>
Date: Thu, 25 Jan 2024 18:13:19 +0530
Subject: [PATCH 19/33] Fix limit check for listing S3 objects (#12018)

* Fix limit check for listing S3 objects

Signed-off-by: Bhumika Saini <sabhumik@amazon.com>

* Apply spotless fix

Signed-off-by: Bhumika Saini <sabhumik@amazon.com>

---------

Signed-off-by: Bhumika Saini <sabhumik@amazon.com>
---
 .../org/opensearch/repositories/s3/S3BlobContainer.java  | 2 +-
 .../repositories/s3/S3BlobStoreContainerTests.java       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
index 3a55fcb0bdbcd..25f361b40636e 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
@@ -514,7 +514,7 @@ private static List<ListObjectsV2Response> executeListing(
             for (ListObjectsV2Response listObjectsV2Response : listObjectsIterable) {
                 results.add(listObjectsV2Response);
                 totalObjects += listObjectsV2Response.contents().size();
-                if (limit != -1 && totalObjects > limit) {
+                if (limit != -1 && totalObjects >= limit) {
                     break;
                 }
             }
diff --git a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
index 58ad290a31e85..2b45e9cfe2d4b 100644
--- a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
+++ b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobStoreContainerTests.java
@@ -916,6 +916,15 @@ public void testListBlobsByPrefixInLexicographicOrderWithLimitLessThanPageSize()
         testListBlobsByPrefixInLexicographicOrder(2, 1, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
     }
 
+    /**
+     * Test the boundary value at page size to ensure
+     * unnecessary calls are not made to S3 by fetching the next page.
+     * @throws IOException
+     */
+    public void testListBlobsByPrefixInLexicographicOrderWithLimitEqualToPageSize() throws IOException {
+        testListBlobsByPrefixInLexicographicOrder(5, 1, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
+    }
+
     public void testListBlobsByPrefixInLexicographicOrderWithLimitGreaterThanPageSize() throws IOException {
         testListBlobsByPrefixInLexicographicOrder(8, 2, BlobContainer.BlobNameSortOrder.LEXICOGRAPHIC);
     }

From c1bd7526394f0f1fd5f2b02b2a0f1e35dc337068 Mon Sep 17 00:00:00 2001
From: Rishikesh Pasham <62345295+Rishikesh1159@users.noreply.github.com>
Date: Thu, 25 Jan 2024 05:03:40 -0800
Subject: [PATCH 20/33] [Searchable Snapshot] Add Relevant Error handling for
 Index Creation with remote_snapshot. (#11867)

* Block index creation when setting property index.store.type to remote_snaphot

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Adding null check.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* fix failing test

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* remove unnecessary test.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Address comments on PR.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Resolve conflicts on PR.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

* Add changelog entry.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>

---------

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
Signed-off-by: Rishikesh Pasham <62345295+Rishikesh1159@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../metadata/MetadataCreateIndexService.java  | 12 +++++++
 .../MetadataCreateIndexServiceTests.java      | 32 +++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa7675edb8cc4..1f847cf3a70ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -242,6 +242,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix tracing context propagation for local transport instrumentation ([#11490](https://github.com/opensearch-project/OpenSearch/pull/11490))
 - Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
 - Fix memory leak issue in ReorganizingLongHash ([#11953](https://github.com/opensearch-project/OpenSearch/issues/11953))
+- Prevent setting remote_snapshot store type on index creation ([#11867](https://github.com/opensearch-project/OpenSearch/pull/11867))
 
 ### Security
 
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
index 3384393d8feaf..4dde5d0ea013f 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/MetadataCreateIndexService.java
@@ -39,6 +39,7 @@
 import org.opensearch.OpenSearchException;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.Version;
+import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest;
 import org.opensearch.action.admin.indices.shrink.ResizeType;
@@ -135,6 +136,7 @@
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REMOTE_TRANSLOG_STORE_REPOSITORY;
 import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_REPLICATION_TYPE;
 import static org.opensearch.cluster.metadata.Metadata.DEFAULT_REPLICA_COUNT_SETTING;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.indices.IndicesService.CLUSTER_REPLICATION_TYPE_SETTING;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.isRemoteStoreAttributePresent;
 
@@ -816,6 +818,16 @@ static Settings aggregateIndexSettings(
         final Settings.Builder requestSettings = Settings.builder().put(request.settings());
 
         final Settings.Builder indexSettingsBuilder = Settings.builder();
+
+        // Store type of `remote_snapshot` is intended to be system-managed for searchable snapshot indexes so a special case is needed here
+        // to prevent a user specifying this value when creating an index
+        String storeTypeSetting = request.settings().get(INDEX_STORE_TYPE_SETTING.getKey());
+        if (storeTypeSetting != null && storeTypeSetting.equals(RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT.toString())) {
+            throw new IllegalArgumentException(
+                "cannot create index with index setting \"index.store.type\" set to \"remote_snapshot\". Store type can be set to \"remote_snapshot\" only when restoring a remote snapshot by using \"storage_type\": \"remote_snapshot\""
+            );
+        }
+
         if (sourceMetadata == null) {
             final Settings.Builder additionalIndexSettings = Settings.builder();
             final Settings templateAndRequestSettings = Settings.builder().put(combinedTemplateSettings).put(request.settings()).build();
diff --git a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
index cea151748bfb6..6d1f359d210ac 100644
--- a/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/metadata/MetadataCreateIndexServiceTests.java
@@ -35,6 +35,7 @@
 import org.opensearch.ExceptionsHelper;
 import org.opensearch.ResourceAlreadyExistsException;
 import org.opensearch.Version;
+import org.opensearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
 import org.opensearch.action.admin.indices.alias.Alias;
 import org.opensearch.action.admin.indices.create.CreateIndexClusterStateUpdateRequest;
 import org.opensearch.action.admin.indices.shrink.ResizeType;
@@ -133,6 +134,7 @@
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.getIndexNumberOfRoutingShards;
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.parseV1Mappings;
 import static org.opensearch.cluster.metadata.MetadataCreateIndexService.resolveAndValidateAliases;
+import static org.opensearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_REFRESH_INTERVAL_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_REMOTE_TRANSLOG_BUFFER_INTERVAL_SETTING;
 import static org.opensearch.index.IndexSettings.INDEX_SOFT_DELETES_SETTING;
@@ -146,6 +148,7 @@
 import static org.opensearch.node.Node.NODE_ATTRIBUTES;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_SEGMENT_REPOSITORY_NAME_ATTRIBUTE_KEY;
 import static org.opensearch.node.remotestore.RemoteStoreNodeAttribute.REMOTE_STORE_TRANSLOG_REPOSITORY_NAME_ATTRIBUTE_KEY;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasKey;
@@ -1936,6 +1939,35 @@ public void testRequestDurabilityWhenRestrictSettingTrue() {
         assertEquals(Translog.Durability.REQUEST, INDEX_TRANSLOG_DURABILITY_SETTING.get(indexSettings));
     }
 
+    public void testIndexCreationWithIndexStoreTypeRemoteStoreThrowsException() {
+        // This checks that aggregateIndexSettings throws exception for the case when the index setting
+        // index.store.type is set to remote_snapshot
+        request = new CreateIndexClusterStateUpdateRequest("create index", "test", "test");
+        final Settings.Builder requestSettings = Settings.builder();
+        requestSettings.put(INDEX_STORE_TYPE_SETTING.getKey(), RestoreSnapshotRequest.StorageType.REMOTE_SNAPSHOT);
+        request.settings(requestSettings.build());
+        final IllegalArgumentException error = expectThrows(
+            IllegalArgumentException.class,
+            () -> aggregateIndexSettings(
+                ClusterState.EMPTY_STATE,
+                request,
+                Settings.EMPTY,
+                null,
+                Settings.EMPTY,
+                IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
+                randomShardLimitService(),
+                Collections.emptySet(),
+                clusterSettings
+            )
+        );
+        assertThat(
+            error.getMessage(),
+            containsString(
+                "cannot create index with index setting \"index.store.type\" set to \"remote_snapshot\". Store type can be set to \"remote_snapshot\" only when restoring a remote snapshot by using \"storage_type\": \"remote_snapshot\""
+            )
+        );
+    }
+
     private IndexTemplateMetadata addMatchingTemplate(Consumer<IndexTemplateMetadata.Builder> configurator) {
         IndexTemplateMetadata.Builder builder = templateMetadataBuilder("template1", "te*");
         configurator.accept(builder);

From 9f649e03a68b069089600ced6aa566a1de95d79b Mon Sep 17 00:00:00 2001
From: panguixin <panguixin@bytedance.com>
Date: Fri, 26 Jan 2024 06:50:37 +0800
Subject: [PATCH 21/33] [BUG] Fix remote shards balancer when filtering
 throttled nodes (#11724)

* fix remote shards balancer

Signed-off-by: panguixin <panguixin@bytedance.com>

* add change log

Signed-off-by: panguixin <panguixin@bytedance.com>

---------

Signed-off-by: panguixin <panguixin@bytedance.com>
Signed-off-by: Andrew Ross <andrross@amazon.com>
Co-authored-by: Andrew Ross <andrross@amazon.com>
---
 CHANGELOG.md                                  |  1 +
 .../allocator/RemoteShardsBalancer.java       | 22 ++++++++++++++-----
 .../RemoteShardsBalancerBaseTestCase.java     |  5 +++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f847cf3a70ef..aa31819ffae97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -243,6 +243,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix parsing of single line comments in `lang-painless` ([#11815](https://github.com/opensearch-project/OpenSearch/issues/11815))
 - Fix memory leak issue in ReorganizingLongHash ([#11953](https://github.com/opensearch-project/OpenSearch/issues/11953))
 - Prevent setting remote_snapshot store type on index creation ([#11867](https://github.com/opensearch-project/OpenSearch/pull/11867))
+- [BUG] Fix remote shards balancer when filtering throttled nodes ([#11724](https://github.com/opensearch-project/OpenSearch/pull/11724))
 
 ### Security
 
diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
index e2f24e5f503df..a05938c176678 100644
--- a/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
+++ b/server/src/main/java/org/opensearch/cluster/routing/allocation/allocator/RemoteShardsBalancer.java
@@ -43,6 +43,8 @@ public final class RemoteShardsBalancer extends ShardsBalancer {
     private final Logger logger;
     private final RoutingAllocation allocation;
     private final RoutingNodes routingNodes;
+    // indicates if there are any nodes being throttled for allocating any unassigned shards
+    private boolean anyNodesThrottled = false;
 
     public RemoteShardsBalancer(Logger logger, RoutingAllocation allocation) {
         this.logger = logger;
@@ -358,12 +360,16 @@ private void allocateUnassignedReplicas(Queue<RoutingNode> nodeQueue, Map<String
     }
 
     private void ignoreRemainingShards(Map<String, UnassignedIndexShards> unassignedShardMap) {
+        // If any nodes are throttled during allocation, mark all remaining unassigned shards as THROTTLED
+        final UnassignedInfo.AllocationStatus status = anyNodesThrottled
+            ? UnassignedInfo.AllocationStatus.DECIDERS_THROTTLED
+            : UnassignedInfo.AllocationStatus.DECIDERS_NO;
         for (UnassignedIndexShards indexShards : unassignedShardMap.values()) {
             for (ShardRouting shard : indexShards.getPrimaries()) {
-                routingNodes.unassigned().ignoreShard(shard, UnassignedInfo.AllocationStatus.DECIDERS_NO, allocation.changes());
+                routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
             }
             for (ShardRouting shard : indexShards.getReplicas()) {
-                routingNodes.unassigned().ignoreShard(shard, UnassignedInfo.AllocationStatus.DECIDERS_NO, allocation.changes());
+                routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
             }
         }
     }
@@ -424,11 +430,11 @@ private void allocateUnassignedShards(
     private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouting shard) {
         boolean allocated = false;
         boolean throttled = false;
-        Set<String> nodesCheckedForShard = new HashSet<>();
+        int numNodesToCheck = nodeQueue.size();
         while (nodeQueue.isEmpty() == false) {
             RoutingNode node = nodeQueue.poll();
+            --numNodesToCheck;
             Decision allocateDecision = allocation.deciders().canAllocate(shard, node, allocation);
-            nodesCheckedForShard.add(node.nodeId());
             if (allocateDecision.type() == Decision.Type.YES) {
                 if (logger.isTraceEnabled()) {
                     logger.trace("Assigned shard [{}] to [{}]", shardShortSummary(shard), node.nodeId());
@@ -467,6 +473,10 @@ private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouti
                     }
                     nodeQueue.offer(node);
                 } else {
+                    if (nodeLevelDecision.type() == Decision.Type.THROTTLE) {
+                        anyNodesThrottled = true;
+                    }
+
                     if (logger.isTraceEnabled()) {
                         logger.trace(
                             "Cannot allocate any shard to node: [{}]. Removing from queue. Node level decisions: [{}],[{}]",
@@ -478,14 +488,14 @@ private void tryAllocateUnassignedShard(Queue<RoutingNode> nodeQueue, ShardRouti
                 }
 
                 // Break out if all nodes in the queue have been checked for this shard
-                if (nodeQueue.stream().allMatch(rn -> nodesCheckedForShard.contains(rn.nodeId()))) {
+                if (numNodesToCheck == 0) {
                     break;
                 }
             }
         }
 
         if (allocated == false) {
-            UnassignedInfo.AllocationStatus status = throttled
+            UnassignedInfo.AllocationStatus status = (throttled || anyNodesThrottled)
                 ? UnassignedInfo.AllocationStatus.DECIDERS_THROTTLED
                 : UnassignedInfo.AllocationStatus.DECIDERS_NO;
             routingNodes.unassigned().ignoreShard(shard, status, allocation.changes());
diff --git a/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java b/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
index a1db6cd83ab6c..6a03a1f79bcde 100644
--- a/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
+++ b/server/src/test/java/org/opensearch/cluster/routing/allocation/RemoteShardsBalancerBaseTestCase.java
@@ -229,6 +229,11 @@ public Decision canAllocate(ShardRouting shardRouting, RoutingNode node, Routing
                     return Decision.ALWAYS;
                 }
             }
+
+            @Override
+            public Decision canAllocateAnyShardToNode(RoutingNode node, RoutingAllocation allocation) {
+                return throttle ? Decision.THROTTLE : Decision.YES;
+            }
         });
         Collections.shuffle(deciders, random());
         return new AllocationDeciders(deciders);

From 6e744f591a972e1217096802cc2e6f43eb701c2d Mon Sep 17 00:00:00 2001
From: Sachin Kale <sachinpkale@gmail.com>
Date: Sat, 27 Jan 2024 01:09:25 +0530
Subject: [PATCH 22/33] Fetch all the locks for a shard to avoid multiple
 remote store calls (#11987)

* Fetch all the locks for a shard to avoid multiple calls

Signed-off-by: Sachin Kale <kalsac@amazon.com>

* Fix lock file comparison issue

Signed-off-by: Sachin Kale <kalsac@amazon.com>

* Add unit tests

Signed-off-by: Sachin Kale <kalsac@amazon.com>

* Add more unit tests

Signed-off-by: Sachin Kale <kalsac@amazon.com>

* Address PR comments

Signed-off-by: Sachin Kale <kalsac@amazon.com>

---------

Signed-off-by: Sachin Kale <kalsac@amazon.com>
Co-authored-by: Sachin Kale <kalsac@amazon.com>
---
 .../store/RemoteSegmentStoreDirectory.java    | 26 +++++-----
 .../RemoteStoreMetadataLockManager.java       |  8 +++-
 .../RemoteSegmentStoreDirectoryTests.java     | 47 +++++++++++++++++++
 .../RemoteStoreMetadataLockManagerTests.java  | 23 +++++++++
 4 files changed, 88 insertions(+), 16 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
index 9c1e902606cab..dab99fd25b192 100644
--- a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
+++ b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
@@ -164,7 +164,7 @@ public RemoteSegmentMetadata init() throws IOException {
      */
     public RemoteSegmentMetadata initializeToSpecificCommit(long primaryTerm, long commitGeneration, String acquirerId) throws IOException {
         String metadataFilePrefix = MetadataFilenameUtils.getMetadataFilePrefixForCommit(primaryTerm, commitGeneration);
-        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLock(metadataFilePrefix, acquirerId);
+        String metadataFile = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFile(metadataFilePrefix, acquirerId);
         RemoteSegmentMetadata remoteSegmentMetadata = readMetadataFile(metadataFile);
         if (remoteSegmentMetadata != null) {
             this.segmentsUploadedToRemoteStore = new ConcurrentHashMap<>(remoteSegmentMetadata.getMetadata());
@@ -749,20 +749,16 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
             lastNMetadataFilesToKeep,
             sortedMetadataFileList.size()
         );
-        List<String> metadataFilesToBeDeleted = metadataFilesEligibleToDelete.stream().filter(metadataFile -> {
-            try {
-                return !isLockAcquired(metadataFile);
-            } catch (IOException e) {
-                logger.error(
-                    "skipping metadata file ("
-                        + metadataFile
-                        + ") deletion for this run,"
-                        + " as checking lock for metadata is failing with error: "
-                        + e
-                );
-                return false;
-            }
-        }).collect(Collectors.toList());
+        Set<String> allLockFiles;
+        try {
+            allLockFiles = ((RemoteStoreMetadataLockManager) mdLockManager).fetchLockedMetadataFiles(MetadataFilenameUtils.METADATA_PREFIX);
+        } catch (Exception e) {
+            logger.error("Exception while fetching segment metadata lock files, skipping deleteStaleSegments", e);
+            return;
+        }
+        List<String> metadataFilesToBeDeleted = metadataFilesEligibleToDelete.stream()
+            .filter(metadataFile -> allLockFiles.contains(metadataFile) == false)
+            .collect(Collectors.toList());
 
         sortedMetadataFileList.removeAll(metadataFilesToBeDeleted);
         logger.debug(
diff --git a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
index 5ebd00f59ef49..9c29e03c225e4 100644
--- a/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
+++ b/server/src/main/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManager.java
@@ -21,6 +21,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -75,7 +76,7 @@ public void release(LockInfo lockInfo) throws IOException {
         }
     }
 
-    public String fetchLock(String filenamePrefix, String acquirerId) throws IOException {
+    public String fetchLockedMetadataFile(String filenamePrefix, String acquirerId) throws IOException {
         Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
         List<String> lockFilesForAcquirer = lockFiles.stream()
             .filter(lockFile -> acquirerId.equals(FileLockInfo.LockFileUtils.getAcquirerIdFromLock(lockFile)))
@@ -88,6 +89,11 @@ public String fetchLock(String filenamePrefix, String acquirerId) throws IOExcep
         return lockFilesForAcquirer.get(0);
     }
 
+    public Set<String> fetchLockedMetadataFiles(String filenamePrefix) throws IOException {
+        Collection<String> lockFiles = lockDirectory.listFilesByPrefix(filenamePrefix);
+        return lockFiles.stream().map(FileLockInfo.LockFileUtils::getFileToLockNameFromLock).collect(Collectors.toSet());
+    }
+
     /**
      * Checks whether a given file have any lock on it or not.
      * @param lockInfo File Lock Info instance for which we need to check if lock is acquired.
diff --git a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
index 2c6c4afed69fd..7944ee681f5fc 100644
--- a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
+++ b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
@@ -988,6 +988,53 @@ public void testDeleteStaleCommitsActualDelete() throws Exception {
         verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
     }
 
+    public void testDeleteStaleCommitsActualDeleteWithLocks() throws Exception {
+        Map<String, Map<String, String>> metadataFilenameContentMapping = populateMetadata();
+        remoteSegmentStoreDirectory.init();
+
+        // Locking one of the metadata files to ensure that it is not getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        for (String metadata : metadataFilenameContentMapping.get(metadataFilename3).values()) {
+            String uploadedFilename = metadata.split(RemoteSegmentStoreDirectory.UploadedSegmentMetadata.SEPARATOR)[1];
+            verify(remoteDataDirectory).deleteFile(uploadedFilename);
+        }
+        assertBusy(() -> assertThat(remoteSegmentStoreDirectory.canDeleteStaleCommits.get(), is(true)));
+        verify(remoteMetadataDirectory).deleteFile(metadataFilename3);
+        verify(remoteMetadataDirectory, times(0)).deleteFile(metadataFilename2);
+    }
+
+    public void testDeleteStaleCommitsNoDeletesDueToLocks() throws Exception {
+        remoteSegmentStoreDirectory.init();
+
+        // Locking all the old metadata files to ensure that none of the segment files are getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenReturn(Set.of(metadataFilename2, metadataFilename3));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        assertBusy(() -> assertThat(remoteSegmentStoreDirectory.canDeleteStaleCommits.get(), is(true)));
+        verify(remoteMetadataDirectory, times(0)).deleteFile(any());
+    }
+
+    public void testDeleteStaleCommitsExceptionWhileFetchingLocks() throws Exception {
+        remoteSegmentStoreDirectory.init();
+
+        // Locking one of the metadata files to ensure that it is not getting deleted.
+        when(mdLockManager.fetchLockedMetadataFiles(any())).thenThrow(new RuntimeException("Rate limit exceeded"));
+
+        // popluateMetadata() adds stub to return 3 metadata files
+        // We are passing lastNMetadataFilesToKeep=2 here so that oldest 1 metadata file will be deleted
+        remoteSegmentStoreDirectory.deleteStaleSegmentsAsync(1);
+
+        verify(remoteMetadataDirectory, times(0)).deleteFile(any());
+    }
+
     public void testDeleteStaleCommitsDeleteDedup() throws Exception {
         Map<String, Map<String, String>> metadataFilenameContentMapping = new HashMap<>(populateMetadata());
         metadataFilenameContentMapping.put(metadataFilename4, metadataFilenameContentMapping.get(metadataFilename3));
diff --git a/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java b/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
index b4eac2c4548d5..299100b65a43e 100644
--- a/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
+++ b/server/src/test/java/org/opensearch/index/store/lockmanager/RemoteStoreMetadataLockManagerTests.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Set;
 
 import junit.framework.TestCase;
 
@@ -96,4 +97,26 @@ public void testIsAcquiredExceptionCase() { // metadata file is not passed durin
         FileLockInfo testLockInfo = FileLockInfo.getLockInfoBuilder().withAcquirerId(testAcquirerId).build();
         assertThrows(IllegalArgumentException.class, () -> remoteStoreMetadataLockManager.isAcquired(testLockInfo));
     }
+
+    public void testFetchLocksEmpty() throws IOException {
+        when(lockDirectory.listFilesByPrefix("metadata")).thenReturn(Set.of());
+        assertEquals(0, remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata").size());
+    }
+
+    public void testFetchLocksNonEmpty() throws IOException {
+        String metadata1 = "metadata_1_2_3";
+        String metadata2 = "metadata_4_5_6";
+        when(lockDirectory.listFilesByPrefix("metadata")).thenReturn(
+            Set.of(
+                FileLockInfo.LockFileUtils.generateLockName(metadata1, "snapshot1"),
+                FileLockInfo.LockFileUtils.generateLockName(metadata2, "snapshot2")
+            )
+        );
+        assertEquals(Set.of(metadata1, metadata2), remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
+    }
+
+    public void testFetchLocksException() throws IOException {
+        when(lockDirectory.listFilesByPrefix("metadata")).thenThrow(new IOException("Something went wrong"));
+        assertThrows(IOException.class, () -> remoteStoreMetadataLockManager.fetchLockedMetadataFiles("metadata"));
+    }
 }

From 2001d5960133958f359f5713030bc279469d0070 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Fri, 26 Jan 2024 14:53:49 -0500
Subject: [PATCH 23/33] Bump Netty to 4.1.106.Final (#12034)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 CHANGELOG.md                                                    | 2 +-
 buildSrc/version.properties                                     | 2 +-
 .../licenses/netty-buffer-4.1.104.Final.jar.sha1                | 1 -
 .../licenses/netty-buffer-4.1.106.Final.jar.sha1                | 1 +
 .../licenses/netty-codec-4.1.104.Final.jar.sha1                 | 1 -
 .../licenses/netty-codec-4.1.106.Final.jar.sha1                 | 1 +
 .../licenses/netty-codec-http-4.1.104.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.106.Final.jar.sha1            | 1 +
 .../licenses/netty-codec-http2-4.1.104.Final.jar.sha1           | 1 -
 .../licenses/netty-codec-http2-4.1.106.Final.jar.sha1           | 1 +
 .../licenses/netty-common-4.1.104.Final.jar.sha1                | 1 -
 .../licenses/netty-common-4.1.106.Final.jar.sha1                | 1 +
 .../licenses/netty-handler-4.1.104.Final.jar.sha1               | 1 -
 .../licenses/netty-handler-4.1.106.Final.jar.sha1               | 1 +
 .../licenses/netty-resolver-4.1.104.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.106.Final.jar.sha1              | 1 +
 .../licenses/netty-transport-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.106.Final.jar.sha1             | 1 +
 .../netty-transport-native-unix-common-4.1.104.Final.jar.sha1   | 1 -
 .../netty-transport-native-unix-common-4.1.106.Final.jar.sha1   | 1 +
 .../licenses/netty-codec-dns-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-codec-dns-4.1.106.Final.jar.sha1             | 1 +
 .../licenses/netty-codec-http2-4.1.104.Final.jar.sha1           | 1 -
 .../licenses/netty-codec-http2-4.1.106.Final.jar.sha1           | 1 +
 .../licenses/netty-codec-socks-4.1.104.Final.jar.sha1           | 1 -
 .../licenses/netty-codec-socks-4.1.106.Final.jar.sha1           | 1 +
 .../licenses/netty-handler-proxy-4.1.104.Final.jar.sha1         | 1 -
 .../licenses/netty-handler-proxy-4.1.106.Final.jar.sha1         | 1 +
 .../licenses/netty-resolver-dns-4.1.104.Final.jar.sha1          | 1 -
 .../licenses/netty-resolver-dns-4.1.106.Final.jar.sha1          | 1 +
 .../netty-transport-native-unix-common-4.1.104.Final.jar.sha1   | 1 -
 .../netty-transport-native-unix-common-4.1.106.Final.jar.sha1   | 1 +
 .../repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1   | 1 -
 .../repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1   | 1 +
 .../repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1  | 1 -
 .../repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1  | 1 +
 .../repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1   | 1 -
 .../repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1   | 1 +
 .../licenses/netty-codec-http-4.1.104.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.106.Final.jar.sha1            | 1 +
 .../licenses/netty-codec-http2-4.1.104.Final.jar.sha1           | 1 -
 .../licenses/netty-codec-http2-4.1.106.Final.jar.sha1           | 1 +
 .../repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1  | 1 -
 .../repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1  | 1 +
 .../repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1 | 1 -
 .../repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1 | 1 +
 .../licenses/netty-resolver-4.1.104.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.106.Final.jar.sha1              | 1 +
 .../licenses/netty-transport-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.106.Final.jar.sha1             | 1 +
 .../netty-transport-classes-epoll-4.1.104.Final.jar.sha1        | 1 -
 .../netty-transport-classes-epoll-4.1.106.Final.jar.sha1        | 1 +
 .../netty-transport-native-unix-common-4.1.104.Final.jar.sha1   | 1 -
 .../netty-transport-native-unix-common-4.1.106.Final.jar.sha1   | 1 +
 .../transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1  | 1 -
 .../transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1  | 1 +
 .../transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1   | 1 -
 .../transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1   | 1 +
 .../licenses/netty-codec-http-4.1.104.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.106.Final.jar.sha1            | 1 +
 .../transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1  | 1 -
 .../transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1  | 1 +
 .../transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1 | 1 -
 .../transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1 | 1 +
 .../licenses/netty-resolver-4.1.104.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.106.Final.jar.sha1              | 1 +
 .../licenses/netty-transport-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.106.Final.jar.sha1             | 1 +
 .../licenses/netty-buffer-4.1.104.Final.jar.sha1                | 1 -
 .../licenses/netty-buffer-4.1.106.Final.jar.sha1                | 1 +
 .../licenses/netty-codec-4.1.104.Final.jar.sha1                 | 1 -
 .../licenses/netty-codec-4.1.106.Final.jar.sha1                 | 1 +
 .../licenses/netty-codec-dns-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-codec-dns-4.1.106.Final.jar.sha1             | 1 +
 .../licenses/netty-codec-http-4.1.104.Final.jar.sha1            | 1 -
 .../licenses/netty-codec-http-4.1.106.Final.jar.sha1            | 1 +
 .../licenses/netty-codec-http2-4.1.104.Final.jar.sha1           | 1 -
 .../licenses/netty-codec-http2-4.1.106.Final.jar.sha1           | 1 +
 .../licenses/netty-common-4.1.104.Final.jar.sha1                | 1 -
 .../licenses/netty-common-4.1.106.Final.jar.sha1                | 1 +
 .../licenses/netty-handler-4.1.104.Final.jar.sha1               | 1 -
 .../licenses/netty-handler-4.1.106.Final.jar.sha1               | 1 +
 .../licenses/netty-resolver-4.1.104.Final.jar.sha1              | 1 -
 .../licenses/netty-resolver-4.1.106.Final.jar.sha1              | 1 +
 .../licenses/netty-resolver-dns-4.1.104.Final.jar.sha1          | 1 -
 .../licenses/netty-resolver-dns-4.1.106.Final.jar.sha1          | 1 +
 .../licenses/netty-transport-4.1.104.Final.jar.sha1             | 1 -
 .../licenses/netty-transport-4.1.106.Final.jar.sha1             | 1 +
 .../netty-transport-native-unix-common-4.1.104.Final.jar.sha1   | 1 -
 .../netty-transport-native-unix-common-4.1.106.Final.jar.sha1   | 1 +
 90 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
 delete mode 100644 modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
 create mode 100644 modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa31819ffae97..b07373c0fd188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -152,7 +152,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `stefanzweifel/git-auto-commit-action` from 4 to 5 ([#11171](https://github.com/opensearch-project/OpenSearch/pull/11171))
 - Bump `actions/github-script` from 6 to 7 ([#11271](https://github.com/opensearch-project/OpenSearch/pull/11271))
 - Bump `jackson` and `jackson_databind` from 2.15.2 to 2.16.0 ([#11273](https://github.com/opensearch-project/OpenSearch/pull/11273))
-- Bump `netty` from 4.1.100.Final to 4.1.104.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775))
+- Bump `netty` from 4.1.100.Final to 4.1.106.Final ([#11294](https://github.com/opensearch-project/OpenSearch/pull/11294), [#11775](https://github.com/opensearch-project/OpenSearch/pull/11775)), [#12034](https://github.com/opensearch-project/OpenSearch/pull/12034))
 - Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.16.12 to 0.17.6 ([#10163](https://github.com/opensearch-project/OpenSearch/pull/10163), [#11692](https://github.com/opensearch-project/OpenSearch/pull/11692))
 - Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
 - Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 8f8e445b04437..2dbb10a8231d9 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -26,7 +26,7 @@ jakarta_annotation = 1.3.5
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.13.0
 
-netty             = 4.1.104.Final
+netty             = 4.1.106.Final
 joda              = 2.12.2
 
 # project reactor
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/modules/transport-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/modules/transport-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/modules/transport-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/modules/transport-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/modules/transport-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/modules/transport-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 0232fc58f9357..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..005cc2388bd89
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+9d4b3315bb625ec2d73fa569fb6bce4589243d5e
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
deleted file mode 100644
index 3b6cd3524d978..0000000000000
--- a/plugins/repository-azure/licenses/netty-codec-socks-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5b126ceba61275f38297cacd5ea0cd6d3addee04
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..4fc3f5c43edb0
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-codec-socks-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+129f9bd6aa0cf28bfd7d45a8b6a598eed9c67702
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9d01e814971f2..0000000000000
--- a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-50a2d899a8f8a68daed1a9b6d7750184310cc45f
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..3dcfa7f26db06
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-handler-proxy-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+bffc88b7c56d7b553453e4244247a1b0ba1fdc8a
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 987b524aedc98..0000000000000
--- a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..0617c6999c586
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+3970474ed55aa1e3e8de5a5602c342c6b8155371
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/repository-azure/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9110503f67304..0000000000000
--- a/plugins/repository-hdfs/licenses/netty-all-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d75246285e5fac6f6dad47e387ed4f46f36e521d
\ No newline at end of file
diff --git a/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1 b/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..f9affd7887093
--- /dev/null
+++ b/plugins/repository-hdfs/licenses/netty-all-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+6ec5bd2be65d5529e58e9e482b747c1135b3736b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/repository-s3/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/repository-s3/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/repository-s3/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/repository-s3/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/repository-s3/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
deleted file mode 100644
index 522d85a3bf12e..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-700fdbabab44709b0eccffe8f91c4226a5787356
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..58b668b7e80a9
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-classes-epoll-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c058d5c712e00e8560e519970b3d27747778b8f2
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/repository-s3/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/transport-nio/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/transport-nio/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/transport-nio/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/transport-nio/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/transport-nio/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/transport-nio/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/transport-nio/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
deleted file mode 100644
index 30f215e47f8ad..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-756797174b94a3aee11ce83522473f3c18287a43
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..1f170375e9347
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-buffer-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+c5495ba59a627641b3a7c23f6bcb801874c7f7b0
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
deleted file mode 100644
index 9ed9b896d4b4e..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f51fcfd3baac88b2c0b8dc715932ad5622d17429
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..a75ea81b7ee03
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+025171b63aa1e7a5fd8a7e4e660d6d3110241ea7
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 0232fc58f9357..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8e237ce67ab230ed1ba749d6651b278333c21b3f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..005cc2388bd89
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+9d4b3315bb625ec2d73fa569fb6bce4589243d5e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
deleted file mode 100644
index 478e7cfba1470..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2db1556de1b8dc07695604bf51a0a133263ad63f
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..7f5d1adbff740
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+21a07cdf0fc46b313fe2248f1275cdbdac0ba87b
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
deleted file mode 100644
index f0242709f34f7..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5bb757929f7c4d1bf12740a378a99643caaad1ac
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..c4a0c1fae8e24
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-codec-http2-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+41515e8c51eeaaddceabdb4f86fbc5dbfc25b70e
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 1b533eea3b3b3..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ec5fc4a7c5475eb20805e14f7274aa28872b5ba1
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bda8b9376e992
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+132defb4689f41b51b483b7202b22b6e89fe35fd
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
deleted file mode 100644
index 70777be4dc636..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-18c0e659950cdef5f12c36eccfa14cbd2ad2049d
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..749cc807bcce2
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-handler-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+874c970c4ff958b1140dde52bc17e6a9e7cde662
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
deleted file mode 100644
index d7c15af9312fe..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-dfa4fe5c3a6eabb7af09902eb63266829876d8a2
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..bd160c07ad0ff
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+e185ae573db04939215f94d6ba869758dcecbde9
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
deleted file mode 100644
index 987b524aedc98..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f1210e5856fecb9182d58c0d33fa6e946b344b40
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..0617c6999c586
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-resolver-dns-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+3970474ed55aa1e3e8de5a5602c342c6b8155371
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
deleted file mode 100644
index 5cacaf11a29ce..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-da7b263b6fedc5add70e78ee8927c8bd2b9bb589
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..2dab4bff2cc0e
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+8fcca44ae16b98e15965093e7696832019fd6f27
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
deleted file mode 100644
index 64797bf11aedc..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.104.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d4da9f7237ac3ac292891e0b2d5364acbce128cf
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1 b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
new file mode 100644
index 0000000000000..b4b977fdad7de
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/netty-transport-native-unix-common-4.1.106.Final.jar.sha1
@@ -0,0 +1 @@
+2da179bd95903f0fa73218b8f0d02690c0cfbc94
\ No newline at end of file

From 92afd67c570a779cb33846c9359b0cbd6fe56753 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Fri, 26 Jan 2024 14:54:51 -0500
Subject: [PATCH 24/33] Update Mockito to 5.10.0 (#12036)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 buildSrc/version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index 2dbb10a8231d9..a7c0622e7d293 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -55,7 +55,7 @@ bouncycastle=1.76
 randomizedrunner  = 2.7.1
 junit             = 4.13.2
 hamcrest          = 2.1
-mockito           = 5.5.0
+mockito           = 5.10.0
 objenesis         = 3.2
 bytebuddy         = 1.14.7
 

From 95b3ec36e192550dbe19b722e2d50c161beae103 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Fri, 26 Jan 2024 21:43:05 -0500
Subject: [PATCH 25/33] Bump reactor-core and reactor-netty versions (#12042)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 CHANGELOG.md                                                  | 3 ++-
 buildSrc/version.properties                                   | 4 ++--
 .../licenses/reactor-netty-core-1.1.13.jar.sha1               | 1 -
 .../licenses/reactor-netty-core-1.1.15.jar.sha1               | 1 +
 .../licenses/reactor-netty-http-1.1.13.jar.sha1               | 1 -
 .../licenses/reactor-netty-http-1.1.15.jar.sha1               | 1 +
 .../licenses/reactor-netty-core-1.1.13.jar.sha1               | 1 -
 .../licenses/reactor-netty-core-1.1.15.jar.sha1               | 1 +
 .../licenses/reactor-netty-http-1.1.13.jar.sha1               | 1 -
 .../licenses/reactor-netty-http-1.1.15.jar.sha1               | 1 +
 server/licenses/reactor-core-3.5.11.jar.sha1                  | 1 -
 server/licenses/reactor-core-3.5.14.jar.sha1                  | 1 +
 12 files changed, 9 insertions(+), 8 deletions(-)
 delete mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1
 delete mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1
 create mode 100644 plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1
 delete mode 100644 plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1
 create mode 100644 plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1
 delete mode 100644 server/licenses/reactor-core-3.5.11.jar.sha1
 create mode 100644 server/licenses/reactor-core-3.5.14.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b07373c0fd188..2cd6863092c5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -156,7 +156,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.16.12 to 0.17.6 ([#10163](https://github.com/opensearch-project/OpenSearch/pull/10163), [#11692](https://github.com/opensearch-project/OpenSearch/pull/11692))
 - Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
 - Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
-- Bump `reactor-netty-core` from 1.1.12 to 1.1.13 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350))
+- Bump `reactor-netty-core` from 1.1.12 to 1.1.15 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350)), ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
 - Bump `com.gradle.enterprise` from 3.14.1 to 3.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
 - Bump `actions/setup-java` from 3 to 4 ([#11447](https://github.com/opensearch-project/OpenSearch/pull/11447))
 - Bump `commons-net:commons-net` from 3.9.0 to 3.10.0 ([#11450](https://github.com/opensearch-project/OpenSearch/pull/11450))
@@ -180,6 +180,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
 - Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
 - Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
+- Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index a7c0622e7d293..a888640772a42 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -30,8 +30,8 @@ netty             = 4.1.106.Final
 joda              = 2.12.2
 
 # project reactor
-reactor_netty     = 1.1.13
-reactor           = 3.5.11
+reactor_netty     = 1.1.15
+reactor           = 3.5.14
 
 # client dependencies
 httpclient5       = 5.2.1
diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1
deleted file mode 100644
index 5eaf96739ed72..0000000000000
--- a/plugins/repository-azure/licenses/reactor-netty-core-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-faea23e582978a34f6a932b81e86206ec2314990
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..c30a99a2338b4
--- /dev/null
+++ b/plugins/repository-azure/licenses/reactor-netty-core-1.1.15.jar.sha1
@@ -0,0 +1 @@
+3221d405ad55a573cf29875a8244a4217cf07185
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1
deleted file mode 100644
index 091125169c696..0000000000000
--- a/plugins/repository-azure/licenses/reactor-netty-http-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5af7bc746050d080891a5446cca2c96a0c51d03
\ No newline at end of file
diff --git a/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1 b/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..ab3171cd02b73
--- /dev/null
+++ b/plugins/repository-azure/licenses/reactor-netty-http-1.1.15.jar.sha1
@@ -0,0 +1 @@
+c79756fa2dfc28ac81fc9d23a14b17c656c3e560
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1
deleted file mode 100644
index 5eaf96739ed72..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-faea23e582978a34f6a932b81e86206ec2314990
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..c30a99a2338b4
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-core-1.1.15.jar.sha1
@@ -0,0 +1 @@
+3221d405ad55a573cf29875a8244a4217cf07185
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1
deleted file mode 100644
index 091125169c696..0000000000000
--- a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.13.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c5af7bc746050d080891a5446cca2c96a0c51d03
\ No newline at end of file
diff --git a/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1 b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1
new file mode 100644
index 0000000000000..ab3171cd02b73
--- /dev/null
+++ b/plugins/transport-reactor-netty4/licenses/reactor-netty-http-1.1.15.jar.sha1
@@ -0,0 +1 @@
+c79756fa2dfc28ac81fc9d23a14b17c656c3e560
\ No newline at end of file
diff --git a/server/licenses/reactor-core-3.5.11.jar.sha1 b/server/licenses/reactor-core-3.5.11.jar.sha1
deleted file mode 100644
index e5ffdbc8a7840..0000000000000
--- a/server/licenses/reactor-core-3.5.11.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db2299757f562261eb775d13658e86ff06f91e8a
\ No newline at end of file
diff --git a/server/licenses/reactor-core-3.5.14.jar.sha1 b/server/licenses/reactor-core-3.5.14.jar.sha1
new file mode 100644
index 0000000000000..3b58e7a68bade
--- /dev/null
+++ b/server/licenses/reactor-core-3.5.14.jar.sha1
@@ -0,0 +1 @@
+6e0c97c2e78273a00fd4ed38016b19ff3c6de59e
\ No newline at end of file

From 4323af1973c6c19b7ab35754f3ff1d6a5437dce9 Mon Sep 17 00:00:00 2001
From: Gaurav Bafna <85113518+gbbafna@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:02:20 +0530
Subject: [PATCH 26/33] Adding configurable connection count setting for S3
 Sync Client (#12028)

* Adding configurable connection count setting for S3 Sync Client

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>

* Address PR Comments

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>

* Increase number of connections to 500

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>

---------

Signed-off-by: Gaurav Bafna <gbbafna@amazon.com>
---
 CHANGELOG.md                                  |  1 +
 .../repositories/s3/S3ClientSettings.java     | 20 +++++++++++++++++--
 .../opensearch/repositories/s3/S3Service.java |  2 ++
 .../s3/S3ClientSettingsTests.java             |  2 ++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cd6863092c5b..78b1e0126b50c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - GHA to verify checklist items completion in PR descriptions ([#10800](https://github.com/opensearch-project/OpenSearch/pull/10800))
 - Allow to pass the list settings through environment variables (like [], ["a", "b", "c"], ...) ([#10625](https://github.com/opensearch-project/OpenSearch/pull/10625))
 - [Admission Control] Integrate CPU AC with ResourceUsageCollector and add CPU AC stats to nodes/stats ([#10887](https://github.com/opensearch-project/OpenSearch/pull/10887))
+- [S3 Repository] Add setting to control connection count for sync client ([#12028](https://github.com/opensearch-project/OpenSearch/pull/12028))
 
 ### Dependencies
 - Bump `log4j-core` from 2.18.0 to 2.19.0
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
index 4fda0ee95a3ec..e44f408e6dd12 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3ClientSettings.java
@@ -201,6 +201,12 @@ final class S3ClientSettings {
         key -> Setting.intSetting(key, 500, Property.NodeScope)
     );
 
+    static final Setting.AffixSetting<Integer> MAX_SYNC_CONNECTIONS_SETTING = Setting.affixKeySetting(
+        PREFIX,
+        "max_sync_connections",
+        key -> Setting.intSetting(key, 500, Property.NodeScope)
+    );
+
     /** Connection acquisition timeout for new connections to S3. */
     static final Setting.AffixSetting<TimeValue> CONNECTION_ACQUISITION_TIMEOUT = Setting.affixKeySetting(
         PREFIX,
@@ -284,10 +290,13 @@ final class S3ClientSettings {
     /** The connection TTL for the s3 client */
     final int connectionTTLMillis;
 
-    /** The max number of connections for the s3 client */
+    /** The max number of connections for the s3 async client */
     final int maxConnections;
 
-    /** The connnection acquisition timeout for the s3 async client */
+    /** The max number of connections for the s3 sync client */
+    final int maxSyncConnections;
+
+    /** The connnection acquisition timeout for the s3 sync and async client */
     final int connectionAcquisitionTimeoutMillis;
 
     /** The number of retries to use for the s3 client. */
@@ -318,6 +327,7 @@ private S3ClientSettings(
         int connectionTimeoutMillis,
         int connectionTTLMillis,
         int maxConnections,
+        int maxSyncConnections,
         int connectionAcquisitionTimeoutMillis,
         int maxRetries,
         boolean throttleRetries,
@@ -336,6 +346,7 @@ private S3ClientSettings(
         this.connectionTimeoutMillis = connectionTimeoutMillis;
         this.connectionTTLMillis = connectionTTLMillis;
         this.maxConnections = maxConnections;
+        this.maxSyncConnections = maxSyncConnections;
         this.connectionAcquisitionTimeoutMillis = connectionAcquisitionTimeoutMillis;
         this.maxRetries = maxRetries;
         this.throttleRetries = throttleRetries;
@@ -386,6 +397,9 @@ S3ClientSettings refine(Settings repositorySettings) {
             ).millis()
         );
         final int newMaxConnections = Math.toIntExact(getRepoSettingOrDefault(MAX_CONNECTIONS_SETTING, normalizedSettings, maxConnections));
+        final int newMaxSyncConnections = Math.toIntExact(
+            getRepoSettingOrDefault(MAX_SYNC_CONNECTIONS_SETTING, normalizedSettings, maxConnections)
+        );
         final int newMaxRetries = getRepoSettingOrDefault(MAX_RETRIES_SETTING, normalizedSettings, maxRetries);
         final boolean newThrottleRetries = getRepoSettingOrDefault(USE_THROTTLE_RETRIES_SETTING, normalizedSettings, throttleRetries);
         final boolean newPathStyleAccess = getRepoSettingOrDefault(USE_PATH_STYLE_ACCESS, normalizedSettings, pathStyleAccess);
@@ -433,6 +447,7 @@ S3ClientSettings refine(Settings repositorySettings) {
             newConnectionTimeoutMillis,
             newConnectionTTLMillis,
             newMaxConnections,
+            newMaxSyncConnections,
             newConnectionAcquisitionTimeoutMillis,
             newMaxRetries,
             newThrottleRetries,
@@ -563,6 +578,7 @@ static S3ClientSettings getClientSettings(final Settings settings, final String
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_TIMEOUT_SETTING).millis()),
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_TTL_SETTING).millis()),
             Math.toIntExact(getConfigValue(settings, clientName, MAX_CONNECTIONS_SETTING)),
+            Math.toIntExact(getConfigValue(settings, clientName, MAX_SYNC_CONNECTIONS_SETTING)),
             Math.toIntExact(getConfigValue(settings, clientName, CONNECTION_ACQUISITION_TIMEOUT).millis()),
             getConfigValue(settings, clientName, MAX_RETRIES_SETTING),
             getConfigValue(settings, clientName, USE_THROTTLE_RETRIES_SETTING),
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
index 24387fb98a425..fe81da31432f4 100644
--- a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
+++ b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3Service.java
@@ -279,6 +279,8 @@ protected PasswordAuthentication getPasswordAuthentication() {
         }
 
         clientBuilder.socketTimeout(Duration.ofMillis(clientSettings.readTimeoutMillis));
+        clientBuilder.maxConnections(clientSettings.maxSyncConnections);
+        clientBuilder.connectionAcquisitionTimeout(Duration.ofMillis(clientSettings.connectionAcquisitionTimeoutMillis));
 
         return clientBuilder;
     }
diff --git a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
index f27c8387b6e45..b47749553aeba 100644
--- a/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
+++ b/plugins/repository-s3/src/test/java/org/opensearch/repositories/s3/S3ClientSettingsTests.java
@@ -74,6 +74,8 @@ public void testThereIsADefaultClientByDefault() {
         assertThat(defaultSettings.connectionTimeoutMillis, is(10 * 1000));
         assertThat(defaultSettings.connectionTTLMillis, is(5 * 1000));
         assertThat(defaultSettings.maxConnections, is(500));
+        assertThat(defaultSettings.maxSyncConnections, is(500));
+        assertThat(defaultSettings.connectionAcquisitionTimeoutMillis, is(15 * 60 * 1000));
         assertThat(defaultSettings.maxRetries, is(3));
         assertThat(defaultSettings.throttleRetries, is(true));
     }

From 1ec5305122b8c1914f65d9c5f93186bc0b81d275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:12:51 -0500
Subject: [PATCH 27/33] Bump com.diffplug.spotless from 6.24.0 to 6.25.0
 (#12055)

* Bump com.diffplug.spotless from 6.24.0 to 6.25.0

Bumps com.diffplug.spotless from 6.24.0 to 6.25.0.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 build.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78b1e0126b50c..26e1373151fc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -179,7 +179,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.2.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886), [#11963](https://github.com/opensearch-project/OpenSearch/pull/11963))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
-- Bump `com.diffplug.spotless` from 6.23.2 to 6.24.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962))
+- Bump `com.diffplug.spotless` from 6.23.2 to 6.25.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962), [#12055](https://github.com/opensearch-project/OpenSearch/pull/12055))
 - Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
 - Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
 
diff --git a/build.gradle b/build.gradle
index 4d29ca8664af3..e082967255b10 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ plugins {
   id 'lifecycle-base'
   id 'opensearch.docker-support'
   id 'opensearch.global-build-info'
-  id "com.diffplug.spotless" version "6.24.0" apply false
+  id "com.diffplug.spotless" version "6.25.0" apply false
   id "org.gradle.test-retry" version "1.5.4" apply false
   id "test-report-aggregation"
   id 'jacoco-report-aggregation'

From c9ddaeffbdba8fd0a4e5c5d4c8949f3ca34f3839 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 09:53:54 -0500
Subject: [PATCH 28/33] Bump com.google.http-client:google-http-client-jackson2
 from 1.43.3 to 1.44.1 in /plugins/repository-gcs (#12059)

* Bump com.google.http-client:google-http-client-jackson2

Bumps [com.google.http-client:google-http-client-jackson2](https://github.com/googleapis/google-http-java-client) from 1.43.3 to 1.44.1.
- [Release notes](https://github.com/googleapis/google-http-java-client/releases)
- [Changelog](https://github.com/googleapis/google-http-java-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/googleapis/google-http-java-client/compare/v1.43.3...v1.44.1)

---
updated-dependencies:
- dependency-name: com.google.http-client:google-http-client-jackson2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md                                                    | 1 +
 plugins/repository-gcs/build.gradle                             | 2 +-
 .../licenses/google-http-client-jackson2-1.43.3.jar.sha1        | 1 -
 .../licenses/google-http-client-jackson2-1.44.1.jar.sha1        | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1
 create mode 100644 plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e1373151fc0..0ce761fde5b91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -182,6 +182,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.diffplug.spotless` from 6.23.2 to 6.25.0 ([#11962](https://github.com/opensearch-project/OpenSearch/pull/11962), [#12055](https://github.com/opensearch-project/OpenSearch/pull/12055))
 - Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
 - Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
+- Bump `com.google.http-client:google-http-client-jackson2` from 1.43.3 to 1.44.1 ([#12059](https://github.com/opensearch-project/OpenSearch/pull/12059))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))
diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
index e0651da8d39c8..2ce67b1f25a80 100644
--- a/plugins/repository-gcs/build.gradle
+++ b/plugins/repository-gcs/build.gradle
@@ -78,7 +78,7 @@ dependencies {
   api 'com.google.http-client:google-http-client:1.43.3'
   api 'com.google.http-client:google-http-client-appengine:1.43.3'
   api 'com.google.http-client:google-http-client-gson:1.43.3'
-  api 'com.google.http-client:google-http-client-jackson2:1.43.3'
+  api 'com.google.http-client:google-http-client-jackson2:1.44.1'
 
   api 'com.google.oauth-client:google-oauth-client:1.34.1'
 
diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1
deleted file mode 100644
index 8380b9fb770b5..0000000000000
--- a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.43.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-689da86469d19a01c726c8c24477b95c8a834bbe
\ No newline at end of file
diff --git a/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1 b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1
new file mode 100644
index 0000000000000..4472ffbbebe1c
--- /dev/null
+++ b/plugins/repository-gcs/licenses/google-http-client-jackson2-1.44.1.jar.sha1
@@ -0,0 +1 @@
+3f1947de0fd9eb250af16abe6103c11e68d11635
\ No newline at end of file

From af57da4cb7f31840c9abc07ebb4e90a9fa55b0c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:35:12 -0500
Subject: [PATCH 29/33] Bump com.gradle.enterprise from 3.16.1 to 3.16.2
 (#12056)

* Bump com.gradle.enterprise from 3.16.1 to 3.16.2

Bumps com.gradle.enterprise from 3.16.1 to 3.16.2.

---
updated-dependencies:
- dependency-name: com.gradle.enterprise
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 CHANGELOG.md    | 2 +-
 settings.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ce761fde5b91..35a3e59c5470b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -158,7 +158,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.squareup.okhttp3:okhttp` from 4.11.0 to 4.12.0 ([#10861](https://github.com/opensearch-project/OpenSearch/pull/10861))
 - Bump `org.apache.commons:commons-text` from 1.10.0 to 1.11.0 ([#11344](https://github.com/opensearch-project/OpenSearch/pull/11344))
 - Bump `reactor-netty-core` from 1.1.12 to 1.1.15 ([#11350](https://github.com/opensearch-project/OpenSearch/pull/11350)), ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
-- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.1 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629))
+- Bump `com.gradle.enterprise` from 3.14.1 to 3.16.2 ([#11339](https://github.com/opensearch-project/OpenSearch/pull/11339), [#11629](https://github.com/opensearch-project/OpenSearch/pull/11629), [#12056](https://github.com/opensearch-project/OpenSearch/pull/12056))
 - Bump `actions/setup-java` from 3 to 4 ([#11447](https://github.com/opensearch-project/OpenSearch/pull/11447))
 - Bump `commons-net:commons-net` from 3.9.0 to 3.10.0 ([#11450](https://github.com/opensearch-project/OpenSearch/pull/11450))
 - Bump `org.apache.maven:maven-model` from 3.9.4 to 3.9.6 ([#11445](https://github.com/opensearch-project/OpenSearch/pull/11445))
diff --git a/settings.gradle b/settings.gradle
index 24ab4a7a22237..8fbf32504215b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@
  */
 
 plugins {
-  id "com.gradle.enterprise" version "3.16.1"
+  id "com.gradle.enterprise" version "3.16.2"
 }
 
 ext.disableBuildCache = hasProperty('DISABLE_BUILD_CACHE') || System.getenv().containsKey('DISABLE_BUILD_CACHE')

From 6012504c2d8577d94d5c763c66823cc33f18b539 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Mon, 29 Jan 2024 12:20:44 -0500
Subject: [PATCH 30/33] Update to Apache Lucene 9.9.2 (#12063)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 CHANGELOG.md                                                    | 2 +-
 buildSrc/version.properties                                     | 2 +-
 libs/core/licenses/lucene-core-9.9.1.jar.sha1                   | 1 -
 libs/core/licenses/lucene-core-9.9.2.jar.sha1                   | 1 +
 libs/core/src/main/java/org/opensearch/Version.java             | 2 +-
 .../lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1  | 1 -
 .../lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1  | 1 +
 .../analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1    | 1 -
 .../analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1    | 1 +
 .../licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1            | 1 -
 .../licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1            | 1 +
 .../analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1  | 1 -
 .../analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1  | 1 +
 .../licenses/lucene-analysis-phonetic-9.9.1.jar.sha1            | 1 -
 .../licenses/lucene-analysis-phonetic-9.9.2.jar.sha1            | 1 +
 .../licenses/lucene-analysis-smartcn-9.9.1.jar.sha1             | 1 -
 .../licenses/lucene-analysis-smartcn-9.9.2.jar.sha1             | 1 +
 .../licenses/lucene-analysis-stempel-9.9.1.jar.sha1             | 1 -
 .../licenses/lucene-analysis-stempel-9.9.2.jar.sha1             | 1 +
 .../licenses/lucene-analysis-morfologik-9.9.1.jar.sha1          | 1 -
 .../licenses/lucene-analysis-morfologik-9.9.2.jar.sha1          | 1 +
 server/licenses/lucene-analysis-common-9.9.1.jar.sha1           | 1 -
 server/licenses/lucene-analysis-common-9.9.2.jar.sha1           | 1 +
 server/licenses/lucene-backward-codecs-9.9.1.jar.sha1           | 1 -
 server/licenses/lucene-backward-codecs-9.9.2.jar.sha1           | 1 +
 server/licenses/lucene-core-9.9.1.jar.sha1                      | 1 -
 server/licenses/lucene-core-9.9.2.jar.sha1                      | 1 +
 server/licenses/lucene-grouping-9.9.1.jar.sha1                  | 1 -
 server/licenses/lucene-grouping-9.9.2.jar.sha1                  | 1 +
 server/licenses/lucene-highlighter-9.9.1.jar.sha1               | 1 -
 server/licenses/lucene-highlighter-9.9.2.jar.sha1               | 1 +
 server/licenses/lucene-join-9.9.1.jar.sha1                      | 1 -
 server/licenses/lucene-join-9.9.2.jar.sha1                      | 1 +
 server/licenses/lucene-memory-9.9.1.jar.sha1                    | 1 -
 server/licenses/lucene-memory-9.9.2.jar.sha1                    | 1 +
 server/licenses/lucene-misc-9.9.1.jar.sha1                      | 1 -
 server/licenses/lucene-misc-9.9.2.jar.sha1                      | 1 +
 server/licenses/lucene-queries-9.9.1.jar.sha1                   | 1 -
 server/licenses/lucene-queries-9.9.2.jar.sha1                   | 1 +
 server/licenses/lucene-queryparser-9.9.1.jar.sha1               | 1 -
 server/licenses/lucene-queryparser-9.9.2.jar.sha1               | 1 +
 server/licenses/lucene-sandbox-9.9.1.jar.sha1                   | 1 -
 server/licenses/lucene-sandbox-9.9.2.jar.sha1                   | 1 +
 server/licenses/lucene-spatial-extras-9.9.1.jar.sha1            | 1 -
 server/licenses/lucene-spatial-extras-9.9.2.jar.sha1            | 1 +
 server/licenses/lucene-spatial3d-9.9.1.jar.sha1                 | 1 -
 server/licenses/lucene-spatial3d-9.9.2.jar.sha1                 | 1 +
 server/licenses/lucene-suggest-9.9.1.jar.sha1                   | 1 -
 server/licenses/lucene-suggest-9.9.2.jar.sha1                   | 1 +
 49 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 libs/core/licenses/lucene-core-9.9.1.jar.sha1
 create mode 100644 libs/core/licenses/lucene-core-9.9.2.jar.sha1
 delete mode 100644 modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1
 create mode 100644 modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1
 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-analysis-common-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-analysis-common-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-backward-codecs-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-backward-codecs-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-core-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-core-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-grouping-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-grouping-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-highlighter-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-highlighter-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-join-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-join-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-memory-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-memory-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-misc-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-misc-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-queries-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-queries-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-queryparser-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-queryparser-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-sandbox-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-sandbox-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial-extras-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-spatial-extras-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-spatial3d-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-spatial3d-9.9.2.jar.sha1
 delete mode 100644 server/licenses/lucene-suggest-9.9.1.jar.sha1
 create mode 100644 server/licenses/lucene-suggest-9.9.2.jar.sha1

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35a3e59c5470b..f2c0229e8c7fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -175,7 +175,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.maxmind.db:maxmind-db` from 3.0.0 to 3.1.0 ([#11693](https://github.com/opensearch-project/OpenSearch/pull/11693))
 - Bump `net.java.dev.jna:jna` from 5.13.0 to 5.14.0 ([#11798](https://github.com/opensearch-project/OpenSearch/pull/11798))
 - Bump `lycheeverse/lychee-action` from 1.8.0 to 1.9.1 ([#11795](https://github.com/opensearch-project/OpenSearch/pull/11795), [#11887](https://github.com/opensearch-project/OpenSearch/pull/11887))
-- Bump `Lucene` from 9.8.0 to 9.9.1 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421))
+- Bump `Lucene` from 9.8.0 to 9.9.2 ([#11421](https://github.com/opensearch-project/OpenSearch/pull/11421)), ([#12063](https://github.com/opensearch-project/OpenSearch/pull/12063))
 - Bump `com.networknt:json-schema-validator` from 1.0.86 to 1.2.0 ([#11886](https://github.com/opensearch-project/OpenSearch/pull/11886), [#11963](https://github.com/opensearch-project/OpenSearch/pull/11963))
 - Bump `com.google.api:gax-httpjson` from 0.103.1 to 2.39.0 ([#11794](https://github.com/opensearch-project/OpenSearch/pull/11794))
 - Bump `com.google.oauth-client:google-oauth-client` from 1.34.1 to 1.35.0 ([#11960](https://github.com/opensearch-project/OpenSearch/pull/11960))
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
index a888640772a42..95ae1ddb578a1 100644
--- a/buildSrc/version.properties
+++ b/buildSrc/version.properties
@@ -1,5 +1,5 @@
 opensearch        = 3.0.0
-lucene            = 9.9.1
+lucene            = 9.9.2
 
 bundled_jdk_vendor = adoptium
 bundled_jdk = 21.0.2+13
diff --git a/libs/core/licenses/lucene-core-9.9.1.jar.sha1 b/libs/core/licenses/lucene-core-9.9.1.jar.sha1
deleted file mode 100644
index ae596196d9e6a..0000000000000
--- a/libs/core/licenses/lucene-core-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55249fa9a0ed321adcf8283c6f3b649a6812b0a9
\ No newline at end of file
diff --git a/libs/core/licenses/lucene-core-9.9.2.jar.sha1 b/libs/core/licenses/lucene-core-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..2d03d69369b9f
--- /dev/null
+++ b/libs/core/licenses/lucene-core-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7699f80220fc80b08413902560904623b88beb9f
\ No newline at end of file
diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 6a92993f5dd42..75f9a0dec3e12 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -99,7 +99,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_11_1 = new Version(2110199, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_11_2 = new Version(2110299, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_1);
-    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_1);
+    public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_2);
     public static final Version CURRENT = V_3_0_0;
 
     public static Version fromId(int id) {
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1
deleted file mode 100644
index 402cc36ba3d68..0000000000000
--- a/modules/lang-expression/licenses/lucene-expressions-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1782a69d0e83af9cc3c65db0dcd2e7e7c1e5f90e
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..e073455415e24
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-9.9.2.jar.sha1
@@ -0,0 +1 @@
+045df3828b6460c032a6551040e31ea432b0aad6
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1
deleted file mode 100644
index dde9b7c100dc7..0000000000000
--- a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-147cb42a90a29501d9ca6094ea0db1d213f3076a
\ No newline at end of file
diff --git a/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b318a2d89db7d
--- /dev/null
+++ b/plugins/analysis-icu/licenses/lucene-analysis-icu-9.9.2.jar.sha1
@@ -0,0 +1 @@
+f7e549fdac07140f4cd379a0f517c38434165e95
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1
deleted file mode 100644
index b70a22e9db096..0000000000000
--- a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b034dd3a975763e083c7e11b5d0f7d516ab72590
\ No newline at end of file
diff --git a/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..87510efa881bc
--- /dev/null
+++ b/plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.9.2.jar.sha1
@@ -0,0 +1 @@
+eb19738fd3ca85071fef96978a056a7c94d8e793
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1
deleted file mode 100644
index 323f165c62790..0000000000000
--- a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c405f2f7d0fc127d88dfbadd753469b2028fdf52
\ No newline at end of file
diff --git a/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..fb3746eb27840
--- /dev/null
+++ b/plugins/analysis-nori/licenses/lucene-analysis-nori-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7e83a83741155ececf9193a4f967e570e170236d
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1
deleted file mode 100644
index dd659ddf4de95..0000000000000
--- a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-970e5775876c2d7e1b9af7421a4b17d96f63faf4
\ No newline at end of file
diff --git a/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..e88299f106bb2
--- /dev/null
+++ b/plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.9.2.jar.sha1
@@ -0,0 +1 @@
+dabdea96c7a6d00363b0093a580e7d783efa69a4
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1
deleted file mode 100644
index ed0e81d8f1f75..0000000000000
--- a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2421e5238e9b8484929291744d709dd743c01da1
\ No newline at end of file
diff --git a/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..05dd3328b032d
--- /dev/null
+++ b/plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.9.2.jar.sha1
@@ -0,0 +1 @@
+fb551d9ae6a1bf12bc90a4d26dd8fa3eefac8cb9
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1
deleted file mode 100644
index fd8e000088180..0000000000000
--- a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-a23e7de4cd9ae7af285c89dc1c55e0ac3f157fd3
\ No newline at end of file
diff --git a/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b47a1e4052407
--- /dev/null
+++ b/plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.9.2.jar.sha1
@@ -0,0 +1 @@
+0d495b478861b2d29e0a58d273ca0e6e755292e9
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1
deleted file mode 100644
index d0e7a3b0c751c..0000000000000
--- a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-8d9bce1ea51db279878c51091dd9aefc7b335da4
\ No newline at end of file
diff --git a/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..b7d54cb230445
--- /dev/null
+++ b/plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.9.2.jar.sha1
@@ -0,0 +1 @@
+9958d813d4cfdd890b4611c679ed36775480fa0d
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.9.1.jar.sha1 b/server/licenses/lucene-analysis-common-9.9.1.jar.sha1
deleted file mode 100644
index c9e6120da7497..0000000000000
--- a/server/licenses/lucene-analysis-common-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-24c8401b530308f9568eb7b408c2029c63f564c6
\ No newline at end of file
diff --git a/server/licenses/lucene-analysis-common-9.9.2.jar.sha1 b/server/licenses/lucene-analysis-common-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..6eefe1b002fde
--- /dev/null
+++ b/server/licenses/lucene-analysis-common-9.9.2.jar.sha1
@@ -0,0 +1 @@
+2a4712ee9d87e0f9942a81195dbd5223dbeaa541
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1 b/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1
deleted file mode 100644
index 69ecf6aa68200..0000000000000
--- a/server/licenses/lucene-backward-codecs-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-11c46007366bb037be7d271ab0a5849b1d544662
\ No newline at end of file
diff --git a/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1 b/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..377acc22a1d6b
--- /dev/null
+++ b/server/licenses/lucene-backward-codecs-9.9.2.jar.sha1
@@ -0,0 +1 @@
+b53707366cf2891bb301f85a44c5108fc2d5d1b5
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.9.1.jar.sha1 b/server/licenses/lucene-core-9.9.1.jar.sha1
deleted file mode 100644
index ae596196d9e6a..0000000000000
--- a/server/licenses/lucene-core-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-55249fa9a0ed321adcf8283c6f3b649a6812b0a9
\ No newline at end of file
diff --git a/server/licenses/lucene-core-9.9.2.jar.sha1 b/server/licenses/lucene-core-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..2d03d69369b9f
--- /dev/null
+++ b/server/licenses/lucene-core-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7699f80220fc80b08413902560904623b88beb9f
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.9.1.jar.sha1 b/server/licenses/lucene-grouping-9.9.1.jar.sha1
deleted file mode 100644
index e7df056400661..0000000000000
--- a/server/licenses/lucene-grouping-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2f2785e17c5c823cc8f41a7ddb4647aaca8ee773
\ No newline at end of file
diff --git a/server/licenses/lucene-grouping-9.9.2.jar.sha1 b/server/licenses/lucene-grouping-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..1e321d751bff4
--- /dev/null
+++ b/server/licenses/lucene-grouping-9.9.2.jar.sha1
@@ -0,0 +1 @@
+72b6c47fd80933d259859d38325e3e020c8e017b
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.9.1.jar.sha1 b/server/licenses/lucene-highlighter-9.9.1.jar.sha1
deleted file mode 100644
index 828c7294aa586..0000000000000
--- a/server/licenses/lucene-highlighter-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-30928513461bf79a5cb057e84da7d34a1e53227d
\ No newline at end of file
diff --git a/server/licenses/lucene-highlighter-9.9.2.jar.sha1 b/server/licenses/lucene-highlighter-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..d5c2e2a5504f2
--- /dev/null
+++ b/server/licenses/lucene-highlighter-9.9.2.jar.sha1
@@ -0,0 +1 @@
+0968d74d6794af65798819304f10ceb947080332
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.9.1.jar.sha1 b/server/licenses/lucene-join-9.9.1.jar.sha1
deleted file mode 100644
index 34b44ca8c6ad5..0000000000000
--- a/server/licenses/lucene-join-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9c8cc99632280148f92b4c0a64111c482d5d0ac
\ No newline at end of file
diff --git a/server/licenses/lucene-join-9.9.2.jar.sha1 b/server/licenses/lucene-join-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..60da109fb5c83
--- /dev/null
+++ b/server/licenses/lucene-join-9.9.2.jar.sha1
@@ -0,0 +1 @@
+902e4b65686e29c1489a7cdf43ed2ce3b7fe8ace
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.9.1.jar.sha1 b/server/licenses/lucene-memory-9.9.1.jar.sha1
deleted file mode 100644
index b75fba4c331e9..0000000000000
--- a/server/licenses/lucene-memory-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-49f820b1b321860fa42a4f7583e8ed8f77b9c1c2
\ No newline at end of file
diff --git a/server/licenses/lucene-memory-9.9.2.jar.sha1 b/server/licenses/lucene-memory-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..bebb36d7ed684
--- /dev/null
+++ b/server/licenses/lucene-memory-9.9.2.jar.sha1
@@ -0,0 +1 @@
+08175beb4135c23e6918c822381cd51cd2e118a8
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.9.1.jar.sha1 b/server/licenses/lucene-misc-9.9.1.jar.sha1
deleted file mode 100644
index f1e1e056004e9..0000000000000
--- a/server/licenses/lucene-misc-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-db7c30217602dfcda394a4d0f0a9e68140d385a6
\ No newline at end of file
diff --git a/server/licenses/lucene-misc-9.9.2.jar.sha1 b/server/licenses/lucene-misc-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..15f572ec715bf
--- /dev/null
+++ b/server/licenses/lucene-misc-9.9.2.jar.sha1
@@ -0,0 +1 @@
+39b015aa603db42b55f0833193bdfc75d38842ba
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.9.1.jar.sha1 b/server/licenses/lucene-queries-9.9.1.jar.sha1
deleted file mode 100644
index 888b9b4a05ec8..0000000000000
--- a/server/licenses/lucene-queries-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d157547bd24edc8e9d9d59c273107dc3ac5fde5e
\ No newline at end of file
diff --git a/server/licenses/lucene-queries-9.9.2.jar.sha1 b/server/licenses/lucene-queries-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..9a94e40b69e85
--- /dev/null
+++ b/server/licenses/lucene-queries-9.9.2.jar.sha1
@@ -0,0 +1 @@
+671252594e15280818f56d4b369bc48c0ab00dac
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.9.1.jar.sha1 b/server/licenses/lucene-queryparser-9.9.1.jar.sha1
deleted file mode 100644
index 1ce8a069a0f4e..0000000000000
--- a/server/licenses/lucene-queryparser-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-12d844fe224f6f97c510ac20d68903ed7f626f6c
\ No newline at end of file
diff --git a/server/licenses/lucene-queryparser-9.9.2.jar.sha1 b/server/licenses/lucene-queryparser-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..f23292999ae6a
--- /dev/null
+++ b/server/licenses/lucene-queryparser-9.9.2.jar.sha1
@@ -0,0 +1 @@
+7cf8dea63ab511ea9a322916198c3abd0402c8b2
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.9.1.jar.sha1 b/server/licenses/lucene-sandbox-9.9.1.jar.sha1
deleted file mode 100644
index 14fd86dadc404..0000000000000
--- a/server/licenses/lucene-sandbox-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-272e588fd3d8c0a401b28a1ac715f27044bf62ec
\ No newline at end of file
diff --git a/server/licenses/lucene-sandbox-9.9.2.jar.sha1 b/server/licenses/lucene-sandbox-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..a30f00d72a689
--- /dev/null
+++ b/server/licenses/lucene-sandbox-9.9.2.jar.sha1
@@ -0,0 +1 @@
+4e2bdc6a5b65dd15b78477cf2c49cf7b707ba757
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1 b/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1
deleted file mode 100644
index 0efd5a7595bfe..0000000000000
--- a/server/licenses/lucene-spatial-extras-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e066432e7ab02b2a4914f989bcd8c44adbf340ad
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1 b/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..dafeee401659a
--- /dev/null
+++ b/server/licenses/lucene-spatial-extras-9.9.2.jar.sha1
@@ -0,0 +1 @@
+2693d4d4d3b9a0bf5b632ccbb01132eade1c4e14
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.9.1.jar.sha1 b/server/licenses/lucene-spatial3d-9.9.1.jar.sha1
deleted file mode 100644
index 7f06466e4c721..0000000000000
--- a/server/licenses/lucene-spatial3d-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-fa54c9b962778e28ebc0efb9f75297781350361a
\ No newline at end of file
diff --git a/server/licenses/lucene-spatial3d-9.9.2.jar.sha1 b/server/licenses/lucene-spatial3d-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..47a1c05187098
--- /dev/null
+++ b/server/licenses/lucene-spatial3d-9.9.2.jar.sha1
@@ -0,0 +1 @@
+61866a44eafce499ebbc20bcb75c8b8a60a5449b
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.9.1.jar.sha1 b/server/licenses/lucene-suggest-9.9.1.jar.sha1
deleted file mode 100644
index 06732480d1b6c..0000000000000
--- a/server/licenses/lucene-suggest-9.9.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9554de5b22ae7483b344b94a9a956960b7a5d49c
\ No newline at end of file
diff --git a/server/licenses/lucene-suggest-9.9.2.jar.sha1 b/server/licenses/lucene-suggest-9.9.2.jar.sha1
new file mode 100644
index 0000000000000..115983c932983
--- /dev/null
+++ b/server/licenses/lucene-suggest-9.9.2.jar.sha1
@@ -0,0 +1 @@
+352ad5296f48a482e2b65bb7d5d6ba2977bb035e
\ No newline at end of file

From 0cd06fa436d9f52009d868fb253318def652a600 Mon Sep 17 00:00:00 2001
From: Andriy Redko <andriy.redko@aiven.io>
Date: Mon, 29 Jan 2024 15:00:36 -0500
Subject: [PATCH 31/33] Update Apache Lucene version for 2.12.0 release
 (#12072)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
---
 libs/core/src/main/java/org/opensearch/Version.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/core/src/main/java/org/opensearch/Version.java b/libs/core/src/main/java/org/opensearch/Version.java
index 75f9a0dec3e12..307da89c18d48 100644
--- a/libs/core/src/main/java/org/opensearch/Version.java
+++ b/libs/core/src/main/java/org/opensearch/Version.java
@@ -98,7 +98,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_2_11_0 = new Version(2110099, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_11_1 = new Version(2110199, org.apache.lucene.util.Version.LUCENE_9_7_0);
     public static final Version V_2_11_2 = new Version(2110299, org.apache.lucene.util.Version.LUCENE_9_7_0);
-    public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_1);
+    public static final Version V_2_12_0 = new Version(2120099, org.apache.lucene.util.Version.LUCENE_9_9_2);
     public static final Version V_3_0_0 = new Version(3000099, org.apache.lucene.util.Version.LUCENE_9_9_2);
     public static final Version CURRENT = V_3_0_0;
 

From 1f8b62fed81424576184dc9ef1ebe69f5156c904 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:14:43 -0800
Subject: [PATCH 32/33] Bump peter-evans/create-issue-from-file from 4 to 5
 (#12057)

* Bump peter-evans/create-issue-from-file from 4 to 5

Bumps [peter-evans/create-issue-from-file](https://github.com/peter-evans/create-issue-from-file) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-issue-from-file/releases)
- [Commits](https://github.com/peter-evans/create-issue-from-file/compare/v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-issue-from-file
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update changelog

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/create-documentation-issue.yml | 2 +-
 CHANGELOG.md                                     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create-documentation-issue.yml b/.github/workflows/create-documentation-issue.yml
index df63847f8afca..b45e053cc25c2 100644
--- a/.github/workflows/create-documentation-issue.yml
+++ b/.github/workflows/create-documentation-issue.yml
@@ -29,7 +29,7 @@ jobs:
           
       - name: Create Issue From File
         id: create-issue
-        uses: peter-evans/create-issue-from-file@v4
+        uses: peter-evans/create-issue-from-file@v5
         with:
           title: Add documentation related to new feature
           content-filepath: ./ci/documentation/issue.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2c0229e8c7fc..62497d021b6bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -183,6 +183,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.cloud:google-cloud-core` from 2.5.10 to 2.30.0 ([#11961](https://github.com/opensearch-project/OpenSearch/pull/11961))
 - Bump `reactor-core` from 3.5.11 to 3.5.14 ([#12042](https://github.com/opensearch-project/OpenSearch/pull/12042))
 - Bump `com.google.http-client:google-http-client-jackson2` from 1.43.3 to 1.44.1 ([#12059](https://github.com/opensearch-project/OpenSearch/pull/12059))
+- Bump `peter-evans/create-issue-from-file` from 4 to 5 ([#12057](https://github.com/opensearch-project/OpenSearch/pull/12057))
 
 ### Changed
 - Mute the query profile IT with concurrent execution ([#9840](https://github.com/opensearch-project/OpenSearch/pull/9840))

From cc9ee9d572dc395f6de81fd4d393fe9f1962fa50 Mon Sep 17 00:00:00 2001
From: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
Date: Mon, 29 Jan 2024 16:06:17 -0800
Subject: [PATCH 33/33] Updating Ip fields to use doc_values to search (#11508)

* Updating Ip fields to use doc_values to search

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Fix IP tests

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Fix skip to allow yaml test to pass on main

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Update tests to use existing test file

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Changing skip version to match bwc

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Using exact match instead of range

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Spotless

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Fix IP field tests

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Fix spotless + precommit failure

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Get point out of query and into value

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Fix term tests

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

* Add skip test logic to only doc_values test

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>

---------

Signed-off-by: Harsha Vamsi Kalluri <harshavamsi096@gmail.com>
---
 CHANGELOG.md                                  |   1 +
 .../test/search/340_doc_values_field.yml      | 136 +++++++++++---
 .../index/mapper/IpFieldMapper.java           |  67 +++++--
 .../index/mapper/IpFieldTypeTests.java        | 172 ++++++++++++++++--
 4 files changed, 323 insertions(+), 53 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62497d021b6bd..d0feea5e2ded3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -216,6 +216,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Ensure Jackson default maximums introduced in 2.16.0 do not conflict with OpenSearch settings ([#11890](https://github.com/opensearch-project/OpenSearch/pull/11890))
 - Extract cluster management for integration tests into JUnit test rule out of OpenSearchIntegTestCase ([#11877](https://github.com/opensearch-project/OpenSearch/pull/11877)), ([#12000](https://github.com/opensearch-project/OpenSearch/pull/12000))
 - Workaround for https://bugs.openjdk.org/browse/JDK-8323659 regression, introduced in JDK-21.0.2 ([#11968](https://github.com/opensearch-project/OpenSearch/pull/11968))
+- Updates IpField to be searchable when only `doc_values` are enabled ([#11508](https://github.com/opensearch-project/OpenSearch/pull/11508))
 
 ### Deprecated
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
index c7b00d5fbbef2..d5ece1719dc48 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/340_doc_values_field.yml
@@ -1,8 +1,3 @@
-setup:
-  - skip:
-      features: [ "headers" ]
-      version: " - 2.11.99"
-      reason: "searching with only doc_values was added in 2.12.0"
 ---
 "search on fields with both index and doc_values enabled":
   - do:
@@ -47,6 +42,10 @@ setup:
                 type: unsigned_long
                 index: true
                 doc_values: true
+              ip_field:
+                type: ip
+                index: true
+                doc_values: true
 
   - do:
       bulk:
@@ -54,11 +53,11 @@ setup:
         refresh: true
         body:
           - '{"index": {"_index": "test-iodvq", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-iodvq", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-iodvq", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -162,7 +161,6 @@ setup:
 
   - match: { hits.total: 1 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -174,6 +172,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.1"
+
+  - match: {hits.total: 1}
 
   - do:
       search:
@@ -186,7 +194,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -264,6 +271,17 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            terms:
+              ip_field: ["192.168.0.1", "192.168.0.2"]
+
+  - match: { hits.total: 2 }
+
   - do:
       search:
         rest_total_hits_as_int: true
@@ -384,6 +402,19 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-iodvq
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }
+
 ---
 "search on fields with only index enabled":
   - do:
@@ -428,6 +459,10 @@ setup:
                 type: unsigned_long
                 index: true
                 doc_values: false
+              ip_field:
+                type: ip
+                index: true
+                doc_values: false
 
   - do:
       bulk:
@@ -435,11 +470,11 @@ setup:
         refresh: true
         body:
           - '{"index": {"_index": "test-index", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-index", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-index", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -465,7 +500,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -555,6 +589,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.1"
+
+  - match: {hits.total: 1}
 
   - do:
       search:
@@ -567,7 +611,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -645,6 +688,17 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            terms:
+              ip_field: ["192.168.0.1", "192.168.0.2"]
+
+  - match: { hits.total: 2 }
+
   - do:
       search:
         rest_total_hits_as_int: true
@@ -765,8 +819,24 @@ setup:
 
   - match: { hits.total: 2 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-index
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }
 ---
 "search on fields with only doc_values enabled":
+  - skip:
+      features: [ "headers" ]
+      version: " - 2.99.99"
+      reason: "searching with only doc_values was added in 3.0.0"
   - do:
       indices.create:
         index: test-doc-values
@@ -809,6 +879,10 @@ setup:
                 type: unsigned_long
                 index: false
                 doc_values: true
+              ip_field:
+                type: ip
+                index: false
+                doc_values: true
 
   - do:
       bulk:
@@ -816,11 +890,11 @@ setup:
         refresh: true
         body:
           - '{"index": {"_index": "test-doc-values", "_id": "1" }}'
-          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800 }'
+          - '{ "some_keyword": "ingesting some random keyword data", "byte": 120, "double": 100.0, "float": "800.0", "half_float": "400.0", "integer": 1290, "long": 13456, "short": 150, "unsigned_long": 10223372036854775800, "ip_field": "192.168.0.1" }'
           - '{ "index": { "_index": "test-doc-values", "_id": "2" }}'
-          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801 }'
+          - '{ "some_keyword": "400", "byte": 121, "double": 101.0, "float": "801.0", "half_float": "401.0", "integer": 1291, "long": 13457, "short": 151, "unsigned_long": 10223372036854775801, "ip_field": "192.168.0.2" }'
           - '{ "index": { "_index": "test-doc-values", "_id": "3" } }'
-          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802 }'
+          - '{ "some_keyword": "5", "byte": 122, "double": 102.0, "float": "802.0", "half_float": "402.0", "integer": 1292, "long": 13458, "short": 152, "unsigned_long": 10223372036854775802, "ip_field": "192.168.0.3" }'
 
   - do:
       search:
@@ -846,7 +920,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -924,7 +997,6 @@ setup:
 
   - match: { hits.total: 1 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -936,6 +1008,16 @@ setup:
 
   - match: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            term:
+              ip_field: "192.168.0.3"
+
+  - match: { hits.total: 1 }
 
   - do:
       search:
@@ -948,7 +1030,6 @@ setup:
 
   - match: { hits.total: 2 }
 
-
   - do:
       search:
         rest_total_hits_as_int: true
@@ -1145,3 +1226,16 @@ setup:
             }
 
   - match: { hits.total: 2 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test-doc-values
+        body:
+          query:
+            range:
+              ip_field:
+                gte: "192.168.0.1"
+                lte: "192.168.0.2"
+
+  - match: { hits.total: 2 }
diff --git a/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java
index 2a677d8bc1352..db8da8a949d6f 100644
--- a/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java
+++ b/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java
@@ -36,7 +36,9 @@
 import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.document.StoredField;
 import org.apache.lucene.index.SortedSetDocValues;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.PointRangeQuery;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;
@@ -222,25 +224,48 @@ protected Object parseSourceValue(Object value) {
 
         @Override
         public Query termQuery(Object value, @Nullable QueryShardContext context) {
-            failIfNotIndexed();
+            failIfNotIndexedAndNoDocValues();
+            Query query;
             if (value instanceof InetAddress) {
-                return InetAddressPoint.newExactQuery(name(), (InetAddress) value);
+                query = InetAddressPoint.newExactQuery(name(), (InetAddress) value);
             } else {
                 if (value instanceof BytesRef) {
                     value = ((BytesRef) value).utf8ToString();
                 }
+                String term = value.toString();
+                if (term.contains("/")) {
+                    final Tuple<InetAddress, Integer> cidr = InetAddresses.parseCidr(term);
+                    query = InetAddressPoint.newPrefixQuery(name(), cidr.v1(), cidr.v2());
+                } else {
+                    InetAddress address = InetAddresses.forString(term);
+                    query = InetAddressPoint.newExactQuery(name(), address);
+                }
+            }
+            if (isSearchable() && hasDocValues()) {
+                String term = value.toString();
+                if (term.contains("/")) {
+                    final Tuple<InetAddress, Integer> cidr = InetAddresses.parseCidr(term);
+                    return InetAddressPoint.newPrefixQuery(name(), cidr.v1(), cidr.v2());
+                }
+                return new IndexOrDocValuesQuery(
+                    query,
+                    SortedSetDocValuesField.newSlowExactQuery(name(), new BytesRef(((PointRangeQuery) query).getLowerPoint()))
+                );
+            }
+            if (hasDocValues()) {
                 String term = value.toString();
                 if (term.contains("/")) {
                     final Tuple<InetAddress, Integer> cidr = InetAddresses.parseCidr(term);
                     return InetAddressPoint.newPrefixQuery(name(), cidr.v1(), cidr.v2());
                 }
-                InetAddress address = InetAddresses.forString(term);
-                return InetAddressPoint.newExactQuery(name(), address);
+                return SortedSetDocValuesField.newSlowExactQuery(name(), new BytesRef(((PointRangeQuery) query).getLowerPoint()));
             }
+            return query;
         }
 
         @Override
         public Query termsQuery(List<?> values, QueryShardContext context) {
+            failIfNotIndexedAndNoDocValues();
             InetAddress[] addresses = new InetAddress[values.size()];
             int i = 0;
             for (Object value : values) {
@@ -265,14 +290,32 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
 
         @Override
         public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower, boolean includeUpper, QueryShardContext context) {
-            failIfNotIndexed();
-            return rangeQuery(
-                lowerTerm,
-                upperTerm,
-                includeLower,
-                includeUpper,
-                (lower, upper) -> InetAddressPoint.newRangeQuery(name(), lower, upper)
-            );
+            failIfNotIndexedAndNoDocValues();
+            return rangeQuery(lowerTerm, upperTerm, includeLower, includeUpper, (lower, upper) -> {
+                Query query = InetAddressPoint.newRangeQuery(name(), lower, upper);
+                if (isSearchable() && hasDocValues()) {
+                    return new IndexOrDocValuesQuery(
+                        query,
+                        SortedSetDocValuesField.newSlowRangeQuery(
+                            ((PointRangeQuery) query).getField(),
+                            new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                            new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                            true,
+                            true
+                        )
+                    );
+                }
+                if (hasDocValues()) {
+                    return SortedSetDocValuesField.newSlowRangeQuery(
+                        ((PointRangeQuery) query).getField(),
+                        new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                        new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                        true,
+                        true
+                    );
+                }
+                return query;
+            });
         }
 
         /**
diff --git a/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java b/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
index 1a66037d98d71..0a2435553b19e 100644
--- a/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
+++ b/server/src/test/java/org/opensearch/index/mapper/IpFieldTypeTests.java
@@ -32,10 +32,14 @@
 package org.opensearch.index.mapper;
 
 import org.apache.lucene.document.InetAddressPoint;
+import org.apache.lucene.document.SortedSetDocValuesField;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.search.ConstantScoreQuery;
+import org.apache.lucene.search.IndexOrDocValuesQuery;
 import org.apache.lucene.search.MatchNoDocsQuery;
+import org.apache.lucene.search.PointRangeQuery;
+import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.opensearch.Version;
 import org.opensearch.cluster.metadata.IndexMetadata;
@@ -75,22 +79,41 @@ public void testTermQuery() {
         MappedFieldType ft = new IpFieldMapper.IpFieldType("field");
 
         String ip = "2001:db8::2:1";
-        assertEquals(InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip)), ft.termQuery(ip, null));
+
+        Query query = InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip));
+
+        assertEquals(
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowExactQuery("field", new BytesRef(((PointRangeQuery) query).getLowerPoint()))
+            ),
+            ft.termQuery(ip, null)
+        );
 
         ip = "192.168.1.7";
-        assertEquals(InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip)), ft.termQuery(ip, null));
+        query = InetAddressPoint.newExactQuery("field", InetAddresses.forString(ip));
+        assertEquals(
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowExactQuery("field", new BytesRef(((PointRangeQuery) query).getLowerPoint()))
+            ),
+            ft.termQuery(ip, null)
+        );
 
         ip = "2001:db8::2:1";
         String prefix = ip + "/64";
-        assertEquals(InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 64), ft.termQuery(prefix, null));
+
+        query = InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 64);
+        assertEquals(query, ft.termQuery(prefix, null));
 
         ip = "192.168.1.7";
         prefix = ip + "/16";
-        assertEquals(InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 16), ft.termQuery(prefix, null));
+        query = InetAddressPoint.newPrefixQuery("field", InetAddresses.forString(ip), 16);
+        assertEquals(query, ft.termQuery(prefix, null));
 
-        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true, null, Collections.emptyMap());
+        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, false, null, Collections.emptyMap());
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> unsearchable.termQuery("::1", null));
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testTermsQuery() {
@@ -118,44 +141,123 @@ public void testTermsQuery() {
 
     public void testRangeQuery() {
         MappedFieldType ft = new IpFieldMapper.IpFieldType("field");
-
+        Query query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddressPoint.MAX_VALUE);
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddressPoint.MAX_VALUE),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery(null, null, randomBoolean(), randomBoolean(), null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("192.168.2.0"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("192.168.2.0")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery(null, "192.168.2.0", randomBoolean(), true, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("192.168.1.255"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("192.168.1.255")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery(null, "192.168.2.0", randomBoolean(), false, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::"), InetAddressPoint.MAX_VALUE);
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::"), InetAddressPoint.MAX_VALUE),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery("2001:db8::", null, true, randomBoolean(), null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::1"), InetAddressPoint.MAX_VALUE);
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::1"), InetAddressPoint.MAX_VALUE),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery("2001:db8::", null, false, randomBoolean(), null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::"), InetAddresses.forString("2001:db8::ffff"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::"), InetAddresses.forString("2001:db8::ffff")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery("2001:db8::", "2001:db8::ffff", true, true, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::1"), InetAddresses.forString("2001:db8::fffe"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::1"), InetAddresses.forString("2001:db8::fffe")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery("2001:db8::", "2001:db8::ffff", false, false, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::2"), InetAddresses.forString("2001:db8::"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("2001:db8::2"), InetAddresses.forString("2001:db8::")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             // same lo/hi values but inclusive=false so this won't match anything
             ft.rangeQuery("2001:db8::1", "2001:db8::1", false, false, null, null, null, null)
         );
@@ -178,30 +280,60 @@ public void testRangeQuery() {
             )
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("::fffe:ffff:ffff"));
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::"), InetAddresses.forString("::fffe:ffff:ffff")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             // same lo/hi values but inclusive=false so this won't match anything
             ft.rangeQuery("::", "0.0.0.0", true, false, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::1:0:0:0"), InetAddressPoint.MAX_VALUE);
         assertEquals(
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("::1:0:0:0"), InetAddressPoint.MAX_VALUE),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             // same lo/hi values but inclusive=false so this won't match anything
             ft.rangeQuery("255.255.255.255", "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", false, true, null, null, null, null)
         );
 
+        query = InetAddressPoint.newRangeQuery("field", InetAddresses.forString("192.168.1.7"), InetAddresses.forString("2001:db8::"));
         assertEquals(
             // lower bound is ipv4, upper bound is ipv6
-            InetAddressPoint.newRangeQuery("field", InetAddresses.forString("192.168.1.7"), InetAddresses.forString("2001:db8::")),
+            new IndexOrDocValuesQuery(
+                query,
+                SortedSetDocValuesField.newSlowRangeQuery(
+                    ((PointRangeQuery) query).getField(),
+                    new BytesRef(((PointRangeQuery) query).getLowerPoint()),
+                    new BytesRef(((PointRangeQuery) query).getUpperPoint()),
+                    true,
+                    true
+                )
+            ),
             ft.rangeQuery("::ffff:c0a8:107", "2001:db8::", true, true, null, null, null, null)
         );
 
-        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, true, null, Collections.emptyMap());
+        MappedFieldType unsearchable = new IpFieldMapper.IpFieldType("field", false, false, false, null, Collections.emptyMap());
         IllegalArgumentException e = expectThrows(
             IllegalArgumentException.class,
             () -> unsearchable.rangeQuery("::1", "2001::", true, true, null, null, null, null)
         );
-        assertEquals("Cannot search on field [field] since it is not indexed.", e.getMessage());
+        assertEquals("Cannot search on field [field] since it is both not indexed, and does not have doc_values enabled.", e.getMessage());
     }
 
     public void testFetchSourceValue() throws IOException {