You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/03/23 14:10:15 UTC
lucene-solr:branch_6x: SOLR-10281: ADMIN_PATHS is duplicated in two
places and inconsistent
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 121231b6e -> a94c6235a
SOLR-10281: ADMIN_PATHS is duplicated in two places and inconsistent
(cherry picked from commit c221ef0)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a94c6235
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a94c6235
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a94c6235
Branch: refs/heads/branch_6x
Commit: a94c6235a038792b2f7b5f04f81c120bea725abc
Parents: 121231b
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Mar 23 19:33:45 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 23 19:40:01 2017 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 5 +++++
.../solr/client/solrj/impl/CloudSolrClient.java | 15 +--------------
.../org/apache/solr/common/params/CommonParams.java | 4 +++-
3 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a94c6235/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e9396c4..0bb27da 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -48,6 +48,11 @@ Optimizations
instance if it already is modifiable, otherwise creates a new ModifiableSolrParams instance.
(J�rg Rathlev via Koji)
+Bug Fixes
+----------------------
+* SOLR-10281: ADMIN_PATHS is duplicated in two places and inconsistent. This can cause automatic
+ retries to /admin/metrics handler by the CloudSolrClient. (shalin)
+
================== 6.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a94c6235/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
index 1baef41..1531841 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
@@ -84,11 +84,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
-import static org.apache.solr.common.params.CommonParams.AUTHC_PATH;
-import static org.apache.solr.common.params.CommonParams.AUTHZ_PATH;
-import static org.apache.solr.common.params.CommonParams.COLLECTIONS_HANDLER_PATH;
-import static org.apache.solr.common.params.CommonParams.CONFIGSETS_HANDLER_PATH;
-import static org.apache.solr.common.params.CommonParams.CORES_HANDLER_PATH;
+import static org.apache.solr.common.params.CommonParams.ADMIN_PATHS;
import static org.apache.solr.common.params.CommonParams.ID;
/**
@@ -1057,15 +1053,6 @@ public class CloudSolrClient extends SolrClient {
collection = (reqParams != null) ? reqParams.get("collection", getDefaultCollection()) : getDefaultCollection();
return requestWithRetryOnStaleState(request, 0, collection);
}
- private static final Set<String> ADMIN_PATHS = new HashSet<>(Arrays.asList(
- CORES_HANDLER_PATH,
- COLLECTIONS_HANDLER_PATH,
- CONFIGSETS_HANDLER_PATH,
- AUTHC_PATH,
- AUTHZ_PATH,
- "/____v2/cluster/security/authentication",
- "/____v2/cluster/security/authorization"
- ));
/**
* As this class doesn't watch external collections on the client side,
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a94c6235/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
index 589ef7e..c3a011c 100644
--- a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
+++ b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java
@@ -188,7 +188,9 @@ public interface CommonParams {
CONFIGSETS_HANDLER_PATH,
AUTHC_PATH,
AUTHZ_PATH,
- METRICS_PATH));
+ METRICS_PATH,
+ "/____v2/cluster/security/authentication",
+ "/____v2/cluster/security/authorization"));
/** valid values for: <code>echoParams</code> */
enum EchoParamStyle {