SOLR-11722 SOLR-11617: Alias tests: Ensure zkStateReader's view is up to date before acting

This commit is contained in:
David Smiley 2018-02-05 23:45:47 -05:00
parent 5240f697d3
commit 812d400807
2 changed files with 3 additions and 1 deletions

View File

@ -277,7 +277,8 @@ public class AliasIntegrationTest extends SolrCloudTestCase {
}
private void checkFooAndBarMeta(String aliasName, ZkStateReader zkStateReader) {
private void checkFooAndBarMeta(String aliasName, ZkStateReader zkStateReader) throws Exception {
zkStateReader.aliasesHolder.update(); // ensure our view is up to date
Map<String, String> meta = zkStateReader.getAliases().getCollectionAliasMetadata(aliasName);
assertNotNull(meta);
assertTrue(meta.containsKey("foo"));

View File

@ -85,6 +85,7 @@ public class CreateRoutedAliasTest extends SolrCloudTestCase {
// delete aliases first since they refer to the collections
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
//TODO create an API to delete collections attached to the routed alias when the alias is removed
zkStateReader.aliasesHolder.update();// ensure we're seeing the latest
zkStateReader.aliasesHolder.applyModificationAndExportToZk(aliases -> {
Aliases a = zkStateReader.getAliases();
for (String alias : a.getCollectionAliasMap().keySet()) {