Skip to content
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

Jump to bottom

[8.12] [Transform] Make _reset action stop transforms without force first (#104870) #104899

Merged
merged 2 commits into from
Feb 5, 2024
Merged

[8.12] [Transform] Make _reset action stop transforms without force first (#104870) #104899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216c572
[Transform] Make `_reset` action stop transforms without force first …
przemekwitek Jan 30, 2024
c4c1900
Update TestFeatureResetIT.java
przemekwitek Feb 5, 2024
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
7 changes: 7 additions & 0 deletions docs/changelog/104870.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
pr: 104870
summary: Make `_reset` action stop transforms without force first
area: Transform
type: bug
issues:
- 100596
- 104825
5 changes: 4 additions & 1 deletion ...c/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TestFeatureResetIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public void cleanup() throws Exception {
}

@SuppressWarnings("unchecked")
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/100596")
public void testTransformFeatureReset() throws Exception {
String indexName = "basic-crud-reviews";
String transformId = "batch-transform-feature-reset";
Expand Down Expand Up @@ -90,6 +89,10 @@ public void testTransformFeatureReset() throws Exception {
.build();

putTransform(continuousTransformId, Strings.toString(config), RequestOptions.DEFAULT);

// Sleep for a few seconds so that we cover transform being stopped at various stages.
Thread.sleep(randomLongBetween(0, 5_000));

startTransform(continuousTransformId, RequestOptions.DEFAULT);
client().performRequest(new Request(HttpPost.METHOD_NAME, "/_features/_reset"));

Expand Down
25 changes: 22 additions & 3 deletions x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ public void cleanUpFeature(
SystemIndexPlugin.super.cleanUpFeature(clusterService, client, unsetResetModeListener);
}, unsetResetModeListener::onFailure);

ActionListener<StopTransformAction.Response> afterStoppingTransforms = ActionListener.wrap(stopTransformsResponse -> {
ActionListener<StopTransformAction.Response> afterForceStoppingTransforms = ActionListener.wrap(stopTransformsResponse -> {
if (stopTransformsResponse.isAcknowledged()
&& stopTransformsResponse.getTaskFailures().isEmpty()
&& stopTransformsResponse.getNodeFailures().isEmpty()) {
Expand Down Expand Up @@ -432,12 +432,31 @@ public void cleanUpFeature(
}
}, unsetResetModeListener::onFailure);

ActionListener<StopTransformAction.Response> afterStoppingTransforms = ActionListener.wrap(
afterForceStoppingTransforms::onResponse,
e -> {
logger.info("Error while trying to stop the transforms, will try again with force=true", e);
StopTransformAction.Request forceStopTransformsRequest = new StopTransformAction.Request(
Metadata.ALL,
true,
// Set force=true to make sure all the transforms persistent tasks are stopped.
true,
null,
true,
false
);
client.execute(StopTransformAction.INSTANCE, forceStopTransformsRequest, afterForceStoppingTransforms);
}
);

ActionListener<AcknowledgedResponse> afterResetModeSet = ActionListener.wrap(response -> {
StopTransformAction.Request stopTransformsRequest = new StopTransformAction.Request(
Metadata.ALL,
true,
true,
null,
// Set force=false in order to let transforms finish gracefully.
false,
// Do not give it too much time. If there is a problem, there will be another try with force=true.
TimeValue.timeValueSeconds(10),
true,
false
);
Expand Down