honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 10:25:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Failures when Closing Indices in EsBlobStoreRepositoryIntegTestCase (#45532) (#45614)

Browse Source 
* Same issue as in #44754 as far as I can see: in case of async translog persistence we randomly fail to close
* Closes #45335 
* Closes #45334
This commit is contained in:
Armin Braun 2019-08-15 19:45:17 +02:00 committed by GitHub
parent de58353722
commit 73e266b2fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESBlobStoreRepositoryIntegTestCase.java
View File

@ -131,6 +131,8 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase
} }
} }
// Wait for green so the close does not fail in the edge case of coinciding with a shard recovery that hasn't fully synced yet
ensureGreen();
logger.info("--> close indices {}", closeIndices); logger.info("--> close indices {}", closeIndices);
assertAcked(client().admin().indices().prepareClose(closeIndices.toArray(new String[closeIndices.size()]))); assertAcked(client().admin().indices().prepareClose(closeIndices.toArray(new String[closeIndices.size()])));
} }
@ -195,6 +197,8 @@ public abstract class ESBlobStoreRepositoryIntegTestCase extends ESIntegTestCase
int iterationToRestore = randomIntBetween(0, iterationCount - 1); int iterationToRestore = randomIntBetween(0, iterationCount - 1);
logger.info("--> performing restore of the iteration {}", iterationToRestore); logger.info("--> performing restore of the iteration {}", iterationToRestore);
// Wait for green so the close does not fail in the edge case of coinciding with a shard recovery that hasn't fully synced yet
ensureGreen();
logger.info("--> close index"); logger.info("--> close index");
assertAcked(client().admin().indices().prepareClose(indexName)); assertAcked(client().admin().indices().prepareClose(indexName));