Merge branch 'main' into dependabot/gradle/plugins/repository-gcs/com.google.api.grpc-proto-google-common-protos-2.54.1

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

CHANGELOG.md

@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Changed
 - Migrate BC libs to their FIPS counterparts ([#14912](https://github.com/opensearch-project/OpenSearch/pull/14912))
+- Increase the floor segment size to 16MB ([#17699](https://github.com/opensearch-project/OpenSearch/pull/17699))
 
 ### Dependencies
 - Bump `com.nimbusds:nimbus-jose-jwt` from 9.41.1 to 10.0.2 ([#17607](https://github.com/opensearch-project/OpenSearch/pull/17607), [#17669](https://github.com/opensearch-project/OpenSearch/pull/17669))
@@ -32,6 +33,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.github.luben:zstd-jni` from 1.5.5-1 to 1.5.6-1 ([#17674](https://github.com/opensearch-project/OpenSearch/pull/17674))
 - Bump `lycheeverse/lychee-action` from 2.3.0 to 2.4.0 ([#17731](https://github.com/opensearch-project/OpenSearch/pull/17731))
 - Bump `com.netflix.nebula.ospackage-base` from 11.11.1 to 11.11.2 ([#17734](https://github.com/opensearch-project/OpenSearch/pull/17734))
+- Bump `com.nimbusds:oauth2-oidc-sdk` from 11.21 to 11.23.1 ([#17729](https://github.com/opensearch-project/OpenSearch/pull/17729))
 - Bump `com.google.api.grpc:proto-google-common-protos` from 2.52.0 to 2.54.1 ([#17733](https://github.com/opensearch-project/OpenSearch/pull/17733))
 
 ### Changed

plugins/repository-azure/build.gradle

@@ -62,7 +62,7 @@ dependencies {
   api 'com.microsoft.azure:msal4j-persistence-extension:1.3.0'
   api "net.java.dev.jna:jna-platform:${versions.jna}"
   api 'com.microsoft.azure:msal4j:1.18.0'
-  api 'com.nimbusds:oauth2-oidc-sdk:11.21'
+  api 'com.nimbusds:oauth2-oidc-sdk:11.23.1'
   api 'com.nimbusds:nimbus-jose-jwt:10.0.2'
   api 'com.nimbusds:content-type:2.3'
   api 'com.nimbusds:lang-tag:1.7'

plugins/repository-azure/licenses/oauth2-oidc-sdk-11.21.jar.sha1

@@ -0,0 +1 @@
+17facb3e3fa9e048f87b34c706e1163cad660e6d

plugins/repository-azure/licenses/oauth2-oidc-sdk-11.23.1.jar.sha1

@@ -50,7 +50,11 @@ public class LogByteSizeMergePolicyProvider implements MergePolicyProvider {
     private final Logger logger;
     private final boolean mergesEnabled;
 
-    public static final ByteSizeValue DEFAULT_MIN_MERGE = new ByteSizeValue(2, ByteSizeUnit.MB);
+    /**
+     *  Use 16MB floor size to match Lucene default.
+     *  See <a href="https://github.com/apache/lucene/pull/14189">...</a>
+     */
+    public static final ByteSizeValue DEFAULT_MIN_MERGE = new ByteSizeValue(16, ByteSizeUnit.MB);
     public static final int DEFAULT_MERGE_FACTOR = 10;
 
     public static final ByteSizeValue DEFAULT_MAX_MERGED_SEGMENT = new ByteSizeValue(5, ByteSizeUnit.GB);

server/src/main/java/org/opensearch/index/LogByteSizeMergePolicyProvider.java

@@ -136,7 +136,13 @@ public final class TieredMergePolicyProvider implements MergePolicyProvider {
     private final boolean mergesEnabled;
 
     public static final double DEFAULT_EXPUNGE_DELETES_ALLOWED = 10d;
-    public static final ByteSizeValue DEFAULT_FLOOR_SEGMENT = new ByteSizeValue(2, ByteSizeUnit.MB);
+
+    /**
+     *  Use 16MB floor size to match Lucene default.
+     *  See <a href="https://github.com/apache/lucene/pull/14189">...</a>
+     */
+    public static final ByteSizeValue DEFAULT_FLOOR_SEGMENT = new ByteSizeValue(16, ByteSizeUnit.MB);
+
     public static final int DEFAULT_MAX_MERGE_AT_ONCE = 10;
     public static final ByteSizeValue DEFAULT_MAX_MERGED_SEGMENT = new ByteSizeValue(5, ByteSizeUnit.GB);
     public static final double DEFAULT_SEGMENTS_PER_TIER = 10.0d;