Fix document failure replication test

This fix is needed after changing how we handle document-level failures
when indexing no-ops and deletes.

Author: jasontedor

server/src/test/java/org/elasticsearch/index/replication/IndexLevelReplicationTests.java

@@ -18,7 +18,6 @@
  */
 package org.elasticsearch.index.replication;
 
-import org.apache.lucene.document.Field;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.index.Term;
@@ -38,7 +37,6 @@
 import org.elasticsearch.common.util.iterable.Iterables;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.IndexSettings;
-import org.elasticsearch.index.VersionType;
 import org.elasticsearch.index.engine.Engine;
 import org.elasticsearch.index.engine.EngineFactory;
 import org.elasticsearch.index.engine.InternalEngine;
@@ -59,7 +57,6 @@
 import org.hamcrest.Matcher;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -420,10 +417,8 @@ public void testReplicaOperationWithConcurrentPrimaryPromotion() throws Exceptio
      */
     public void testDocumentFailureReplication() throws Exception {
         final IOException indexException = new IOException("simulated indexing failure");
-        final IOException deleteException = new IOException("simulated deleting failure");
         final EngineFactory engineFactory = config -> InternalEngineTests.createInternalEngine((dir, iwc) ->
             new IndexWriter(dir, iwc) {
-                final AtomicBoolean throwAfterIndexedOneDoc = new AtomicBoolean(); // need one document to trigger delete in IW.
                 @Override
                 public long addDocument(Iterable<? extends IndexableField> doc) throws IOException {
                     boolean isTombstone = false;
@@ -432,20 +427,12 @@ public long addDocument(Iterable<? extends IndexableField> doc) throws IOExcepti
                             isTombstone = true;
                         }
                     }
-                    if (isTombstone == false && throwAfterIndexedOneDoc.getAndSet(true)) {
-                        throw indexException;
+                    if (isTombstone) {
+                        return super.addDocument(doc); // allow to add Noop
                     } else {
-                        return super.addDocument(doc);
+                        throw indexException;
                     }
                 }
-                @Override
-                public long deleteDocuments(Term... terms) throws IOException {
-                    throw deleteException;
-                }
-                @Override
-                public long softUpdateDocument(Term term, Iterable<? extends IndexableField> doc, Field...fields) throws IOException {
-                    throw deleteException; // a delete uses softUpdateDocument API if soft-deletes enabled
-                }
             }, null, null, config);
         try (ReplicationGroup shards = new ReplicationGroup(buildIndexMetaData(0)) {
             @Override
@@ -455,23 +442,14 @@ public long softUpdateDocument(Term term, Iterable<? extends IndexableField> doc
             shards.startPrimary();
             long primaryTerm = shards.getPrimary().getPendingPrimaryTerm();
             List<Translog.Operation> expectedTranslogOps = new ArrayList<>();
-            BulkItemResponse indexResp = shards.index(new IndexRequest(index.getName(), "type", "1")
-                .source("{}", XContentType.JSON).version(1).versionType(VersionType.EXTERNAL));
-            assertThat(indexResp.isFailed(), equalTo(false));
-            expectedTranslogOps.add(new Translog.Index("type", "1", 0, primaryTerm, 1, VersionType.EXTERNAL,
-                "{}".getBytes(StandardCharsets.UTF_8), null, null, -1));
+            BulkItemResponse indexResp = shards.index(new IndexRequest(index.getName(), "type", "1").source("{}", XContentType.JSON));
+            assertThat(indexResp.isFailed(), equalTo(true));
+            assertThat(indexResp.getFailure().getCause(), equalTo(indexException));
+            expectedTranslogOps.add(new Translog.NoOp(0, primaryTerm, indexException.toString()));
             try (Translog.Snapshot snapshot = getTranslog(shards.getPrimary()).newSnapshot()) {
                 assertThat(snapshot, SnapshotMatchers.containsOperationsInAnyOrder(expectedTranslogOps));
             }
-
-            indexResp = shards.index(new IndexRequest(index.getName(), "type", "any").source("{}", XContentType.JSON));
-            assertThat(indexResp.getFailure().getCause(), equalTo(indexException));
-            expectedTranslogOps.add(new Translog.NoOp(1, primaryTerm, indexException.toString()));
-
-            BulkItemResponse deleteResp = shards.delete(new DeleteRequest(index.getName(), "type", "1"));
-            assertThat(deleteResp.getFailure().getCause(), equalTo(deleteException));
-            expectedTranslogOps.add(new Translog.NoOp(2, primaryTerm, deleteException.toString()));
-            shards.assertAllEqual(1);
+            shards.assertAllEqual(0);
 
             int nReplica = randomIntBetween(1, 3);
             for (int i = 0; i < nReplica; i++) {
@@ -486,14 +464,10 @@ public long softUpdateDocument(Term term, Iterable<? extends IndexableField> doc
                     assertThat(snapshot, SnapshotMatchers.containsOperationsInAnyOrder(expectedTranslogOps));
                 }
             }
-            // unlike previous failures, these two failures replicated directly from the replication channel.
+            // the failure replicated directly from the replication channel.
             indexResp = shards.index(new IndexRequest(index.getName(), "type", "any").source("{}", XContentType.JSON));
             assertThat(indexResp.getFailure().getCause(), equalTo(indexException));
-            expectedTranslogOps.add(new Translog.NoOp(3, primaryTerm, indexException.toString()));
-
-            deleteResp = shards.delete(new DeleteRequest(index.getName(), "type", "1"));
-            assertThat(deleteResp.getFailure().getCause(), equalTo(deleteException));
-            expectedTranslogOps.add(new Translog.NoOp(4, primaryTerm, deleteException.toString()));
+            expectedTranslogOps.add(new Translog.NoOp(1, primaryTerm, indexException.toString()));
 
             for (IndexShard shard : shards) {
                 try (Translog.Snapshot snapshot = getTranslog(shard).newSnapshot()) {
@@ -503,7 +477,7 @@ public long softUpdateDocument(Term term, Iterable<? extends IndexableField> doc
                     assertThat(snapshot, SnapshotMatchers.containsOperationsInAnyOrder(expectedTranslogOps));
                 }
             }
-            shards.assertAllEqual(1);
+            shards.assertAllEqual(0);
         }
     }