move the assertion back to recovery target

Author: dnhatn

server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java

@@ -26,7 +26,6 @@
 import org.apache.lucene.index.IndexCommit;
 import org.apache.lucene.store.AlreadyClosedException;
 import org.apache.lucene.store.RateLimiter;
-import org.elasticsearch.Assertions;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchTimeoutException;
 import org.elasticsearch.ExceptionsHelper;
@@ -515,11 +514,6 @@ public void onTimeout(TimeValue timeout) {
                         ActionListener.wrap(
                                 checkpoint -> listener.onResponse(new RecoveryTranslogOperationsResponse(checkpoint)),
                                 e -> {
-                                    if (Assertions.ENABLED) {
-                                        if (e instanceof MapperException == false) {
-                                            throw new AssertionError("unexpected failure while replicating translog entry", e);
-                                        }
-                                    }
                                     if (mappingVersionOnTarget < request.mappingVersion() && e instanceof MapperException) {
                                         retryOnMappingException.accept(e);
                                     } else {

server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java

@@ -23,6 +23,7 @@
 import org.apache.lucene.index.CorruptIndexException;
 import org.apache.lucene.index.IndexFormatTooNewException;
 import org.apache.lucene.index.IndexFormatTooOldException;
+import org.elasticsearch.Assertions;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.Version;
@@ -351,6 +352,9 @@ public void indexTranslogOperations(
                     throw new MapperException("mapping updates are not allowed [" + operation + "]");
                 }
                 if (result.getFailure() != null) {
+                    if (Assertions.ENABLED) {
+                        throw new AssertionError("unexpected failure while replicating translog entry", result.getFailure());
+                    }
                     ExceptionsHelper.reThrowIfNotNull(result.getFailure());
                 }
             }

server/src/test/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java

@@ -906,6 +906,7 @@ public void testDoNotInfinitelyWaitForMapping() {
         }
         client().admin().indices().prepareUpdateSettings("test").setSettings(Settings.builder().put("index.number_of_replicas", 1)).get();
         ensureGreen("test");
+        client().admin().indices().prepareRefresh("test").get();
         assertHitCount(client().prepareSearch().get(), numDocs);
     }