Skip to content

Fix delete enrich policy bug #52179

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
merged 5 commits into from
Feb 18, 2020
Merged

Fix delete enrich policy bug #52179

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34a68ca
Fix bug for deleting enrich policy
Feb 8, 2020
9c043f1
add a comment for deleting enrich index
Feb 16, 2020
204a326
Merge remote-tracking branch 'origin/master' into patch#51228
Feb 16, 2020
ea45f47
Merge remote-tracking branch 'origin/master' into patch#51228
Feb 17, 2020
3a08a73
format code
Feb 17, 2020
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
17 changes: 14 additions & 3 deletions ...rc/main/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
Expand Down Expand Up @@ -128,7 +129,12 @@ protected void masterOperation(
return;
}

deleteIndicesAndPolicy(request.getName(), ActionListener.wrap((response) -> {
GetIndexRequest indices = new GetIndexRequest().indices(EnrichPolicy.getBaseName(request.getName()) + "-*")
.indicesOptions(IndicesOptions.lenientExpand());

String[] concreteIndices = indexNameExpressionResolver.concreteIndexNames(state, indices);

deleteIndicesAndPolicy(concreteIndices, request.getName(), ActionListener.wrap((response) -> {
enrichPolicyLocks.releasePolicy(request.getName());
listener.onResponse(response);
}, (exc) -> {
Expand All @@ -137,9 +143,14 @@ protected void masterOperation(
}));
}

private void deleteIndicesAndPolicy(String name, ActionListener<AcknowledgedResponse> listener) {
private void deleteIndicesAndPolicy(String[] indices, String name, ActionListener<AcknowledgedResponse> listener) {
if (indices.length == 0) {
deletePolicy(name, listener);
return;
}

// delete all enrich indices for this policy
DeleteIndexRequest deleteRequest = new DeleteIndexRequest().indices(EnrichPolicy.getBaseName(name) + "-*")
DeleteIndexRequest deleteRequest = new DeleteIndexRequest().indices(indices)
.indicesOptions(LENIENT_OPTIONS);

client.admin().indices().delete(deleteRequest, ActionListener.wrap((response) -> {
Expand Down
14 changes: 14 additions & 0 deletions ...st/java/org/elasticsearch/xpack/enrich/action/TransportDeleteEnrichPolicyActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionTestUtils;
import org.elasticsearch.action.support.DestructiveOperations;
import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.IndexNotFoundException;
Expand All @@ -24,6 +26,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.xpack.enrich.EnrichPolicyTests.randomEnrichPolicy;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.nullValue;
Expand Down Expand Up @@ -116,6 +119,12 @@ public void testDeleteIsNotLocked() throws Exception {
AtomicReference<Exception> error = saveEnrichPolicy(name, policy, clusterService);
assertThat(error.get(), nullValue());

boolean destructiveRequiresName = randomBoolean();
if (destructiveRequiresName) {
Settings settings = Settings.builder().put(DestructiveOperations.REQUIRES_NAME_SETTING.getKey(), destructiveRequiresName).build();
assertAcked(client().admin().cluster().prepareUpdateSettings().setTransientSettings(settings));
}

createIndex(EnrichPolicy.getBaseName(name) + "-foo1");
createIndex(EnrichPolicy.getBaseName(name) + "-foo2");

Expand Down Expand Up @@ -152,6 +161,11 @@ public void onFailure(final Exception e) {
.get()
);

if (destructiveRequiresName) {
Settings settings = Settings.builder().putNull(DestructiveOperations.REQUIRES_NAME_SETTING.getKey()).build();
assertAcked(client().admin().cluster().prepareUpdateSettings().setTransientSettings(settings));
}

EnrichPolicyLocks enrichPolicyLocks = getInstanceFromNode(EnrichPolicyLocks.class);
assertFalse(enrichPolicyLocks.captureExecutionState().isAnyPolicyInFlight());

Expand Down