You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2020/11/16 19:57:36 UTC
[lucene-solr] branch reference_impl_dev updated: Un-ignore tests in
org.apache.solr.handler.admin package
This is an automated email from the ASF dual-hosted git repository.
thelabdude pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new 123c2fc Un-ignore tests in org.apache.solr.handler.admin package
123c2fc is described below
commit 123c2fc9aece65bffa26ab8308144b6e471dcc45
Author: Timothy Potter <th...@gmail.com>
AuthorDate: Mon Nov 16 12:57:04 2020 -0700
Un-ignore tests in org.apache.solr.handler.admin package
---
.../apache/solr/handler/admin/AdminHandlersProxyTest.java | 2 --
.../handler/admin/CoreMergeIndexesAdminHandlerTest.java | 5 +----
.../org/apache/solr/handler/admin/DaemonStreamApiTest.java | 13 ++++++-------
.../org/apache/solr/handler/admin/MBeansHandlerTest.java | 4 +---
.../solr/handler/admin/MetricsHistoryHandlerTest.java | 4 ++--
.../org/apache/solr/handler/admin/ZookeeperReadAPITest.java | 3 ---
.../solr/handler/admin/ZookeeperStatusHandlerTest.java | 8 --------
.../org/apache/solr/client/solrj/impl/HttpSolrClient.java | 4 ++--
.../src/java/org/apache/solr/cloud/ZkTestServer.java | 7 +++++++
9 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java
index ccfd9b6..dd2beda 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/AdminHandlersProxyTest.java
@@ -40,10 +40,8 @@ import org.apache.solr.common.util.TimeSource;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
-@Ignore // nocommit debug flakey
public class AdminHandlersProxyTest extends SolrCloudTestCase {
private CloseableHttpClient httpClient;
private CloudSolrClient solrClient;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
index 5a98871..b612a99 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java
@@ -19,6 +19,7 @@ package org.apache.solr.handler.admin;
import java.io.File;
import java.io.IOException;
+import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.LockFactory;
import org.apache.solr.SolrTestCaseJ4;
@@ -30,15 +31,11 @@ import org.apache.solr.core.MockFSDirectoryFactory;
import org.apache.solr.core.SolrCore;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
-import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule;
-
-@Ignore // nocommit flakey
public class CoreMergeIndexesAdminHandlerTest extends SolrTestCaseJ4 {
@BeforeClass
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
index 1004c1d..480282e 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
@@ -17,6 +17,12 @@
package org.apache.solr.handler.admin;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServerException;
@@ -34,13 +40,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-//@Ignore // nocommit - need to fix the driver and this test again
public class DaemonStreamApiTest extends SolrTestCaseJ4 {
private MiniSolrCloudCluster cluster;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
index b2f76a6..18b75591a 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
@@ -34,7 +34,6 @@ import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.request.LocalSolrQueryRequest;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +93,6 @@ public class MBeansHandlerTest extends SolrTestCaseJ4 {
}
@Test
- @Ignore // nocommit - maybe have to wait till mbean is populated?
public void testAddedMBeanDiff() throws Exception {
String xml = h.query(req(
CommonParams.QT,"/admin/mbeans",
@@ -114,7 +112,7 @@ public class MBeansHandlerTest extends SolrTestCaseJ4 {
xml = h.query(req);
NamedList<NamedList<NamedList<Object>>> nl = SolrInfoMBeanHandler.fromXML(xml);
- assertNotNull(((NamedList)nl.get("ADMIN").get("/admin/mbeans").get("stats")).get("ADD ADMIN./admin/mbeans.totalTime"));
+ assertNotNull(((NamedList)nl.get("ADMIN").get("/admin/mbeans").get("stats")).get("ADMIN./admin/mbeans.totalTime"));
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
index 7cb6a89..dbaf00f 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
@@ -37,7 +38,6 @@ import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.util.LogLevel;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.rrd4j.core.RrdDb;
@@ -45,7 +45,7 @@ import org.rrd4j.core.RrdDb;
*
*/
@LogLevel("org.apache.solr.cloud=DEBUG")
-@Ignore // nocommit debug
+@LuceneTestCase.Nightly
public class MetricsHistoryHandlerTest extends SolrCloudTestCase {
private volatile static SolrCloudManager cloudManager;
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java
index 9f01f9d..d5ad026 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperReadAPITest.java
@@ -27,7 +27,6 @@ import org.apache.zookeeper.CreateMode;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,7 +34,6 @@ import org.slf4j.LoggerFactory;
import static org.apache.solr.common.util.StrUtils.split;
import static org.apache.solr.common.util.Utils.getObjectByPath;
-@Ignore // nocommit debug
public class ZookeeperReadAPITest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -74,7 +72,6 @@ public class ZookeeperReadAPITest extends SolrCloudTestCase {
basezkls + "/configs",
Utils.JSONCONSUMER);
assertEquals("0", String.valueOf(getObjectByPath(o, true, split(":/configs:_default:dataLength", ':'))));
- assertEquals("0", String.valueOf(getObjectByPath(o, true, split(":/configs:conf:dataLength", ':'))));
o = Utils.executeGET(client.getHttpClient(),
basezk + "/configs",
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
index f4c79ce..92280b4 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/ZookeeperStatusHandlerTest.java
@@ -40,7 +40,6 @@ import org.apache.solr.common.util.NamedList;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import org.mockito.Answers;
import org.mockito.ArgumentMatchers;
@@ -51,7 +50,6 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@Ignore // nocommit
public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
@BeforeClass
public static void setupCluster() throws Exception {
@@ -160,23 +158,17 @@ public class ZookeeperStatusHandlerTest extends SolrCloudTestCase {
}
@Test(expected = SolrException.class)
- @Ignore // nocommit debug
public void validateNotWhitelisted() {
try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
zsh.validateZkRawResponse(Collections.singletonList("mntr is not executed because it is not in the whitelist."),
"zoo1:2181", "mntr");
- } catch (Exception e) {
- fail("Error closing ZookeeperStatusHandler");
}
}
@Test(expected = SolrException.class)
- @Ignore // nocommit debug
public void validateEmptyResponse() {
try (ZookeeperStatusHandler zsh = new ZookeeperStatusHandler(null)) {
zsh.validateZkRawResponse(Collections.emptyList(), "zoo1:2181", "mntr");
- } catch (Exception e) {
- fail("Error closing ZookeeperStatusHandler");
}
}
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
index a28f351..62e4dbb 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrClient.java
@@ -315,9 +315,9 @@ public class HttpSolrClient extends BaseHttpSolrClient {
final HttpRequestBase method = createMethod(request, null);
try {
MDC.put("HttpSolrClient.url", baseUrl);
- mrr.future = (Future<NamedList<Object>>) ((PerThreadExecService) ParWork.getMyPerThreadExecutor()).submit(() -> {
+ mrr.future = ParWork.getMyPerThreadExecutor().submit(() -> {
try {
- executeMethod(method, request.getUserPrincipal(), processor, isV2ApiRequest(request));
+ return executeMethod(method, request.getUserPrincipal(), processor, isV2ApiRequest(request));
} catch (SolrServerException e) {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
}
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
index eaff800..4393ac9 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java
@@ -71,6 +71,8 @@ import org.apache.zookeeper.server.quorum.QuorumPeerConfig.ConfigException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.solr.cloud.SolrZkServer.ZK_WHITELIST_PROPERTY;
+
public class ZkTestServer implements Closeable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -533,6 +535,11 @@ public class ZkTestServer implements Closeable {
public synchronized void run(boolean solrFormat) throws InterruptedException, IOException {
log.info("STARTING ZK TEST SERVER dataDir={}", this.zkDir);
+
+ if (System.getProperty(ZK_WHITELIST_PROPERTY) == null) {
+ System.setProperty(ZK_WHITELIST_PROPERTY, "ruok, mntr, conf");
+ }
+
// docs say no config for netty yet
// System.setProperty("zookeeper.serverCnxnFactory", "org.apache.zookeeper.server.NettyServerCnxnFactory");
// System.setProperty("zookeeper.clientCnxnSocket", "org.apache.zookeeper.ClientCnxnSocketNetty");