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

SOLR-7907: Remove CLUSTERSTATUS exclusivity checks from the Overseer 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1725321 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Varun Thacker 2016-01-18 19:13:52 +00:00
parent db7653e3ef
commit f48207168e
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -540,6 +540,9 @@ Other Changes
several places in Solr now additionally support BCP47 in config
files. (Uwe Schindler, Robert Muir)
* SOLR-7907: Remove CLUSTERSTATUS related exclusivity checks while running commands in the Overseer because the
CLUSTERSTATUS request is served by the individual nodes itself and not via the Overseer node.
================== 5.4.1 ==================
Bug Fixes

13
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
View File

@ -261,9 +261,6 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
case OVERSEERSTATUS:
getOverseerStatus(message, results);
break;
case CLUSTERSTATUS://TODO . deprecated. OCP does not need to do it .remove in a later release
new ClusterStatus(zkStateReader, message).getClusterStatus(results);
break;
case ADDREPLICAPROP:
processReplicaAddPropertyCommand(message);
break;
@ -2500,8 +2497,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
@Override
public void markExclusiveTask(String collectionName, ZkNodeProps message) {
//TODO deprecated remove this check .
if (!CLUSTERSTATUS.isEqual(message.getStr(Overseer.QUEUE_OPERATION)) && collectionName != null) {
if (collectionName != null) {
synchronized (collectionWip) {
collectionWip.add(collectionName);
}
@ -2510,7 +2506,7 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
@Override
public void unmarkExclusiveTask(String collectionName, String operation, ZkNodeProps message) {
if(!CLUSTERSTATUS.isEqual(operation) && collectionName != null) {
if(collectionName != null) {
synchronized (collectionWip) {
collectionWip.remove(collectionName);
}
@ -2519,11 +2515,6 @@ public class OverseerCollectionMessageHandler implements OverseerMessageHandler
@Override
public ExclusiveMarking checkExclusiveMarking(String collectionName, ZkNodeProps message) {
// CLUSTERSTATUS is always mutually exclusive
//TODO deprecated remove this check .
if(CLUSTERSTATUS.isEqual(message.getStr(Overseer.QUEUE_OPERATION)))
return ExclusiveMarking.EXCLUSIVE;
synchronized (collectionWip) {
if(collectionWip.contains(collectionName))
return ExclusiveMarking.NONEXCLUSIVE;