Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12261: Collection deletion's check for alias membership should 

sync() aliases with ZK before throwing an error.
This commit is contained in:
David Smiley 2018-04-24 23:25:11 -04:00
parent c5a1738151
commit 1370f6b520
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -187,6 +187,10 @@ Bug Fixes
* SOLR-11833: Allow searchRate trigger to delete replicas. Improve configurability of the trigger by specifying * SOLR-11833: Allow searchRate trigger to delete replicas. Improve configurability of the trigger by specifying
upper / lower thresholds and respective actions (ab) upper / lower thresholds and respective actions (ab)
* SOLR-12261: If you attempt to delete a collection immediately after deleting an alias it used to be a part of, you may
get an error that's it's a member of that alias. This check now ensures the alias state is sync()'ed with ZK first.
(David Smiley)
Optimizations Optimizations
---------------------- ----------------------

30
solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteCollectionCmd.java
View File

@ -62,15 +62,10 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
@Override @Override
public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception { public void call(ClusterState state, ZkNodeProps message, NamedList results) throws Exception {
ZkStateReader zkStateReader = ocmh.zkStateReader;
Aliases aliases = zkStateReader.getAliases();
final String collection = message.getStr(NAME); final String collection = message.getStr(NAME);
for (Map.Entry<String, List<String>> ent : aliases.getCollectionAliasListMap().entrySet()) { ZkStateReader zkStateReader = ocmh.zkStateReader;
if (ent.getValue().contains(collection)) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, checkNotReferencedByAlias(zkStateReader, collection);
"Collection : " + collection + " is part of alias " + ent.getKey() + " remove or modify the alias before removing this collection.");
}
}
boolean removeCounterNode = true; boolean removeCounterNode = true;
try { try {
@ -154,4 +149,23 @@ public class DeleteCollectionCmd implements OverseerCollectionMessageHandler.Cmd
} }
} }
} }
private void checkNotReferencedByAlias(ZkStateReader zkStateReader, String collection) throws Exception {
String alias = referencedByAlias(collection, zkStateReader.getAliases());
if (alias != null) {
zkStateReader.aliasesManager.update(); // aliases may have been stale; get latest from ZK
alias = referencedByAlias(collection, zkStateReader.getAliases());
if (alias != null) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
"Collection : " + collection + " is part of alias " + alias + " remove or modify the alias before removing this collection.");
}
}
}
private String referencedByAlias(String collection, Aliases aliases) {
return aliases.getCollectionAliasListMap().entrySet().stream()
.filter(e -> e.getValue().contains(collection))
.map(Map.Entry::getKey) // alias name
.findFirst().orElse(null);
}
} }