honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Yannick Welsch 2019-05-22 19:07:56 +02:00
parent 496fee3333
commit a71d19e92a
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/org/elasticsearch/indices/recovery/PeerRecoveryTargetService.java
View File

@ -356,7 +356,7 @@ public class PeerRecoveryTargetService implements IndexEventListener {
logger.trace("{} preparing for file-based recovery from [{}]", recoveryTarget.shardId(), recoveryTarget.sourceNode()); logger.trace("{} preparing for file-based recovery from [{}]", recoveryTarget.shardId(), recoveryTarget.sourceNode());
} else { } else {
logger.trace( logger.trace(
"{} preparing for sequence-number-based recovery starting at local checkpoint [{}] from [{}]", "{} preparing for sequence-number-based recovery starting at sequence number [{}] from [{}]",
recoveryTarget.shardId(), recoveryTarget.shardId(),
startingSeqNo, startingSeqNo,
recoveryTarget.sourceNode()); recoveryTarget.sourceNode());

1
server/src/test/java/org/elasticsearch/discovery/ClusterDisruptionIT.java
View File

@ -118,6 +118,7 @@ public class ClusterDisruptionIT extends AbstractDisruptionTestCase {
assertAcked(prepareCreate("test") assertAcked(prepareCreate("test")
.setSettings(Settings.builder() .setSettings(Settings.builder()
.put(indexSettings())
.put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1 + randomInt(2)) .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1 + randomInt(2))
.put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, randomInt(2)) .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, randomInt(2))
)); ));