You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2020/07/20 11:42:45 UTC

[lucene-solr] branch jira/solr-14656-master updated: SOLR-14656: Removing UTILIZENODE

This is an automated email from the ASF dual-hosted git repository.

ishan pushed a commit to branch jira/solr-14656-master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-14656-master by this push:
     new 1f7c687  SOLR-14656: Removing UTILIZENODE
1f7c687 is described below

commit 1f7c687476c993258dac9290046c109173f4da50
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Mon Jul 20 17:12:29 2020 +0530

    SOLR-14656: Removing UTILIZENODE
---
 .../solr/handler/admin/CollectionsHandler.java     |  3 ---
 .../solrj/request/CollectionAdminRequest.java      | 13 -------------
 .../client/solrj/request/CollectionApiMapping.java |  5 -----
 .../solr/common/params/CollectionParams.java       |  1 -
 .../src/resources/apispec/cluster.Commands.json    | 22 ----------------------
 5 files changed, 44 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index e7ab15b..0622641 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -967,9 +967,6 @@ public class CollectionsHandler extends RequestHandlerBase implements Permission
           new ZkNodeProps(all)).getClusterStatus(rsp.getValues());
       return null;
     }),
-    UTILIZENODE_OP(UTILIZENODE, (req, rsp, h) -> {
-      return copy(req.getParams().required(), null, "node");
-    }),
     ADDREPLICAPROP_OP(ADDREPLICAPROP, (req, rsp, h) -> {
       Map<String, Object> map = copy(req.getParams().required(), null,
           COLLECTION_PROP,
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 9e3a5f7..e0955c2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -666,19 +666,6 @@ public abstract class CollectionAdminRequest<T extends CollectionAdminResponse>
     }
 
   }
-  public static class UtilizeNode extends AsyncCollectionAdminRequest {
-    protected String node;
-
-    public UtilizeNode(String node) {
-      super(CollectionAction.UTILIZENODE);
-      this.node = node;
-    }
-    @Override
-    public SolrParams getParams() {
-      return ((ModifiableSolrParams) super.getParams()).set(CoreAdminParams.NODE, node);
-    }
-
-  }
 
   public static MoveReplica moveReplica(String collection, String replica, String targetNode) {
     return new MoveReplica(collection, replica, targetNode);
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java
index 5df18e0..721dbd1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionApiMapping.java
@@ -207,11 +207,6 @@ public class CollectionApiMapping {
         POST,
         null,
         "set-obj-property", null),
-    UTILIZE_NODE(CLUSTER_CMD,
-        POST,
-        UTILIZENODE,
-        "utilize-node",null),
-
     BACKUP_COLLECTION(COLLECTIONS_COMMANDS,
         POST,
         BACKUP,
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
index fce970f..f55cb70 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
@@ -116,7 +116,6 @@ public interface CollectionParams {
     CREATESNAPSHOT(true, LockLevel.COLLECTION),
     DELETESNAPSHOT(true, LockLevel.COLLECTION),
     LISTSNAPSHOTS(false, LockLevel.NONE),
-    UTILIZENODE(false, LockLevel.NONE),
     //only for testing. it just waits for specified time
     // these are not exposed via collection API commands
     // but the overseer is aware of these tasks
diff --git a/solr/solrj/src/resources/apispec/cluster.Commands.json b/solr/solrj/src/resources/apispec/cluster.Commands.json
index b2775e2..04428b3 100644
--- a/solr/solrj/src/resources/apispec/cluster.Commands.json
+++ b/solr/solrj/src/resources/apispec/cluster.Commands.json
@@ -141,28 +141,6 @@
           }
         }
       }
-    },
-    "utilize-node": {
-      "type": "object",
-      "documentation": "https://lucene.apache.org/solr/guide/cluster-node-management.html#utilizenode",
-      "description": "use a replica to reduce load",
-      "properties": {
-        "node": {
-          "type": "string",
-          "description": "The name of the node"
-        },
-        "async": {
-          "type": [
-            "string",
-            "boolean",
-            "null"
-          ],
-          "description": "The value of the property. If the value is empty or null, the property is unset."
-        }
-      },
-      "required": [
-        "name"
-      ]
     }
   }
 }