Merge branch 'main' into feature/sandbox-rejection

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

CHANGELOG.md

@@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [Workload Management] QueryGroup resource tracking framework changes ([#13897](https://github.com/opensearch-project/OpenSearch/pull/13897))
 - Support filtering on a large list encoded by bitmap ([#14774](https://github.com/opensearch-project/OpenSearch/pull/14774))
 - Add slice execution listeners to SearchOperationListener interface ([#15153](https://github.com/opensearch-project/OpenSearch/pull/15153))
+- Make balanced shards allocator timebound ([#15239](https://github.com/opensearch-project/OpenSearch/pull/15239))
 - Add allowlist setting for ingest-geoip and ingest-useragent ([#15325](https://github.com/opensearch-project/OpenSearch/pull/15325))
 - Adding access to noSubMatches and noOverlappingMatches in Hyphenation ([#13895](https://github.com/opensearch-project/OpenSearch/pull/13895))
 - Add support for index level max slice count setting for concurrent segment search ([#15336](https://github.com/opensearch-project/OpenSearch/pull/15336))
@@ -31,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add concurrent search support for Derived Fields ([#15326](https://github.com/opensearch-project/OpenSearch/pull/15326))
 - [Workload Management] Add query group stats constructs ([#15343](https://github.com/opensearch-project/OpenSearch/pull/15343)))
 - Add runAs to Subject interface and introduce IdentityAwarePlugin extension point ([#14630](https://github.com/opensearch-project/OpenSearch/pull/14630))
+- Optimize NodeIndicesStats output behind flag ([#14454](https://github.com/opensearch-project/OpenSearch/pull/14454))
 - [Workload Management] Add rejection logic for co-ordinator and shard level requests ([#15428](https://github.com/opensearch-project/OpenSearch/pull/15428)))
 
 ### Dependencies

plugins/transport-reactor-netty4/src/main/java/org/opensearch/http/reactor/netty4/ReactorNetty4HttpChunk.java

@@ -8,39 +8,31 @@
 
 package org.opensearch.http.reactor.netty4;
 
+import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.core.common.bytes.BytesReference;
 import org.opensearch.http.HttpChunk;
-import org.opensearch.transport.reactor.netty4.Netty4Utils;
-
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import io.netty.buffer.ByteBuf;
 
 class ReactorNetty4HttpChunk implements HttpChunk {
-    private final AtomicBoolean released;
-    private final boolean pooled;
-    private final ByteBuf content;
+    private final BytesArray content;
     private final boolean last;
 
-    ReactorNetty4HttpChunk(ByteBuf content, boolean last) {
-        this.content = content;
-        this.pooled = true;
-        this.released = new AtomicBoolean(false);
+    ReactorNetty4HttpChunk(ByteBuf buf, boolean last) {
+        // Since the chunks could be batched and processing could be delayed, we are copying the content here
+        final byte[] content = new byte[buf.readableBytes()];
+        buf.readBytes(content);
+        this.content = new BytesArray(content);
         this.last = last;
     }
 
     @Override
     public BytesReference content() {
-        assert released.get() == false;
-        return Netty4Utils.toBytesReference(content);
+        return content;
     }
 
     @Override
-    public void close() {
-        if (pooled && released.compareAndSet(false, true)) {
-            content.release();
-        }
-    }
+    public void close() {}
 
     @Override
     public boolean isLast() {

plugins/transport-reactor-netty4/src/main/java/org/opensearch/http/reactor/netty4/ReactorNetty4StreamingHttpChannel.java

@@ -103,6 +103,7 @@ public void receiveChunk(HttpChunk message) {
             }
         } catch (final Exception ex) {
             producer.error(ex);
+        } finally {
             message.close();
         }
     }

plugins/transport-reactor-netty4/src/main/java/org/opensearch/http/reactor/netty4/ReactorNetty4StreamingRequestConsumer.java

@@ -44,7 +44,7 @@ public void subscribe(Subscriber<? super HttpContent> s) {
     }
 
     HttpChunk createChunk(HttpContent chunk, boolean last) {
-        return new ReactorNetty4HttpChunk(chunk.copy().content().retain(), last);
+        return new ReactorNetty4HttpChunk(chunk.content(), last);
     }
 
     StreamingHttpChannel httpChannel() {

rest-api-spec/src/main/resources/rest-api-spec/test/cluster.put_settings/10_basic.yml

@@ -85,8 +85,8 @@
 "Test set invalid search backpressure mode":
 
   - skip:
-      version: "- 2.99.99"
-      reason: "Parsing and validation of SearchBackpressureMode does not exist in versions < 3.0"
+      version: "- 2.8.99"
+      reason: "Fixed in 2.9.0"
 
   - do:
       catch: bad_request