Skip to content
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

Ensure index commit released when testing timeouts #39273

Merged
merged 2 commits into from
Feb 22, 2019
Merged

Ensure index commit released when testing timeouts #39273

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca6eb7c
Ensure index commit released when testing timeouts
Tim-Brooks Feb 21, 2019
e11d09a
Merge remote-tracking branch 'upstream/master' into fix_commit_not_re…
Tim-Brooks Feb 21, 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: 5 additions & 0 deletions x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/CcrRepositoryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,11 @@ public void testIndividualActionsTimeout() throws Exception {
settingsRequest.persistentSettings(Settings.builder().put(CcrSettings.INDICES_RECOVERY_ACTION_TIMEOUT_SETTING.getKey(),
defaultValue));
assertAcked(followerClient().admin().cluster().updateSettings(settingsRequest).actionGet());
// This test sets individual action timeouts low to attempt to replicated timeouts. Although the
// clear session action is not blocked, it is possible that it will still occasionally timeout.
// By wiping the leader index here, we ensure we do not trigger the index commit hanging around
// assertion because the commit is released when the index shard is closed.
getLeaderCluster().wipeIndices(leaderIndex);
}
}

Expand Down