Skip to content

Commit 95072ae

Browse files
committed
bypass assert-no-failure in the newly added test
1 parent 5f87530 commit 95072ae

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.elasticsearch.common.bytes.BytesReference;
3434
import org.elasticsearch.common.logging.Loggers;
3535
import org.elasticsearch.common.lucene.Lucene;
36+
import org.elasticsearch.common.settings.Settings;
3637
import org.elasticsearch.common.util.CancellableThreads;
3738
import org.elasticsearch.common.util.concurrent.AbstractRefCounted;
3839
import org.elasticsearch.index.engine.Engine;
@@ -353,7 +354,10 @@ public void indexTranslogOperations(
353354
}
354355
if (result.getFailure() != null) {
355356
if (Assertions.ENABLED) {
356-
throw new AssertionError("unexpected failure while replicating translog entry", result.getFailure());
357+
final Settings settings = indexShard.indexSettings().getSettings();
358+
if (settings.getAsList("assertion.disabled").contains(getClass().getName()) == false) {
359+
throw new AssertionError("unexpected failure while replicating translog entry", result.getFailure());
360+
}
357361
}
358362
ExceptionsHelper.reThrowIfNotNull(result.getFailure());
359363
}

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.elasticsearch.cluster.routing.RecoverySource.SnapshotRecoverySource;
4343
import org.elasticsearch.cluster.routing.allocation.command.MoveAllocationCommand;
4444
import org.elasticsearch.cluster.service.ClusterService;
45+
import org.elasticsearch.common.settings.Setting;
4546
import org.elasticsearch.common.settings.Settings;
4647
import org.elasticsearch.common.unit.ByteSizeUnit;
4748
import org.elasticsearch.common.unit.ByteSizeValue;
@@ -82,6 +83,7 @@
8283
import java.util.ArrayList;
8384
import java.util.Arrays;
8485
import java.util.Collection;
86+
import java.util.Collections;
8587
import java.util.List;
8688
import java.util.Map;
8789
import java.util.concurrent.CountDownLatch;
@@ -90,6 +92,7 @@
9092
import java.util.concurrent.atomic.AtomicBoolean;
9193
import java.util.concurrent.atomic.AtomicInteger;
9294
import java.util.function.Consumer;
95+
import java.util.function.Function;
9396

9497
import static java.util.Collections.singletonMap;
9598
import static org.elasticsearch.node.RecoverySettingsChunkSizePlugin.CHUNK_SIZE_SETTING;
@@ -119,7 +122,7 @@ public class IndexRecoveryIT extends ESIntegTestCase {
119122
@Override
120123
protected Collection<Class<? extends Plugin>> nodePlugins() {
121124
return Arrays.asList(MockTransportService.TestPlugin.class, MockFSIndexStore.TestPlugin.class,
122-
RecoverySettingsChunkSizePlugin.class, TestAnalysisPlugin.class);
125+
RecoverySettingsChunkSizePlugin.class, TestAnalysisPlugin.class, AssertionPlugin.class);
123126
}
124127

125128
@After
@@ -875,7 +878,7 @@ public void testHistoryRetention() throws Exception {
875878
}
876879

877880
public void testDoNotInfinitelyWaitForMapping() {
878-
internalCluster().ensureAtLeastNumDataNodes(3);
881+
internalCluster().startNodes(3, Settings.builder().put("assertion.disabled", RecoveryTarget.class.getName()).build());
879882
createIndex("test", Settings.builder()
880883
.put("index.analysis.analyzer.test_analyzer.type", "custom")
881884
.put("index.analysis.analyzer.test_analyzer.tokenizer", "standard")
@@ -926,4 +929,13 @@ public TokenStream create(TokenStream tokenStream) {
926929
});
927930
}
928931
}
932+
933+
public static final class AssertionPlugin extends Plugin {
934+
@Override
935+
public List<Setting<?>> getSettings() {
936+
return Collections.singletonList(
937+
Setting.listSetting("assertion.disabled", Collections.emptyList(), Function.identity(), Setting.Property.NodeScope)
938+
);
939+
}
940+
}
929941
}

0 commit comments

Comments
 (0)