You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2016/01/18 20:19:28 UTC
svn commit: r1725323 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
Author: varun
Date: Mon Jan 18 19:19:27 2016
New Revision: 1725323
URL: http://svn.apache.org/viewvc?rev=1725323&view=rev
Log:
SOLR-7907: Remove CLUSTERSTATUS exclusivity checks from the Overseer (merged trunk r1725321)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1725323&r1=1725322&r2=1725323&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Mon Jan 18 19:19:27 2016
@@ -326,6 +326,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 (Varun Thacker)
+
================== 5.4.1 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java?rev=1725323&r1=1725322&r2=1725323&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java Mon Jan 18 19:19:27 2016
@@ -261,9 +261,6 @@ public class OverseerCollectionMessageHa
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 OverseerCollectionMessageHa
@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 OverseerCollectionMessageHa
@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 OverseerCollectionMessageHa
@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;