Merge remote-tracking branch 'upstream/main' into auto-date-skiplist

Author: asimmahmood1

CHANGELOG.md

@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Support pull-based ingestion message mappers and raw payload support ([#19765](https://github.com/opensearch-project/OpenSearch/pull/19765))
 - Add search API tracker ([#18601](https://github.com/opensearch-project/OpenSearch/pull/18601))
 - Support dynamic consumer configuration update in pull-based ingestion ([#19963](https://github.com/opensearch-project/OpenSearch/pull/19963))
+- Cache the `StoredFieldsReader` for scroll query optimization ([#20112](https://github.com/opensearch-project/OpenSearch/pull/20112))
 
 ### Changed
 - Combining filter rewrite and skip list to optimize sub aggregation([#19573](https://github.com/opensearch-project/OpenSearch/pull/19573))
@@ -72,6 +73,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump opensearch-protobufs dependency to 0.24.0 and update transport-grpc module compatibility ([#20059](https://github.com/opensearch-project/OpenSearch/pull/20059))
 - Refactor the ShardStats, WarmerStats and IndexingPressureStats class to use the Builder pattern instead of constructors ([#19966](https://github.com/opensearch-project/OpenSearch/pull/19966))
 - Add skiplist optimization to auto_date_histogram aggregation ([#20057](https://github.com/opensearch-project/OpenSearch/pull/20057))
+- Throw exceptions for currently unsupported GRPC request-side fields ([#20162](https://github.com/opensearch-project/OpenSearch/pull/20162))
 
 ### Fixed
 - Fix Allocation and Rebalance Constraints of WeightFunction are incorrectly reset ([#19012](https://github.com/opensearch-project/OpenSearch/pull/19012))
@@ -95,6 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fix node bootstrap error when enable stream transport and remote cluster state ([#19948](https://github.com/opensearch-project/OpenSearch/pull/19948))
 - Keep track and release Reactor Netty 4 Transport accepted Http Channels during the Node shutdown ([#20106](https://github.com/opensearch-project/OpenSearch/pull/20106))
 - Fix deletion failure/error of unused index template; case when an index template matches a data stream but has a lower priority. ([#20102](https://github.com/opensearch-project/OpenSearch/pull/20102))
+- Fixed version incompatibility in remote state entities using bytestream for ser/de ([#20080](https://github.com/opensearch-project/OpenSearch/pull/20080))
 - Fix toBuilder method in EngineConfig to include mergedSegmentTransferTracker([#20105](https://github.com/opensearch-project/OpenSearch/pull/20105))
 - Fixed handling of property index in BulkRequest during deserialization ([#20132](https://github.com/opensearch-project/OpenSearch/pull/20132))
 - Fix negative CPU usage values in node stats ([#19120](https://github.com/opensearch-project/OpenSearch/issues/19120))
@@ -136,6 +139,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bump `com.google.api:api-common` from 2.52.0 to 2.55.1 ([#20083](https://github.com/opensearch-project/OpenSearch/pull/20083))
 - Bump `actions/upload-artifact` from 4 to 5 ([#20081](https://github.com/opensearch-project/OpenSearch/pull/20081))
 - Bump `com.nimbusds:nimbus-jose-jwt` from 10.5 to 10.6 ([#20084](https://github.com/opensearch-project/OpenSearch/pull/20084))
+- Bump `commons-logging` from 1.2 to 1.3.5 ([#20156](https://github.com/opensearch-project/OpenSearch/pull/20156))
 
 ### Deprecated
 - Deprecated existing constructors in ThreadPoolStats.Stats in favor of the new Builder ([#19317](https://github.com/opensearch-project/OpenSearch/pull/19317))

client/rest/build.gradle

@@ -112,6 +112,16 @@ thirdPartyAudit {
       'org.apache.log4j.Level',
       'org.apache.log4j.Logger',
       'org.apache.log4j.Priority',
+      'org.apache.logging.log4j.Level',
+      'org.apache.logging.log4j.LogManager',
+      'org.apache.logging.log4j.Marker',
+      'org.apache.logging.log4j.MarkerManager',
+      'org.apache.logging.log4j.spi.AbstractLoggerAdapter',
+      'org.apache.logging.log4j.spi.ExtendedLogger',
+      'org.apache.logging.log4j.spi.LoggerAdapter',
+      'org.apache.logging.log4j.spi.LoggerContext',
+      'org.apache.logging.log4j.spi.LoggerContextFactory',
+      'org.apache.logging.log4j.util.StackLocatorUtil',
       //commons-logging provided dependencies
       'javax.servlet.ServletContextEvent',
       'javax.servlet.ServletContextListener',

client/rest/licenses/commons-logging-1.2.jar.sha1

@@ -0,0 +1 @@
+a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1

client/rest/licenses/commons-logging-1.3.5.jar.sha1

@@ -101,6 +101,16 @@ thirdPartyAudit.ignoreMissingClasses(
   'org.apache.log4j.Level',
   'org.apache.log4j.Logger',
   'org.apache.log4j.Priority',
+  'org.apache.logging.log4j.Level',
+  'org.apache.logging.log4j.LogManager',
+  'org.apache.logging.log4j.Marker',
+  'org.apache.logging.log4j.MarkerManager',
+  'org.apache.logging.log4j.spi.AbstractLoggerAdapter',
+  'org.apache.logging.log4j.spi.ExtendedLogger',
+  'org.apache.logging.log4j.spi.LoggerAdapter',
+  'org.apache.logging.log4j.spi.LoggerContext',
+  'org.apache.logging.log4j.spi.LoggerContextFactory',
+  'org.apache.logging.log4j.util.StackLocatorUtil',
   //commons-logging provided dependencies
   'javax.servlet.ServletContextEvent',
   'javax.servlet.ServletContextListener'

client/sniffer/build.gradle

@@ -0,0 +1 @@
+a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1

client/sniffer/licenses/commons-logging-1.2.jar.sha1

@@ -49,7 +49,7 @@ httpcore5         = "5.3.4"
 httpclient        = "4.5.14"
 httpcore          = "4.4.16"
 httpasyncclient   = "4.1.5"
-commonslogging    = "1.2"
+commonslogging    = "1.3.5"
 commonscodec      = "1.18.0"
 commonslang       = "3.18.0"
 commonscompress   = "1.28.0"

client/sniffer/licenses/commons-logging-1.3.5.jar.sha1

@@ -32,6 +32,7 @@
 
 package org.opensearch.index.reindex;
 
+import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.action.admin.cluster.node.info.NodeInfo;
 import org.opensearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
 import org.opensearch.action.bulk.BackoffPolicy;
@@ -68,7 +69,15 @@
 /**
  * Integration test for bulk retry behavior. Useful because retrying relies on the way that the
  * rest of OpenSearch throws exceptions and unit tests won't verify that.
+ *
+ * <p>{@code @SuppressCodecs("*")} is needed because we cache StoredFieldsReader instances
+ * across scroll batches for sequential access. Different batches may run on different threads
+ * (but never concurrently). Lucene's AssertingStoredFieldsFormat enforces thread affinity
+ * that rejects this valid sequential cross-thread usage.
+ *
+ * @see org.opensearch.search.internal.ScrollContext#getCachedSequentialReader(Object)
  */
+@LuceneTestCase.SuppressCodecs("*")
 public class RetryTests extends OpenSearchIntegTestCase {
 
     private static final int DOC_COUNT = 20;

gradle/libs.versions.toml

@@ -85,6 +85,16 @@ public static org.opensearch.action.bulk.BulkRequest prepareRequest(BulkRequest
             )
         );
 
+        // Type is a deprecated field according to the spec, thus no plans to support it
+        if (request.hasType()) {
+            throw new UnsupportedOperationException("type param is not supported");
+        }
+
+        // TODO support global_params
+        if (request.hasGlobalParams()) {
+            throw new UnsupportedOperationException("global_params param is not supported yet");
+        }
+
         return bulkRequest;
     }
 }