CCR side of #31213

Relates #31213
elastic · Jun 10, 2018 · 9feff98 · 9feff98
1 parent afe02a3
commit 9feff98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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
@@ -1361,7 +1361,7 @@ public void testForceMergeWithSoftDeletesRetention() throws Exception {
                     liveDocs.add(doc.id());
                 }
             }
-            long localCheckpoint = engine.getLocalCheckpointTracker().getCheckpoint();
+            long localCheckpoint = engine.getLocalCheckpoint();
             globalCheckpoint.set(randomLongBetween(0, localCheckpoint));
             engine.getTranslog().sync();
             engine.forceMerge(true, 1, false, false, false);
@@ -1427,7 +1427,7 @@ public void testForceMergeWithSoftDeletesRetentionAndRecoverySource() throws Exc
                     liveDocs.add(doc.id());
                 }
             }
-            long localCheckpoint = engine.getLocalCheckpointTracker().getCheckpoint();
+            long localCheckpoint = engine.getLocalCheckpoint();
             globalCheckpoint.set(randomLongBetween(0, localCheckpoint));
             engine.getTranslog().sync();
             long keptIndex = globalCheckpoint.get() + 1 - retainedExtraOps;

diff --git a/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java b/server/src/test/java/org/elasticsearch/index/engine/LuceneChangesSnapshotTests.java
@@ -236,8 +236,8 @@ class Follower extends Thread {
         }
 
         void pullOperations(Engine follower) throws IOException {
-            long leaderCheckpoint = leader.getLocalCheckpointTracker().getCheckpoint();
-            long followerCheckpoint = follower.getLocalCheckpointTracker().getCheckpoint();
+            long leaderCheckpoint = leader.getLocalCheckpoint();
+            long followerCheckpoint = follower.getLocalCheckpoint();
             if (followerCheckpoint < leaderCheckpoint) {
                 long fromSeqNo = followerCheckpoint + 1;
                 long batchSize = randomLongBetween(0, 100);
@@ -255,7 +255,7 @@ public void run() {
                 readLatch.countDown();
                 readLatch.await();
                 while (isDone.get() == false ||
-                    follower.getLocalCheckpointTracker().getCheckpoint() < leader.getLocalCheckpointTracker().getCheckpoint()) {
+                    follower.getLocalCheckpointTracker().getCheckpoint() < leader.getLocalCheckpoint()) {
                     pullOperations(follower);
                 }
                 assertConsistentHistoryBetweenTranslogAndLuceneIndex(follower, mapperService);

diff --git a/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/engine/EngineTestCase.java
@@ -802,7 +802,7 @@ public static Set<String> getDocIds(Engine engine, boolean refresh) throws IOExc
      */
     public static List<Translog.Operation> readAllOperationsInLucene(Engine engine, MapperService mapper) throws IOException {
         final List<Translog.Operation> operations = new ArrayList<>();
-        long maxSeqNo = Math.max(0, engine.getLocalCheckpointTracker().getMaxSeqNo());
+        long maxSeqNo = Math.max(0, ((InternalEngine)engine).getLocalCheckpointTracker().getMaxSeqNo());
         try (Translog.Snapshot snapshot = engine.newLuceneChangesSnapshot("test", mapper, 0, maxSeqNo, false)) {
             Translog.Operation op;
             while ((op = snapshot.next()) != null){
@@ -838,7 +838,7 @@ public static void assertConsistentHistoryBetweenTranslogAndLuceneIndex(Engine e
             .collect(Collectors.toMap(Translog.Operation::seqNo, Function.identity()));
         final long globalCheckpoint = engine.getTranslog().getLastSyncedGlobalCheckpoint();
         final long retainedOps = engine.config().getIndexSettings().getSoftDeleteRetentionOperations();
-        final long maxSeqNo = engine.getLocalCheckpointTracker().getMaxSeqNo();
+        long maxSeqNo = Math.max(0, ((InternalEngine)engine).getLocalCheckpointTracker().getMaxSeqNo());
         for (Translog.Operation translogOp : translogOps.values()) {
             final Translog.Operation luceneOp = luceneOps.get(translogOp.seqNo());
             if (luceneOp == null) {