From 5b1ad8099bfd0738bb16331e6f6952b8726b849e Mon Sep 17 00:00:00 2001 From: Nhat Nguyen Date: Sat, 28 Jul 2018 07:41:30 -0400 Subject: [PATCH] TEST: testDocStats should always use forceMerge (#32450) Due to the recent change in LUCENE-8263, we need to adjust the deletion ration to between 10% to 33% to preserve the current behavior of the test. However, we may need another refinement if soft-deletes is enabled as the actual deletes are different because of delete tombstones. This commit prefers to always execute forceMerge instead of adjusting the deletion ratio so that this test can focus on testing docStats. Closes #32449 --- .../java/org/elasticsearch/index/shard/IndexShardTests.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index d7b1be847c0..6d9e15c52af 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -2376,15 +2376,12 @@ public class IndexShardTests extends IndexShardTestCase { closeShards(sourceShard, targetShard); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32449") public void testDocStats() throws IOException { IndexShard indexShard = null; try { indexShard = newStartedShard(); final long numDocs = randomIntBetween(2, 32); // at least two documents so we have docs to delete - // Delete at least numDocs/10 documents otherwise the number of deleted docs will be below 10% - // and forceMerge will refuse to expunge deletes - final long numDocsToDelete = randomIntBetween((int) Math.ceil(Math.nextUp(numDocs / 10.0)), Math.toIntExact(numDocs)); + final long numDocsToDelete = randomLongBetween(1, numDocs); for (int i = 0; i < numDocs; i++) { final String id = Integer.toString(i); indexDoc(indexShard, "_doc", id); @@ -2434,7 +2431,6 @@ public class IndexShardTests extends IndexShardTestCase { // merge them away final ForceMergeRequest forceMergeRequest = new ForceMergeRequest(); - forceMergeRequest.onlyExpungeDeletes(randomBoolean()); forceMergeRequest.maxNumSegments(1); indexShard.forceMerge(forceMergeRequest);