Skip to content

BulkRequest: Make sure that indices Set is properly initialized when being deserialized from TransportRequest stream #20132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cwperks merged 3 commits into from
Dec 1, 2025
Merged

BulkRequest: Make sure that indices Set is properly initialized when being deserialized from TransportRequest stream #20132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14a3573
BulkRequest: Make sure that indices Set is properly initialized when …
nibix Dec 1, 2025
f8ad58b
fix
nibix Dec 1, 2025
d946f19
simplified BytesStreamOutput construction
nibix Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,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))
- 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))
- 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))

### Dependencies
- Bump Apache Lucene from 10.3.1 to 10.3.2 ([#20026](https://github.com/opensearch-project/OpenSearch/pull/20026))
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/org/opensearch/action/bulk/BulkRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ public BulkRequest(StreamInput in) throws IOException {
if (in.getVersion().onOrAfter(Version.V_2_14_0) && in.getVersion().before(Version.V_3_0_0)) {
in.readInt(); // formerly batch_size
}
requests.stream().map(DocWriteRequest::index).forEach(indices::add);
}

public BulkRequest(@Nullable String globalIndex) {
Expand Down
11 changes: 11 additions & 0 deletions server/src/test/java/org/opensearch/action/bulk/TransportBulkActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.node.DiscoveryNodeRole;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.io.stream.BytesStreamOutput;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.action.ActionListener;
Expand All @@ -77,6 +78,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.concurrent.TimeUnit;
Expand Down Expand Up @@ -379,6 +381,15 @@ public void testRejectionAfterCreateIndexIsPropagated() throws Exception {
}
}

public void testSerializationDeserialization() throws Exception {
BulkRequest bulkRequest = new BulkRequest().add(new IndexRequest("index").id("id").source(Collections.emptyMap()));
BytesStreamOutput out = new BytesStreamOutput();
out.setVersion(Version.V_3_4_0);
bulkRequest.writeTo(out);
BulkRequest deserializedRequest = new BulkRequest(out.bytes().streamInput());
assertEquals(Set.of("index"), deserializedRequest.getIndices());
}

private BulkRequest buildBulkRequest(List<String> indices) {
BulkRequest request = new BulkRequest();
for (String index : indices) {
Expand Down
Loading