Skip to content

Commit 4317325

Browse files
ywelschhenningandersen
authored andcommitted
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 60b1e1b commit 4317325

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
@@ -356,7 +356,7 @@ private StartRecoveryRequest getStartRecoveryRequest(final RecoveryTarget recove
356356
logger.trace("{} preparing for file-based recovery from [{}]", recoveryTarget.shardId(), recoveryTarget.sourceNode());
357357
} else {
358358
logger.trace(
359-
"{} preparing for sequence-number-based recovery starting at local checkpoint [{}] from [{}]",
359+
"{} preparing for sequence-number-based recovery starting at sequence number [{}] from [{}]",
360360
recoveryTarget.shardId(),
361361
startingSeqNo,
362362
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
@@ -118,6 +118,7 @@ public void testAckedIndexing() throws Exception {
118118

119119
assertAcked(prepareCreate("test")
120120
.setSettings(Settings.builder()
121+
.put(indexSettings())
121122
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1 + randomInt(2))
122123
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, randomInt(2))
123124
));

0 commit comments

Comments
 (0)