Skip to content

Fix CoordinatorTests.testIncompatibleDiffResendsFullState #39345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Fix CoordinatorTests.testIncompatibleDiffResendsFullState #39345

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee8905
Fix CoordinatorTests.testIncompatibleDiffResendsFullState
ywelsch Feb 25, 2019
05876cb
Merge remote-tracking branch 'elastic/master' into fix-38867
ywelsch Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions server/src/test/java/org/elasticsearch/cluster/coordination/CoordinatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,6 @@ public void testJoiningNodeReceivesFullState() {
assertEquals(0L, newNodePublishStats.getIncompatibleClusterStateDiffReceivedCount());
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/38867")
public void testIncompatibleDiffResendsFullState() {
final Cluster cluster = new Cluster(randomIntBetween(3, 5));
cluster.runRandomly();
Expand All @@ -884,12 +883,12 @@ public void testIncompatibleDiffResendsFullState() {
final PublishClusterStateStats prePublishStats = follower.coordinator.stats().getPublishStats();
logger.info("--> submitting first value to {}", leader);
leader.submitValue(randomLong());
cluster.runFor(DEFAULT_CLUSTER_STATE_UPDATE_DELAY + defaultMillis(PUBLISH_TIMEOUT_SETTING), "publish first state");
cluster.runFor(DEFAULT_CLUSTER_STATE_UPDATE_DELAY, "publish first state");
logger.info("--> healing {}", follower);
follower.heal();
logger.info("--> submitting second value to {}", leader);
leader.submitValue(randomLong());
cluster.stabilise(DEFAULT_CLUSTER_STATE_UPDATE_DELAY);
cluster.stabilise();
Copy link
Contributor

@DaveCTurner DaveCTurner Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should have an explicit duration here - we do not expect there to be an election so it should not be necessary to wait for a full stabilisation.

Copy link
Contributor Author

@ywelsch ywelsch Feb 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you like to suggest such a minimal bound? The point of this test is to check the cluster state diffing logic, not determine any kind of upper bound on stabilization after a follower has been unresponsive.

Copy link
Contributor

@DaveCTurner DaveCTurner Mar 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't had time to do so, and would rather merge this PR than block on that.

final PublishClusterStateStats postPublishStats = follower.coordinator.stats().getPublishStats();
assertEquals(prePublishStats.getFullClusterStateReceivedCount() + 1,
postPublishStats.getFullClusterStateReceivedCount());
Expand Down