Allow index configs to be overwritten

Author: davidkyle

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MlConfigMigrator.java

@@ -9,7 +9,6 @@
 import org.apache.logging.log4j.Logger;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.ActionListener;
-import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
@@ -24,7 +23,6 @@
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.index.engine.VersionConflictEngineException;
 import org.elasticsearch.persistent.PersistentTasksCustomMetaData;
 import org.elasticsearch.xpack.core.ml.MlMetadata;
 import org.elasticsearch.xpack.core.ml.MlTasks;
@@ -275,8 +273,6 @@ private void addDatafeedIndexRequests(Collection<DatafeedConfig> datafeedConfigs
 
     private IndexRequest indexRequest(ToXContentObject source, String documentId, ToXContent.Params params) {
         IndexRequest indexRequest = new IndexRequest(AnomalyDetectorsIndex.configIndexName(), ElasticsearchMappings.DOC_TYPE, documentId);
-        // do not overwrite existing documents
-        indexRequest.opType(DocWriteRequest.OpType.CREATE);
 
         try (XContentBuilder builder = XContentFactory.jsonBuilder()) {
             indexRequest.source(source.toXContent(builder, params));
@@ -364,15 +360,9 @@ static Set<String> documentsNotWritten(BulkResponse response) {
         for (BulkItemResponse itemResponse : response.getItems()) {
             if (itemResponse.isFailed()) {
                 BulkItemResponse.Failure failure = itemResponse.getFailure();
-                if (failure.getCause().getClass() == VersionConflictEngineException.class) {
-                    // not a failure. The document is already written but perhaps
-                    // has not been removed from the clusterstate
-                    logger.info("cannot write ml configuration [" + itemResponse.getFailure().getId() + "] as it already exists");
-                } else {
-                    failedDocumentIds.add(itemResponse.getFailure().getId());
-                    logger.info("failed to index ml configuration [" + itemResponse.getFailure().getId() + "], " +
-                            itemResponse.getFailure().getMessage());
-                }
+                failedDocumentIds.add(itemResponse.getFailure().getId());
+                logger.info("failed to index ml configuration [" + itemResponse.getFailure().getId() + "], " +
+                        itemResponse.getFailure().getMessage());
             } else {
                 logger.info("ml configuration [" + itemResponse.getId() + "] indexed");
             }

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MlConfigMigratorTests.java

@@ -11,8 +11,6 @@
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.index.engine.VersionConflictEngineException;
-import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.persistent.PersistentTasksCustomMetaData;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.xpack.core.ml.MlMetadata;
@@ -170,15 +168,7 @@ public void testDocumentsNotWritten() {
         when(failure.getCause()).thenReturn(mock(IllegalStateException.class));
         when(failed.getFailure()).thenReturn(failure);
 
-        BulkItemResponse alreadyExists = mock(BulkItemResponse.class);
-        when(alreadyExists.isFailed()).thenReturn(true);
-        BulkItemResponse.Failure alreadyExistsFailure = mock(BulkItemResponse.Failure.class);
-        when(alreadyExistsFailure.getId()).thenReturn("already-exists-doc-id");
-        VersionConflictEngineException vcException = new VersionConflictEngineException(new ShardId("i", "i", 0), "doc", "id", "");
-        when(alreadyExistsFailure.getCause()).thenReturn(vcException);
-        when(alreadyExists.getFailure()).thenReturn(alreadyExistsFailure);
-
-        BulkResponse bulkResponse = new BulkResponse(new BulkItemResponse[] {ok, failed, alreadyExists}, 1L);
+        BulkResponse bulkResponse = new BulkResponse(new BulkItemResponse[] {ok, failed}, 1L);
         Set<String> docsIds = MlConfigMigrator.documentsNotWritten(bulkResponse);
         assertThat(docsIds, contains("failed-doc-id"));
     }