Skip to content

Commit 6c86b60

Browse files
author
Hendrik Muhs
authored
[Transform] re-enable BWC and cleanup after backport (#53012)
re-enable BWC tests and adapt code on master for BWC, remove code no longer necessary relates #52998 relates #53010
1 parent 8060463 commit 6c86b60

File tree

4 files changed

+11
-41
lines changed

4 files changed

+11
-41
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ task verifyVersions {
219219
* after the backport of the backcompat code is complete.
220220
*/
221221

222-
boolean bwc_tests_enabled = false
223-
final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/52998" /* place a PR link here when committing bwc changes */
222+
boolean bwc_tests_enabled = true
223+
final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
224224
if (bwc_tests_enabled == false) {
225225
if (bwc_tests_disabled_issue.isEmpty()) {
226226
throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/TransformTaskParams.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public TransformTaskParams(StreamInput in) throws IOException {
6868
} else {
6969
this.frequency = null;
7070
}
71-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_7_0
71+
if (in.getVersion().onOrAfter(Version.V_7_7_0)) {
7272
this.requiresRemote = in.readBoolean();
7373
} else {
7474
this.requiresRemote = false;
@@ -94,7 +94,7 @@ public void writeTo(StreamOutput out) throws IOException {
9494
if (out.getVersion().onOrAfter(Version.V_7_3_0)) {
9595
out.writeOptionalTimeValue(frequency);
9696
}
97-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_7_0
97+
if (out.getVersion().onOrAfter(Version.V_7_7_0)) {
9898
out.writeBoolean(requiresRemote);
9999
}
100100
}

x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutor.java

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.apache.lucene.util.SetOnce;
1212
import org.elasticsearch.ExceptionsHelper;
1313
import org.elasticsearch.ResourceNotFoundException;
14-
import org.elasticsearch.Version;
1514
import org.elasticsearch.action.ActionListener;
1615
import org.elasticsearch.action.LatchedActionListener;
1716
import org.elasticsearch.action.support.IndicesOptions;
@@ -103,19 +102,13 @@ public PersistentTasksCustomMetaData.Assignment getAssignment(TransformTaskParam
103102
}
104103
DiscoveryNode discoveryNode = selectLeastLoadedNode(
105104
clusterState,
106-
(node) -> node.getVersion().onOrAfter(Version.V_8_0_0)
107-
? nodeCanRunThisTransform(node, params, null)
108-
: nodeCanRunThisTransformPre77(node, params, null)
105+
(node) -> nodeCanRunThisTransform(node, params, null)
109106
);
110107

111108
if (discoveryNode == null) {
112109
Map<String, String> explainWhyAssignmentFailed = new TreeMap<>();
113110
for (DiscoveryNode node : clusterState.getNodes()) {
114-
if (node.getVersion().onOrAfter(Version.V_8_0_0)) { // todo: V_7_7_0, remove from 8.0
115-
nodeCanRunThisTransform(node, params, explainWhyAssignmentFailed);
116-
} else {
117-
nodeCanRunThisTransformPre77(node, params, explainWhyAssignmentFailed);
118-
}
111+
nodeCanRunThisTransform(node, params, explainWhyAssignmentFailed);
119112
}
120113
String reason = "Not starting transform ["
121114
+ params.getId()
@@ -130,29 +123,6 @@ public PersistentTasksCustomMetaData.Assignment getAssignment(TransformTaskParam
130123
return new PersistentTasksCustomMetaData.Assignment(discoveryNode.getId(), "");
131124
}
132125

133-
// todo: this can be removed for 8.0 after backport
134-
public static boolean nodeCanRunThisTransformPre77(DiscoveryNode node, TransformTaskParams params, Map<String, String> explain) {
135-
if (node.isDataNode() == false) {
136-
if (explain != null) {
137-
explain.put(node.getId(), "not a data node");
138-
}
139-
return false;
140-
}
141-
142-
// version of the transform run on a node that has at least the same version
143-
if (node.getVersion().onOrAfter(params.getVersion()) == false) {
144-
if (explain != null) {
145-
explain.put(
146-
node.getId(),
147-
"node has version: " + node.getVersion() + " but transform requires at least " + params.getVersion()
148-
);
149-
}
150-
return false;
151-
}
152-
153-
return true;
154-
}
155-
156126
public static boolean nodeCanRunThisTransform(DiscoveryNode node, TransformTaskParams params, Map<String, String> explain) {
157127
// version of the transform run on a node that has at least the same version
158128
if (node.getVersion().onOrAfter(params.getVersion()) == false) {

x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/TransformPersistentTasksExecutorTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testNodeVersionAssignment() {
7070
equalTo("current-data-node-with-0-tasks-transform-remote-disabled")
7171
);
7272
assertThat(
73-
executor.getAssignment(new TransformTaskParams("new-old-task-id", Version.V_7_5_0, null, true), cs).getExecutorNode(),
73+
executor.getAssignment(new TransformTaskParams("new-old-task-id", Version.V_7_7_0, null, true), cs).getExecutorNode(),
7474
equalTo("past-data-node-1")
7575
);
7676
}
@@ -102,15 +102,15 @@ public void testNodeAssignmentProblems() {
102102
cs = buildClusterState(nodes);
103103
executor = buildTaskExecutor();
104104

105-
assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_7_7_0, null, false), cs);
105+
assignment = executor.getAssignment(new TransformTaskParams("new-task-id", Version.V_8_0_0, null, false), cs);
106106
assertNull(assignment.getExecutorNode());
107107
assertThat(
108108
assignment.getExplanation(),
109109
equalTo(
110110
"Not starting transform [new-task-id], reasons ["
111111
+ "current-data-node-with-transform-disabled:not a transform node"
112112
+ "|"
113-
+ "past-data-node-1:node has version: 7.5.0 but transform requires at least 7.7.0"
113+
+ "past-data-node-1:node has version: 7.7.0 but transform requires at least 8.0.0"
114114
+ "]"
115115
)
116116
);
@@ -276,9 +276,9 @@ private DiscoveryNodes.Builder buildNodes(
276276
new DiscoveryNode(
277277
"past-data-node-1",
278278
buildNewFakeTransportAddress(),
279-
Collections.emptyMap(),
279+
transformNodeAttributes,
280280
new HashSet<>(Arrays.asList(DiscoveryNodeRole.DATA_ROLE, DiscoveryNodeRole.MASTER_ROLE)),
281-
Version.V_7_5_0
281+
Version.V_7_7_0
282282
)
283283
);
284284
}

0 commit comments

Comments
 (0)