From c1b5a725def72addad2074431334278ff1983f2e Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Tue, 11 Feb 2020 21:07:00 -0500 Subject: [PATCH 1/2] reproduce --- .../action/support/replication/TransportWriteAction.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java index 07f8e96b4e796..d42c9f5c5d240 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java @@ -315,6 +315,11 @@ void run() { maybeFinish(); }); } + try { + Thread.sleep(5_000); + } catch (InterruptedException e) { + throw new AssertionError(e); + } if (sync) { assert pendingOps.get() > 0; indexShard.sync(location, (ex) -> { From 8a0a0725f2b95fd853d9f5345677626ea0453bfd Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Tue, 11 Feb 2020 21:20:13 -0500 Subject: [PATCH 2/2] Fix testMaybeFlush --- .../action/support/replication/TransportWriteAction.java | 5 ----- .../java/org/elasticsearch/index/shard/IndexShardIT.java | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java index d42c9f5c5d240..07f8e96b4e796 100644 --- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java +++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportWriteAction.java @@ -315,11 +315,6 @@ void run() { maybeFinish(); }); } - try { - Thread.sleep(5_000); - } catch (InterruptedException e) { - throw new AssertionError(e); - } if (sync) { assert pendingOps.get() > 0; indexShard.sync(location, (ex) -> { diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java index bcec724a72de4..d6079bd7677bb 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -349,8 +349,8 @@ public void testMaybeFlush() throws Exception { assertFalse(shard.shouldPeriodicallyFlush()); assertThat(shard.flushStats().getPeriodic(), greaterThan(0L)); }); + shard.sync(); assertEquals(0, translog.stats().getUncommittedOperations()); - translog.sync(); long size = Math.max(translog.stats().getUncommittedSizeInBytes(), Translog.DEFAULT_HEADER_SIZE_IN_BYTES + 1); logger.info("--> current translog size: [{}] num_ops [{}] generation [{}]", translog.stats().getUncommittedSizeInBytes(), translog.stats().getUncommittedOperations(), translog.getGeneration()); @@ -369,6 +369,7 @@ public void testMaybeFlush() throws Exception { commitStats.getUserData(), flushStats.getPeriodic(), flushStats.getTotal()); assertFalse(shard.shouldPeriodicallyFlush()); }); + shard.sync(); assertEquals(0, translog.stats().getUncommittedOperations()); }