Skip to content

Commit 500fb23

Browse files
razvanrazvan
committed
Add support for OpenSearch 3.6.0
1 parent e22da41 commit 500fb23

4 files changed

Lines changed: 23 additions & 21 deletions

File tree

‎docs/modules/opensearch/partials/supported-versions.adoc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
// Stackable Platform documentation.
44

55
- 3.1.0 (LTS)
6-
- 3.4.0
6+
- 3.6.0
7+
- 3.4.0 (deprecated)

‎rust/operator-binary/src/controller/build/node_config.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const CONFIG_OPTION_NODE_ROLES: &str = "node.roles";
7070

7171
/// Defines the path for the logs
7272
/// OpenSearch grants the required access rights, see
73-
/// <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/bootstrap/Security.java#L369>
73+
/// <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/bootstrap/Security.java#L371>
7474
/// The permissions "write" and "delete" are required for the log file rollover.
7575
/// Type: string
7676
const CONFIG_OPTION_PATH_LOGS: &str = "path.logs";
@@ -371,7 +371,7 @@ impl NodeConfig {
371371
/// Please read the following sections for an explanation of these restrictions.
372372
///
373373
/// This configuration setting replaces the setting `cluster.initial_master_nodes`, see
374-
/// <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L79-L93>.
374+
/// <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L79-L93>.
375375
///
376376
/// This setting is required on nodes with the cluster-manager node role on a multi-node
377377
/// cluster. Otherwise the bootstrapping of the cluster fails and all pods report:
@@ -381,7 +381,7 @@ impl NodeConfig {
381381
/// error is thrown:
382382
/// > setting [cluster.initial_cluster_manager_nodes] is not allowed when [discovery.type] is set to [single-node]
383383
///
384-
/// see <https://github.com/opensearch-project/OpenSearch/blob/3.4.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L126-L136>
384+
/// see <https://github.com/opensearch-project/OpenSearch/blob/3.6.0/server/src/main/java/org/opensearch/cluster/coordination/ClusterBootstrapService.java#L126-L136>
385385
///
386386
/// This setting does not seem to have an effect on nodes without the cluster-manager node
387387
/// role. However, as it is recommended (see the Elasticsearch documentation below) to not set

‎rust/operator-binary/src/controller/build/product_logging/vector-test.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ tests:
4545
{"type": "server", "timestamp": "2025-10-01T12:47:28,363Z", "level": "INFO", "component": "o.o.c.c.JoinHelper", "cluster.name": "opensearch", "node.name": "opensearch-nodes-cluster-manager-0", "message": "failed to join {opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true} with JoinRequest{sourceNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}, minimumTerm=0, optionalJoin=Optional[Join{term=1, lastAcceptedTerm=0, lastAcceptedVersion=0, sourceNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}, targetNode={opensearch-nodes-cluster-manager-0}{sk-r0P_TTYuPqaamTFbjKg}{fIRSMbQYSe2nKQZ_sPn4kg}{10.244.0.20}{10.244.0.20:9300}{m}{shard_indexing_pressure_enabled=true}}]}",
4646
"stacktrace": ["org.opensearch.transport.RemoteTransportException: [opensearch-nodes-cluster-manager-0][10.244.0.20:9300][internal:cluster/coordination/join]",
4747
"Caused by: org.opensearch.cluster.coordination.CoordinationStateRejectedException: became follower",
48-
"at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]",
48+
"at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]",
4949
"at java.base/java.util.HashMap$$Values.forEach(HashMap.java:1073) ~[?:?]",
50-
"at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]",
51-
"at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.4.0.jar:3.4.0]",
52-
"at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.4.0.jar:3.4.0]",
53-
"at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.4.0.jar:3.4.0]",
54-
"at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.4.0.jar:3.4.0]",
55-
"at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.4.0.jar:3.4.0]",
50+
"at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]",
51+
"at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.6.0.jar:3.6.0]",
52+
"at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.6.0.jar:3.6.0]",
53+
"at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.6.0.jar:3.6.0]",
54+
"at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.6.0.jar:3.6.0]",
55+
"at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.6.0.jar:3.6.0]",
5656
"at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) ~[?:?]",
5757
"at java.base/java.util.concurrent.ThreadPoolExecutor$$Worker.run(ThreadPoolExecutor.java:642) ~[?:?]",
5858
"at java.base/java.lang.Thread.run(Thread.java:1583) [?:?]"] }
@@ -75,14 +75,14 @@ tests:
7575
\n\
7676
org.opensearch.transport.RemoteTransportException: [opensearch-nodes-cluster-manager-0][10.244.0.20:9300][internal:cluster/coordination/join]\n\
7777
Caused by: org.opensearch.cluster.coordination.CoordinationStateRejectedException: became follower\n\
78-
at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]\n\
78+
at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.lambda$$close$$3(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]\n\
7979
at java.base/java.util.HashMap$$Values.forEach(HashMap.java:1073) ~[?:?]\n\
80-
at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.4.0.jar:3.4.0]\n\
81-
at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.4.0.jar:3.4.0]\n\
82-
at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.4.0.jar:3.4.0]\n\
83-
at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.4.0.jar:3.4.0]\n\
84-
at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.4.0.jar:3.4.0]\n\
85-
at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.4.0.jar:3.4.0]\n\
80+
at org.opensearch.cluster.coordination.JoinHelper$$CandidateJoinAccumulator.close(JoinHelper.java:648) ~[opensearch-3.6.0.jar:3.6.0]\n\
81+
at org.opensearch.cluster.coordination.Coordinator.becomeFollower(Coordinator.java:829) ~[opensearch-3.6.0.jar:3.6.0]\n\
82+
at org.opensearch.cluster.coordination.Coordinator.onFollowerCheckRequest(Coordinator.java:405) ~[opensearch-3.6.0.jar:3.6.0]\n\
83+
at org.opensearch.cluster.coordination.FollowersChecker$$2.doRun(FollowersChecker.java:250) ~[opensearch-3.6.0.jar:3.6.0]\n\
84+
at org.opensearch.common.util.concurrent.ThreadContext$$ContextPreservingAbstractRunnable.doRun(ThreadContext.java:975) ~[opensearch-3.6.0.jar:3.6.0]\n\
85+
at org.opensearch.common.util.concurrent.AbstractRunnable.run(AbstractRunnable.java:52) ~[opensearch-3.6.0.jar:3.6.0]\n\
8686
at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) ~[?:?]\n\
8787
at java.base/java.util.concurrent.ThreadPoolExecutor$$Worker.run(ThreadPoolExecutor.java:642) ~[?:?]\n\
8888
at java.base/java.lang.Thread.run(Thread.java:1583) [?:?]",

‎tests/test-definition.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ dimensions:
44
values:
55
- 3.1.0
66
- 3.4.0
7+
- 3.6.0
78
# To use a custom image, add a comma and the full name after the product version, e.g.:
8-
# - 3.4.0,oci.stackable.tech/sandbox/opensearch:3.4.0-stackable0.0.0-dev
9-
# - 3.4.0,localhost:5000/sdp/opensearch:3.4.0-stackable0.0.0-dev
9+
# - 3.6.0,oci.stackable.tech/sandbox/opensearch:3.6.0-stackable0.0.0-dev
10+
# - 3.6.0,localhost:5000/sdp/opensearch:3.6.0-stackable0.0.0-dev
1011
- name: opensearch_home
1112
values:
1213
- /stackable/opensearch
@@ -96,6 +97,6 @@ suites:
9697
patch:
9798
- dimensions:
9899
- name: opensearch
99-
expr: 3.4.0,opensearchproject/opensearch:3.4.0
100+
expr: 3.6.0,opensearchproject/opensearch:3.6.0
100101
- name: opensearch_home
101102
expr: /usr/share/opensearch

0 commit comments

Comments
 (0)