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

Fix full cluster restart test recovery #29545

Merged
merged 4 commits into from
Apr 18, 2018
Merged

Fix full cluster restart test recovery #29545

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7d8024
Fix full cluster restart test recovery
jasontedor Apr 16, 2018
da2af73
Simplify
jasontedor Apr 16, 2018
fb1fe67
Remove import
jasontedor Apr 16, 2018
afbf34b
Use ensure green
jasontedor Apr 17, 2018
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 qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,7 @@ public void testEmptyShard() throws IOException {
* Tests recovery of an index with or without a translog and the
* statistics we gather about that.
*/
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/29544")
public void testRecovery() throws IOException {
public void testRecovery() throws Exception {
int count;
boolean shouldHaveTranslog;
if (runningAgainstOldCluster) {
Expand All @@ -701,7 +700,7 @@ public void testRecovery() throws IOException {
indexRandomDocuments(count, true, true, i -> jsonBuilder().startObject().field("field", "value").endObject());

// make sure all recoveries are done
ensureNoInitializingShards();
ensureGreen(index);
// Explicitly flush so we're sure to have a bunch of documents in the Lucene index
client().performRequest("POST", "/_flush");
if (shouldHaveTranslog) {
Expand Down