svn commit: r1647553 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/cloud/Overseer.java core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java

[sh...@apache.org]

Author: shalin
Date: Tue Dec 23 11:40:52 2014
New Revision: 1647553

URL: http://svn.apache.org/r1647553
Log:
SOLR-6882: Misspelled collection API actions in ReplicaMutator exception messages

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1647553&r1=1647552&r2=1647553&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Dec 23 11:40:52 2014
@@ -533,6 +533,9 @@ Other Changes
 
 * SOLR-6883: CLUSTERPROP API switch case does not call break. (Varun Thacker via shalin)
 
+* SOLR-6882: Misspelled collection API actions in ReplicaMutator exception messages.
+  (Steve Rowe via shalin)
+
 ==================  4.10.3 ==================
 
 Bug Fixes

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java?rev=1647553&r1=1647552&r2=1647553&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/Overseer.java Tue Dec 23 11:40:52 2014
@@ -402,7 +402,7 @@ public class Overseer implements Closeab
           case ADDREPLICAPROP:
             return new ReplicaMutator(getZkStateReader()).addReplicaProperty(clusterState, message);
           case DELETEREPLICAPROP:
-            return new ReplicaMutator(getZkStateReader()).removeReplicaProperty(clusterState, message);
+            return new ReplicaMutator(getZkStateReader()).deleteReplicaProperty(clusterState, message);
           case BALANCESHARDUNIQUE:
             ExclusiveSliceProperty dProp = new ExclusiveSliceProperty(clusterState, message);
             if (dProp.balanceProperty()) {

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java?rev=1647553&r1=1647552&r2=1647553&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java Tue Dec 23 11:40:52 2014
@@ -94,7 +94,7 @@ public class ReplicaMutator {
         checkKeyExistence(message, ZkStateReader.PROPERTY_PROP) == false ||
         checkKeyExistence(message, ZkStateReader.PROPERTY_VALUE_PROP) == false) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
-          "Overseer SETREPLICAPROPERTY requires " +
+          "Overseer ADDREPLICAPROP requires " +
               ZkStateReader.COLLECTION_PROP + " and " + ZkStateReader.SHARD_ID_PROP + " and " +
               ZkStateReader.REPLICA_PROP + " and " + ZkStateReader.PROPERTY_PROP + " and " +
               ZkStateReader.PROPERTY_VALUE_PROP + " no action taken.");
@@ -115,7 +115,7 @@ public class ReplicaMutator {
 
     if (SliceMutator.SLICE_UNIQUE_BOOLEAN_PROPERTIES.contains(property)) {
       if (StringUtils.isNotBlank(shardUnique) && Boolean.parseBoolean(shardUnique) == false) {
-        throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Overseer SETREPLICAPROPERTY for " +
+        throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "Overseer ADDREPLICAPROP for " +
             property + " cannot have " + OverseerCollectionProcessor.SHARD_UNIQUE + " set to anything other than" +
             "'true'. No action taken");
       }
@@ -153,13 +153,13 @@ public class ReplicaMutator {
     return new ZkWriteCommand(collectionName, newCollection);
   }
 
-  public ZkWriteCommand removeReplicaProperty(ClusterState clusterState, ZkNodeProps message) {
+  public ZkWriteCommand deleteReplicaProperty(ClusterState clusterState, ZkNodeProps message) {
     if (checkKeyExistence(message, ZkStateReader.COLLECTION_PROP) == false ||
         checkKeyExistence(message, ZkStateReader.SHARD_ID_PROP) == false ||
         checkKeyExistence(message, ZkStateReader.REPLICA_PROP) == false ||
         checkKeyExistence(message, ZkStateReader.PROPERTY_PROP) == false) {
       throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
-          "Overseer DELETEREPLICAPROPERTY requires " +
+          "Overseer DELETEREPLICAPROP requires " +
               ZkStateReader.COLLECTION_PROP + " and " + ZkStateReader.SHARD_ID_PROP + " and " +
               ZkStateReader.REPLICA_PROP + " and " + ZkStateReader.PROPERTY_PROP + " no action taken.");
     }