Skip to content

Commit 80a7e88

Browse files
committed
Ensure testAckedIndexing uses disruption index settings
AbstractDisruptionTestCase set a lower global checkpoint sync interval setting, but this was ignored by testAckedIndexing, which has led to spurious test failures Relates #41068, #38931
1 parent 41b31d0 commit 80a7e88

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ private StartRecoveryRequest getStartRecoveryRequest(final RecoveryTarget recove
360360
logger.trace("{} preparing for file-based recovery from [{}]", recoveryTarget.shardId(), recoveryTarget.sourceNode());
361361
} else {
362362
logger.trace(
363-
"{} preparing for sequence-number-based recovery starting at local checkpoint [{}] from [{}]",
363+
"{} preparing for sequence-number-based recovery starting at sequence number [{}] from [{}]",
364364
recoveryTarget.shardId(),
365365
startingSeqNo,
366366
recoveryTarget.sourceNode());

server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ public void testAckedIndexing() throws Exception {
116116

117117
assertAcked(prepareCreate("test")
118118
.setSettings(Settings.builder()
119+
.put(indexSettings())
119120
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1 + randomInt(2))
120121
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, randomInt(2))
121122
));

0 commit comments

Comments
 (0)