From e31ce8f07d8478921e117f13076f5dc2f8ba39e1 Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Mon, 17 Feb 2020 18:04:11 -0500 Subject: [PATCH] Fix testRestoreLocalHistoryFromTranslog --- .../index/engine/InternalEngineTests.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index f0749df406daf..4c4c9b132f223 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -4207,7 +4207,6 @@ public void testRestoreLocalHistoryFromTranslog() throws IOException { final EngineConfig engineConfig; final SeqNoStats prevSeqNoStats; final List prevDocs; - final List existingTranslog; try (InternalEngine engine = createEngine(store, createTempDir(), globalCheckpoint::get)) { engineConfig = engine.config(); for (final long seqNo : seqNos) { @@ -4226,24 +4225,17 @@ public void testRestoreLocalHistoryFromTranslog() throws IOException { engine.syncTranslog(); prevSeqNoStats = engine.getSeqNoStats(globalCheckpoint.get()); prevDocs = getDocIds(engine, true); - try (Translog.Snapshot snapshot = engine.getTranslog().newSnapshot()) { - existingTranslog = TestTranslog.drainSnapshot(snapshot, false); - } } try (InternalEngine engine = new InternalEngine(engineConfig)) { - final Translog.TranslogGeneration currrentTranslogGeneration = new Translog.TranslogGeneration( - engine.getTranslog().getTranslogUUID(), engine.getTranslog().currentFileGeneration()); + final long currentTranslogGeneration = engine.getTranslog().currentFileGeneration(); engine.recoverFromTranslog(translogHandler, globalCheckpoint.get()); engine.restoreLocalHistoryFromTranslog(translogHandler); assertThat(getDocIds(engine, true), equalTo(prevDocs)); SeqNoStats seqNoStats = engine.getSeqNoStats(globalCheckpoint.get()); assertThat(seqNoStats.getLocalCheckpoint(), equalTo(prevSeqNoStats.getLocalCheckpoint())); assertThat(seqNoStats.getMaxSeqNo(), equalTo(prevSeqNoStats.getMaxSeqNo())); - try (Translog.Snapshot snapshot = engine.getTranslog().newSnapshot()) { - assertThat("restore from local translog must not add operations to translog", - snapshot.totalOperations(), equalTo(existingTranslog.size())); - assertThat(TestTranslog.drainSnapshot(snapshot, false), equalTo(existingTranslog)); - } + assertThat("restore from local translog must not add operations to translog", + engine.getTranslog().totalOperationsByMinGen(currentTranslogGeneration), equalTo(0)); } assertConsistentHistoryBetweenTranslogAndLuceneIndex(engine, createMapperService()); }