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/17 07:42:43 UTC
[lucene-solr] branch jira/solr-14656-master updated: SOLR-14656:
Fixing test failures to authentication plugins
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 b9b139b SOLR-14656: Fixing test failures to authentication plugins
b9b139b is described below
commit b9b139b022ad98a561f4216de8640349aca52580
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Fri Jul 17 13:11:49 2020 +0530
SOLR-14656: Fixing test failures to authentication plugins
---
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 1 -
.../test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java | 6 +++---
.../solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java | 6 +++---
.../apache/solr/client/solrj/cloud/autoscaling/VariableBase.java | 3 ---
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 --
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 00410a5..9fc2ae0 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -98,7 +98,6 @@ import org.apache.solr.common.util.IOUtils;
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.SolrNamedThreadFactory;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.common.util.TimeSource;
import org.apache.solr.common.util.URLUtil;
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CloseHook;
diff --git a/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
index b35ed89..5351968 100644
--- a/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/security/JWTAuthPluginIntegrationTest.java
@@ -211,11 +211,11 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
// Now update three documents
assertAuthMetricsMinimums(1, 1, 0, 0, 0, 0);
- assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
+ assertPkiAuthMetricsMinimums(2, 2, 0, 0, 0, 0);
Pair<String,Integer> result = post(baseUrl + "/" + COLLECTION + "/update?commit=true", "[{\"id\" : \"1\"}, {\"id\": \"2\"}, {\"id\": \"3\"}]", jwtTestToken);
assertEquals(Integer.valueOf(200), result.second());
assertAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
- assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
+ assertPkiAuthMetricsMinimums(2, 2, 0, 0, 0, 0);
// First a non distributed query
result = get(baseUrl + "/" + COLLECTION + "/query?q=*:*&distrib=false", jwtTestToken);
@@ -230,7 +230,7 @@ public class JWTAuthPluginIntegrationTest extends SolrCloudAuthTestCase {
// Delete
assertEquals(200, get(baseUrl + "/admin/collections?action=DELETE&name=" + COLLECTION, jwtTestToken).second().intValue());
assertAuthMetricsMinimums(11, 11, 0, 0, 0, 0);
- assertPkiAuthMetricsMinimums(6, 6, 0, 0, 0, 0);
+ assertPkiAuthMetricsMinimums(4, 4, 0, 0, 0, 0);
}
private void getAndFail(String url, String token) {
diff --git a/solr/core/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java b/solr/core/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java
index 27f869e..6538fd5 100644
--- a/solr/core/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java
+++ b/solr/core/src/test/org/apache/solr/security/hadoop/TestSolrCloudWithHadoopAuthPlugin.java
@@ -70,13 +70,13 @@ public class TestSolrCloudWithHadoopAuthPlugin extends SolrCloudAuthTestCase {
NUM_SHARDS, REPLICATION_FACTOR);
create.process(solrClient);
// The metrics counter for wrong credentials here really just means
- assertAuthMetricsMinimums(6, 3, 0, 3, 0, 0);
+ assertAuthMetricsMinimums(4, 2, 0, 2, 0, 0);
SolrInputDocument doc = new SolrInputDocument();
doc.setField("id", "1");
solrClient.add(collectionName, doc);
solrClient.commit(collectionName);
- assertAuthMetricsMinimums(10, 5, 0, 5, 0, 0);
+ assertAuthMetricsMinimums(8, 4, 0, 4, 0, 0);
SolrQuery query = new SolrQuery();
query.setQuery("*:*");
@@ -88,5 +88,5 @@ public class TestSolrCloudWithHadoopAuthPlugin extends SolrCloudAuthTestCase {
AbstractDistribZkTestBase.waitForCollectionToDisappear(collectionName,
solrClient.getZkStateReader(), true, 330);
// cookie was used to avoid re-authentication
- assertAuthMetricsMinimums(13, 8, 0, 5, 0, 0); }
+ assertAuthMetricsMinimums(11, 7, 0, 4, 0, 0); }
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
index 13b2a02..1ccf1d1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/cloud/autoscaling/VariableBase.java
@@ -17,9 +17,6 @@
package org.apache.solr.client.solrj.cloud.autoscaling;
-
-import org.apache.solr.common.util.StrUtils;
-
import static org.apache.solr.client.solrj.cloud.autoscaling.Variable.Type.FREEDISK;
public class VariableBase implements Variable {
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index bffd8df..b8fc9ea 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -50,7 +49,6 @@ import org.apache.solr.common.Callable;
import org.apache.solr.common.SolrCloseable;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.params.AutoScalingParams;
import org.apache.solr.common.params.CollectionAdminParams;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.ExecutorUtil;