Skip to content

Commit 616ff4c

Browse files
authored
Merge branch 'main' into issue-18750
Signed-off-by: Michael Froh <msfroh@apache.org>
2 parents cdd3a31 + 0761ebe commit 616ff4c

File tree

317 files changed

+11193
-637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+11193
-637
lines changed

.github/workflows/detect-breaking-change.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
cache-disabled: true
1717
arguments: japicmp
18-
gradle-version: 8.14
18+
gradle-version: 8.14.3
1919
build-root-directory: server
2020
- if: failure()
2121
run: cat server/build/reports/java-compatibility/report.txt

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
4343
- Make GRPC transport extensible to allow plugins to register and expose their own GRPC services ([#18516](https://github.com/opensearch-project/OpenSearch/pull/18516))
4444
- Added approximation support for range queries with now in date field ([#18511](https://github.com/opensearch-project/OpenSearch/pull/18511))
4545
- Upgrade to protobufs 0.6.0 and clean up deprecated TermQueryProtoUtils code ([#18880](https://github.com/opensearch-project/OpenSearch/pull/18880))
46+
- Expand fetch phase profiling to multi-shard queries ([#18887](https://github.com/opensearch-project/OpenSearch/pull/18887))
4647
- Prevent shard initialization failure due to streaming consumer errors ([#18877](https://github.com/opensearch-project/OpenSearch/pull/18877))
4748
- APIs for stream transport and new stream-based search api action ([#18722](https://github.com/opensearch-project/OpenSearch/pull/18722))
4849
- Add support for custom remote store segment path prefix to support clusterless configurations ([#18750](https://github.com/opensearch-project/OpenSearch/issues/18750))
50+
- Added the core process for warming merged segments in remote-store enabled domains ([#18683](https://github.com/opensearch-project/OpenSearch/pull/18683))
51+
- Optimize Composite Aggregations by removing unnecessary object allocations ([#18531](https://github.com/opensearch-project/OpenSearch/pull/18531))
52+
- [Star-Tree] Add search support for ip field type ([#18671](https://github.com/opensearch-project/OpenSearch/pull/18671))
4953

5054
### Changed
5155
- Update Subject interface to use CheckedRunnable ([#18570](https://github.com/opensearch-project/OpenSearch/issues/18570))
@@ -55,6 +59,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5559
- Making multi rate limiters in repository dynamic [#18069](https://github.com/opensearch-project/OpenSearch/pull/18069)
5660
- Optimize grouping for segment concurrent search by ensuring that documents within each group are as equal as possible ([#18451](https://github.com/opensearch-project/OpenSearch/pull/18451))
5761
- Move transport-grpc from a core plugin to a module ([#18897](https://github.com/opensearch-project/OpenSearch/pull/18897))
62+
- Remove `experimental` designation from transport-grpc settings ([#18915](https://github.com/opensearch-project/OpenSearch/pull/18915))
63+
- Rename package org.opensearch.plugin,transport.grpc to org.opensearch.transport.grpc ([#18923](https://github.com/opensearch-project/OpenSearch/pull/18923))
5864

5965
### Dependencies
6066
- Bump `stefanzweifel/git-auto-commit-action` from 5 to 6 ([#18524](https://github.com/opensearch-project/OpenSearch/pull/18524))
@@ -103,6 +109,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
103109
- Fix leafSorter optimization for ReadOnlyEngine and NRTReplicationEngine ([#18639](https://github.com/opensearch-project/OpenSearch/pull/18639))
104110
- Close IndexFieldDataService asynchronously ([#18888](https://github.com/opensearch-project/OpenSearch/pull/18888))
105111
- Fix query string regex queries incorrectly swallowing TooComplexToDeterminizeException ([#18883](https://github.com/opensearch-project/OpenSearch/pull/18883))
112+
- Fix socks5 user password settings for Azure repo ([#18904](https://github.com/opensearch-project/OpenSearch/pull/18904))
113+
- Reset isPipelineResolved to false to resolve the system ingest pipeline again. ([#18911](https://github.com/opensearch-project/OpenSearch/pull/18911))
106114

107115
### Security
108116

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,8 @@
1-
#
2-
# SPDX-License-Identifier: Apache-2.0
3-
#
4-
# The OpenSearch Contributors require contributions made to
5-
# this file be licensed under the Apache-2.0 license or a
6-
# compatible open source license.
7-
#
8-
# Modifications Copyright OpenSearch Contributors. See
9-
# GitHub history for details.
10-
#
11-
121
distributionBase=GRADLE_USER_HOME
132
distributionPath=wrapper/dists
14-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
156
zipStoreBase=GRADLE_USER_HOME
167
zipStorePath=wrapper/dists
17-
distributionSha256Sum=efe9a3d147d948d7528a9887fa35abcf24ca1a43ad06439996490f77569b02d1
8+
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c

libs/common/src/main/java/org/opensearch/common/recycler/Recycler.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
package org.opensearch.common.recycler;
3434

35+
import org.opensearch.common.annotation.ExperimentalApi;
3536
import org.opensearch.common.lease.Releasable;
3637

3738
/**
@@ -40,6 +41,7 @@
4041
*
4142
* @opensearch.internal
4243
*/
44+
@ExperimentalApi
4345
public interface Recycler<T> {
4446

4547
/**
@@ -73,6 +75,7 @@ interface C<T> {
7375
*
7476
* @opensearch.internal
7577
*/
78+
@ExperimentalApi
7679
interface V<T> extends Releasable {
7780

7881
/** Reference to the value. */

modules/transport-grpc/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ The `transport-grpc` module initializes a new client/server transport implementi
99
Enable this transport with:
1010

1111
```
12-
setting 'aux.transport.types', '[experimental-transport-grpc]'
13-
setting 'aux.transport.experimental-transport-grpc.port', '9400-9500' //optional
12+
setting 'aux.transport.types', '[transport-grpc]'
13+
setting 'aux.transport.transport-grpc.port', '9400-9500' //optional
1414
```
1515

1616
For the secure transport:
1717

1818
```
19-
setting 'aux.transport.types', '[experimental-secure-transport-grpc]'
20-
setting 'aux.transport.experimental-secure-transport-grpc.port', '9400-9500' //optional
19+
setting 'aux.transport.types', '[secure-transport-grpc]'
20+
setting 'aux.transport.secure-transport-grpc.port', '9400-9500' //optional
2121
```
2222

2323

@@ -76,5 +76,5 @@ setting 'grpc.netty.keepalive_timeout', '1s'
7676
To run OpenSearch with the gRPC transport enabled:
7777

7878
```bash
79-
./gradlew run -Dtests.opensearch.aux.transport.types="[experimental-transport-grpc]"
79+
./gradlew run -Dtests.opensearch.aux.transport.types="[transport-grpc]"
8080
```

modules/transport-grpc/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ apply plugin: 'opensearch.internal-cluster-test'
1111

1212
opensearchplugin {
1313
description = 'gRPC based transport implementation'
14-
classname = 'org.opensearch.plugin.transport.grpc.GrpcPlugin'
14+
classname = 'org.opensearch.transport.grpc.GrpcPlugin'
1515
}
1616

1717
testClusters {
1818
integTest {
19-
setting 'aux.transport.types', '[experimental-transport-grpc]'
19+
setting 'aux.transport.types', '[transport-grpc]'
2020
}
2121
}
2222

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.transport.grpc;
9+
package org.opensearch.transport.grpc;
1010

11-
import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
1211
import org.opensearch.protobufs.BulkRequest;
1312
import org.opensearch.protobufs.BulkRequestBody;
1413
import org.opensearch.protobufs.BulkResponse;
1514
import org.opensearch.protobufs.IndexOperation;
1615
import org.opensearch.protobufs.services.DocumentServiceGrpc;
16+
import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
1717

1818
import io.grpc.ManagedChannel;
1919

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.transport.grpc;
9+
package org.opensearch.transport.grpc;
1010

1111
import org.opensearch.action.index.IndexResponse;
1212
import org.opensearch.common.network.NetworkAddress;
1313
import org.opensearch.common.settings.Settings;
1414
import org.opensearch.common.xcontent.XContentType;
1515
import org.opensearch.core.common.transport.TransportAddress;
16-
import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
1716
import org.opensearch.plugins.Plugin;
1817
import org.opensearch.test.OpenSearchIntegTestCase;
18+
import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
1919

2020
import java.net.InetSocketAddress;
2121
import java.util.ArrayList;
@@ -26,8 +26,8 @@
2626

2727
import io.grpc.health.v1.HealthCheckResponse;
2828

29-
import static org.opensearch.plugin.transport.grpc.Netty4GrpcServerTransport.GRPC_TRANSPORT_SETTING_KEY;
3029
import static org.opensearch.transport.AuxTransport.AUX_TRANSPORT_TYPES_KEY;
30+
import static org.opensearch.transport.grpc.Netty4GrpcServerTransport.GRPC_TRANSPORT_SETTING_KEY;
3131

3232
/**
3333
* Base test class for gRPC transport integration tests.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.transport.grpc;
9+
package org.opensearch.transport.grpc;
1010

1111
import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
1212
import org.opensearch.cluster.health.ClusterHealthStatus;
13-
import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
13+
import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
1414

1515
import io.grpc.health.v1.HealthCheckResponse;
1616

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.plugin.transport.grpc;
9+
package org.opensearch.transport.grpc;
1010

11-
import org.opensearch.plugin.transport.grpc.ssl.NettyGrpcClient;
1211
import org.opensearch.protobufs.SearchRequest;
1312
import org.opensearch.protobufs.SearchRequestBody;
1413
import org.opensearch.protobufs.SearchResponse;
1514
import org.opensearch.protobufs.services.SearchServiceGrpc;
15+
import org.opensearch.transport.grpc.ssl.NettyGrpcClient;
1616

1717
import io.grpc.ManagedChannel;
1818

0 commit comments

Comments
 (0)