You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2019/02/25 16:30:07 UTC
[lucene-solr] branch branch_8x updated: SOLR-13060: Improve
HdfsAutoAddReplicasIntegrationTest and HdfsCollectionsAPIDistributedZkTest
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 129de3f SOLR-13060: Improve HdfsAutoAddReplicasIntegrationTest and HdfsCollectionsAPIDistributedZkTest
129de3f is described below
commit 129de3f5e9f45d79711853b087fce86358a63307
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Sat Feb 2 14:40:10 2019 -0500
SOLR-13060: Improve HdfsAutoAddReplicasIntegrationTest and HdfsCollectionsAPIDistributedZkTest
Signed-off-by: Kevin Risden <kr...@apache.org>
---
solr/CHANGES.txt | 2 +
.../CollectionsAPIDistributedZkTest.java | 91 +++++---------
.../HdfsCollectionsAPIDistributedZkTest.java | 138 ++-------------------
.../AutoAddReplicasIntegrationTest.java | 16 ++-
.../HdfsAutoAddReplicasIntegrationTest.java | 38 +++---
5 files changed, 68 insertions(+), 217 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c2863b1..cf51f88 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -87,6 +87,8 @@ Other Changes
* SOLR-9763: Remove the workaround implemented for HADOOP-12767 (Kevin Risden)
+* SOLR-13060: Improve HdfsAutoAddReplicasIntegrationTest and HdfsCollectionsAPIDistributedZkTest (Kevin Risden)
+
================== 8.0.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
index 42d05f0..4718a10 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/CollectionsAPIDistributedZkTest.java
@@ -42,7 +42,6 @@ import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
-import org.apache.commons.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TestUtil;
import org.apache.solr.client.solrj.SolrQuery;
@@ -75,7 +74,6 @@ import org.apache.solr.common.util.TimeSource;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoBean.Category;
-import org.apache.solr.util.LogLevel;
import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
import org.junit.After;
@@ -93,6 +91,10 @@ import com.google.common.collect.ImmutableList;
public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ protected String getConfigSet() {
+ return "cloud-minimal";
+ }
+
@Before
public void setupCluster() throws Exception {
// we don't want this test to have zk timeouts
@@ -100,24 +102,26 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
System.setProperty("createCollectionWaitTimeTillActive", "5");
TestInjection.randomDelayInCoreCreation = "true:5";
System.setProperty("validateAfterInactivity", "200");
-
- String solrXml = IOUtils.toString(CollectionsAPIDistributedZkTest.class.getResourceAsStream("/solr/solr-jmxreporter.xml"), "UTF-8");
+
configureCluster(4)
- .addConfig("conf", configset("cloud-minimal"))
- .addConfig("conf2", configset("cloud-minimal-jmx"))
- .withSolrXml(solrXml)
+ .addConfig("conf", configset(getConfigSet()))
+ .addConfig("conf2", configset(getConfigSet()))
+ .withSolrXml(TEST_PATH().resolve("solr.xml"))
.configure();
}
@After
public void tearDownCluster() throws Exception {
- shutdownCluster();
- System.clearProperty("createCollectionWaitTimeTillActive");
+ try {
+ shutdownCluster();
+ } finally {
+ System.clearProperty("createCollectionWaitTimeTillActive");
+ super.tearDown();
+ }
}
@Test
public void testCreationAndDeletion() throws Exception {
-
String collectionName = "created_and_deleted";
CollectionAdminRequest.createCollection(collectionName, "conf", 1, 1).process(cluster.getSolrClient());
@@ -129,13 +133,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
.contains(collectionName));
assertFalse(cluster.getZkClient().exists(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collectionName, true));
-
-
}
@Test
public void deleteCollectionRemovesStaleZkCollectionsNode() throws Exception {
-
String collectionName = "out_of_sync_collection";
// manually create a collections zknode
@@ -148,12 +149,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
.contains(collectionName));
assertFalse(cluster.getZkClient().exists(ZkStateReader.COLLECTIONS_ZKNODE + "/" + collectionName, true));
-
}
@Test
public void deletePartiallyCreatedCollection() throws Exception {
-
final String collectionName = "halfdeletedcollection";
assertEquals(0, CollectionAdminRequest.createCollection(collectionName, "conf", 2, 1)
@@ -175,12 +174,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
.process(cluster.getSolrClient());
assertTrue(CollectionAdminRequest.listCollections(cluster.getSolrClient()).contains(collectionName));
-
}
@Test
public void deleteCollectionOnlyInZk() throws Exception {
-
final String collectionName = "onlyinzk";
// create the collections node, but nothing else
@@ -194,12 +191,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 1)
.process(cluster.getSolrClient());
assertTrue(CollectionAdminRequest.listCollections(cluster.getSolrClient()).contains(collectionName));
-
}
@Test
- public void testBadActionNames() throws Exception {
-
+ public void testBadActionNames() {
// try a bad action
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", "BADACTION");
@@ -212,12 +207,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
expectThrows(Exception.class, () -> {
cluster.getSolrClient().request(request);
});
-
}
@Test
public void testMissingRequiredParameters() {
-
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionAction.CREATE.toString());
params.set("numShards", 2);
@@ -232,18 +225,15 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@Test
public void testTooManyReplicas() {
-
CollectionAdminRequest req = CollectionAdminRequest.createCollection("collection", "conf", 2, 10);
expectThrows(Exception.class, () -> {
cluster.getSolrClient().request(req);
});
-
}
@Test
public void testMissingNumShards() {
-
// No numShards should fail
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionAction.CREATE.toString());
@@ -257,12 +247,10 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
expectThrows(Exception.class, () -> {
cluster.getSolrClient().request(request);
});
-
}
@Test
public void testZeroNumShards() {
-
ModifiableSolrParams params = new ModifiableSolrParams();
params.set("action", CollectionAction.CREATE.toString());
params.set("name", "acollection");
@@ -275,7 +263,6 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
expectThrows(Exception.class, () -> {
cluster.getSolrClient().request(request);
});
-
}
@Test
@@ -316,7 +303,6 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@Test
public void testNoConfigSetExist() throws Exception {
-
expectThrows(Exception.class, () -> {
CollectionAdminRequest.createCollection("noconfig", "conf123", 1, 1)
.process(cluster.getSolrClient());
@@ -330,14 +316,12 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
@Test
public void testCoresAreDistributedAcrossNodes() throws Exception {
-
CollectionAdminRequest.createCollection("nodes_used_collection", "conf", 2, 2)
.process(cluster.getSolrClient());
Set<String> liveNodes = cluster.getSolrClient().getZkStateReader().getClusterState().getLiveNodes();
- List<String> createNodeList = new ArrayList<>();
- createNodeList.addAll(liveNodes);
+ List<String> createNodeList = new ArrayList<>(liveNodes);
DocCollection collection = getCollectionState("nodes_used_collection");
for (Slice slice : collection.getSlices()) {
@@ -347,13 +331,12 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
}
assertEquals(createNodeList.toString(), 0, createNodeList.size());
-
}
@Test
public void testDeleteNonExistentCollection() throws Exception {
- SolrException e = expectThrows(SolrException.class, () -> {
+ expectThrows(SolrException.class, () -> {
CollectionAdminRequest.deleteCollection("unknown_collection").process(cluster.getSolrClient());
});
@@ -375,24 +358,19 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
}
@Test
- public void testMaxNodesPerShard() throws Exception {
-
- // test maxShardsPerNode
+ public void testMaxNodesPerShard() {
int numLiveNodes = cluster.getJettySolrRunners().size();
int numShards = (numLiveNodes/2) + 1;
int replicationFactor = 2;
- int maxShardsPerNode = 1;
- SolrException e = expectThrows(SolrException.class, () -> {
+ expectThrows(SolrException.class, () -> {
CollectionAdminRequest.createCollection("oversharded", "conf", numShards, replicationFactor)
.process(cluster.getSolrClient());
});
-
}
@Test
public void testCreateNodeSet() throws Exception {
-
JettySolrRunner jetty1 = cluster.getRandomJetty(random());
JettySolrRunner jetty2 = cluster.getRandomJetty(random());
@@ -407,13 +385,14 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
String replicaUrl = replica.getCoreUrl();
boolean matchingJetty = false;
for (String jettyUrl : baseUrls) {
- if (replicaUrl.startsWith(jettyUrl))
+ if (replicaUrl.startsWith(jettyUrl)) {
matchingJetty = true;
+ }
}
- if (matchingJetty == false)
+ if (matchingJetty == false) {
fail("Expected replica to be on " + baseUrls + " but was on " + replicaUrl);
+ }
}
-
}
@Test
@@ -508,13 +487,11 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
for (int z = 1; z < createRequests[j].getNumShards(); z++) {
zkStateReader.getLeaderRetry(collectionName, "shard" + z, 10000);
} // make sure we again have leaders for each shard
-
}
}
@Test
public void testCollectionReload() throws Exception {
-
final String collectionName = "reloaded_collection";
CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2).process(cluster.getSolrClient());
@@ -534,21 +511,17 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
CoreContainer cores = jetty.getCoreContainer();
Collection<SolrCore> theCores = cores.getCores();
for (SolrCore core : theCores) {
-
// look for core props file
- Path instancedir = (Path) core.getResourceLoader().getInstancePath();
+ Path instancedir = core.getResourceLoader().getInstancePath();
assertTrue("Could not find expected core.properties file", Files.exists(instancedir.resolve("core.properties")));
Path expected = Paths.get(jetty.getSolrHome()).toAbsolutePath().resolve(core.getName());
assertTrue("Expected: " + expected + "\nFrom core stats: " + instancedir, Files.isSameFile(expected, instancedir));
-
}
}
private boolean waitForReloads(String collectionName, Map<String,Long> urlToTimeBefore) throws SolrServerException, IOException {
-
-
TimeOut timeout = new TimeOut(45, TimeUnit.SECONDS, TimeSource.NANO_TIME);
boolean allTimesAreCorrect = false;
@@ -597,29 +570,27 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
}
}
- private void checkNoTwoShardsUseTheSameIndexDir() throws Exception {
+ private void checkNoTwoShardsUseTheSameIndexDir() {
Map<String, Set<String>> indexDirToShardNamesMap = new HashMap<>();
List<MBeanServer> servers = new LinkedList<>();
servers.add(ManagementFactory.getPlatformMBeanServer());
servers.addAll(MBeanServerFactory.findMBeanServer(null));
for (final MBeanServer server : servers) {
- Set<ObjectName> mbeans = new HashSet<>();
- mbeans.addAll(server.queryNames(null, null));
+ Set<ObjectName> mbeans = new HashSet<>(server.queryNames(null, null));
for (final ObjectName mbean : mbeans) {
-
try {
Map<String, String> props = mbean.getKeyPropertyList();
String category = props.get("category");
String name = props.get("name");
- if ((category != null && category.toString().equals(Category.CORE.toString())) &&
+ if ((category != null && category.equals(Category.CORE.toString())) &&
(name != null && name.equals("indexDir"))) {
String indexDir = server.getAttribute(mbean, "Value").toString();
String key = props.get("dom2") + "." + props.get("dom3") + "." + props.get("dom4");
if (!indexDirToShardNamesMap.containsKey(indexDir)) {
- indexDirToShardNamesMap.put(indexDir.toString(), new HashSet<>());
+ indexDirToShardNamesMap.put(indexDir, new HashSet<>());
}
- indexDirToShardNamesMap.get(indexDir.toString()).add(key);
+ indexDirToShardNamesMap.get(indexDir).add(key);
}
} catch (Exception e) {
// ignore, just continue - probably a "Value" attribute
@@ -639,11 +610,9 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
+ entry.getKey());
}
}
-
}
@Test
- @LogLevel("org.apache.solr.cloud=DEBUG")
public void addReplicaTest() throws Exception {
String collectionName = "addReplicaColl";
@@ -702,7 +671,6 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
newReplica = grabNewReplica(response, getCollectionState(collectionName));
assertEquals("'core' should be 'propertyDotName' ", "propertyDotName", newReplica.getStr("core"));
-
}
private Replica grabNewReplica(CollectionAdminResponse response, DocCollection docCollection) {
@@ -715,5 +683,4 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
}
throw new AssertionError("Can not find " + replicaName + " from " + docCollection);
}
-
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCollectionsAPIDistributedZkTest.java
index d770d18..700165b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/HdfsCollectionsAPIDistributedZkTest.java
@@ -16,40 +16,16 @@
*/
package org.apache.solr.cloud.api.collections;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
import com.carrotsearch.randomizedtesting.annotations.Nightly;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Metric;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TimeUnits;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.request.CollectionAdminRequest;
-import org.apache.solr.client.solrj.request.CoreAdminRequest;
-import org.apache.solr.client.solrj.request.CoreStatus;
-import org.apache.solr.client.solrj.response.CoreAdminResponse;
import org.apache.solr.cloud.hdfs.HdfsTestUtil;
-import org.apache.solr.common.cloud.Replica;
-import org.apache.solr.common.cloud.Slice;
-import org.apache.solr.common.cloud.ZkConfigManager;
-import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.util.BadHdfsThreadsFilter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
@Slow
@Nightly
@@ -57,125 +33,29 @@ import org.junit.Test;
BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
@TimeoutSuite(millis = TimeUnits.HOUR)
-@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13060")
-//commented 23-AUG-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 12-Jun-2018
public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistributedZkTest {
-
private static MiniDFSCluster dfsCluster;
@BeforeClass
public static void setupClass() throws Exception {
System.setProperty("solr.hdfs.blockcache.blocksperbank", "512");
System.setProperty("tests.hdfs.numdatanodes", "1");
-
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
-
- ZkConfigManager configManager = new ZkConfigManager(zkClient());
- configManager.uploadConfigDir(configset("cloud-hdfs"), "conf");
- configManager.uploadConfigDir(configset("cloud-hdfs"), "conf2");
-
- System.setProperty("solr.hdfs.home", HdfsTestUtil.getDataDir(dfsCluster, "data"));
}
@AfterClass
public static void teardownClass() throws Exception {
- cluster.shutdown(); // need to close before the MiniDFSCluster
- HdfsTestUtil.teardownClass(dfsCluster);
- dfsCluster = null;
- System.clearProperty("solr.hdfs.blockcache.blocksperbank");
- System.clearProperty("tests.hdfs.numdatanodes");
- System.clearProperty("solr.hdfs.home");
- }
-
- @Test
- public void moveReplicaTest() throws Exception {
- String coll = "movereplicatest_coll";
-
- CloudSolrClient cloudClient = cluster.getSolrClient();
-
- CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf", 2, 2);
- create.setMaxShardsPerNode(2);
- cloudClient.request(create);
-
- for (int i = 0; i < 10; i++) {
- cloudClient.add(coll, sdoc("id",String.valueOf(i)));
- cloudClient.commit(coll);
- }
-
- List<Slice> slices = new ArrayList<>(cloudClient.getZkStateReader().getClusterState().getCollection(coll).getSlices());
- Collections.shuffle(slices, random());
- Slice slice = null;
- Replica replica = null;
- for (Slice s : slices) {
- slice = s;
- for (Replica r : s.getReplicas()) {
- if (s.getLeader() != r) {
- replica = r;
- }
- }
- }
- String dataDir = getDataDir(replica);
-
- Set<String> liveNodes = cloudClient.getZkStateReader().getClusterState().getLiveNodes();
- ArrayList<String> l = new ArrayList<>(liveNodes);
- Collections.shuffle(l, random());
- String targetNode = null;
- for (String node : liveNodes) {
- if (!replica.getNodeName().equals(node)) {
- targetNode = node;
- break;
- }
- }
- assertNotNull(targetNode);
-
- CollectionAdminRequest.MoveReplica moveReplica = new CollectionAdminRequest.MoveReplica(coll, replica.getName(), targetNode);
- moveReplica.process(cloudClient);
-
- checkNumOfCores(cloudClient, replica.getNodeName(), 0);
- checkNumOfCores(cloudClient, targetNode, 2);
-
- waitForState("Wait for recovery finish failed",coll, clusterShape(2,4));
- slice = cloudClient.getZkStateReader().getClusterState().getCollection(coll).getSlice(slice.getName());
- boolean found = false;
- for (Replica newReplica : slice.getReplicas()) {
- if (getDataDir(newReplica).equals(dataDir)) {
- found = true;
- }
- }
- assertTrue(found);
-
-
- // data dir is reused so replication will be skipped
- for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
- SolrMetricManager manager = jetty.getCoreContainer().getMetricManager();
- List<String> registryNames = manager.registryNames().stream()
- .filter(s -> s.startsWith("solr.core.")).collect(Collectors.toList());
- for (String registry : registryNames) {
- Map<String, Metric> metrics = manager.registry(registry).getMetrics();
- Counter counter = (Counter) metrics.get("REPLICATION./replication.requests");
- if (counter != null) {
- assertEquals(0, counter.getCount());
- }
- }
+ try {
+ HdfsTestUtil.teardownClass(dfsCluster);
+ } finally {
+ dfsCluster = null;
+ System.clearProperty("solr.hdfs.blockcache.blocksperbank");
+ System.clearProperty("tests.hdfs.numdatanodes");
}
}
-
- private void checkNumOfCores(CloudSolrClient cloudClient, String nodeName, int expectedCores) throws IOException, SolrServerException {
- assertEquals(nodeName + " does not have expected number of cores",expectedCores, getNumOfCores(cloudClient, nodeName));
- }
-
- private int getNumOfCores(CloudSolrClient cloudClient, String nodeName) throws IOException, SolrServerException {
- try (HttpSolrClient coreclient = getHttpSolrClient(cloudClient.getZkStateReader().getBaseUrlForNodeName(nodeName))) {
- CoreAdminResponse status = CoreAdminRequest.getStatus(null, coreclient);
- return status.getCoreStatus().size();
- }
- }
-
- private String getDataDir(Replica replica) throws IOException, SolrServerException {
- try (HttpSolrClient coreclient = getHttpSolrClient(replica.getBaseUrl())) {
- CoreStatus status = CoreAdminRequest.getCoreStatus(replica.getCoreName(), coreclient);
- return status.getDataDirectory();
- }
+ @Override
+ protected String getConfigSet() {
+ return "cloud-hdfs";
}
}
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
index 7b87571..ce6e48e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoAddReplicasIntegrationTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.solr.cloud.autoscaling;
import static org.apache.solr.common.util.Utils.makeMap;
@@ -41,21 +40,23 @@ import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.TimeSource;
-import org.apache.solr.util.LogLevel;
import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-@LogLevel("org.apache.solr.cloud.autoscaling=DEBUG;org.apache.solr.client.solrj.cloud.autoscaling=DEBUG;org.apache.solr.cloud=DEBUG;org.apache.solr.cloud.Overseer=DEBUG;org.apache.solr.cloud.overseer=DEBUG;")
public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
private static final String COLLECTION1 = "testSimple1";
private static final String COLLECTION2 = "testSimple2";
+ protected String getConfigSet() {
+ return "cloud-minimal";
+ }
+
@Before
public void setupCluster() throws Exception {
configureCluster(3)
- .addConfig("conf", configset("cloud-minimal"))
+ .addConfig("conf", configset(getConfigSet()))
.withSolrXml(TEST_PATH().resolve("solr.xml"))
.configure();
@@ -68,8 +69,11 @@ public class AutoAddReplicasIntegrationTest extends SolrCloudTestCase {
@After
public void tearDown() throws Exception {
- shutdownCluster();
- super.tearDown();
+ try {
+ shutdownCluster();
+ } finally {
+ super.tearDown();
+ }
}
@Test
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/HdfsAutoAddReplicasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/HdfsAutoAddReplicasIntegrationTest.java
index ea7a87a..408287a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/HdfsAutoAddReplicasIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/HdfsAutoAddReplicasIntegrationTest.java
@@ -14,50 +14,48 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.solr.cloud.autoscaling;
import com.carrotsearch.randomizedtesting.annotations.Nightly;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.lucene.util.TimeUnits;
-import org.apache.solr.cloud.MoveReplicaHDFSTest;
import org.apache.solr.cloud.hdfs.HdfsTestUtil;
-import org.apache.solr.common.cloud.ZkConfigManager;
import org.apache.solr.util.BadHdfsThreadsFilter;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-@LuceneTestCase.Slow
+@Slow
+@Nightly
@ThreadLeakFilters(defaultFilters = true, filters = {
- BadHdfsThreadsFilter.class, // hdfs currently leaks thread(s)
- MoveReplicaHDFSTest.ForkJoinThreadsFilter.class
+ BadHdfsThreadsFilter.class // hdfs currently leaks thread(s)
})
-//commented 23-AUG-2018 @LuceneTestCase.BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // added 20-Jul-2018
-@Nightly
@TimeoutSuite(millis = TimeUnits.HOUR)
-@LuceneTestCase.AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-13060")
public class HdfsAutoAddReplicasIntegrationTest extends AutoAddReplicasIntegrationTest {
-
private static MiniDFSCluster dfsCluster;
@BeforeClass
public static void setupClass() throws Exception {
- System.setProperty("solr.hdfs.blockcache.enabled", "false");
+ System.setProperty("solr.hdfs.blockcache.blocksperbank", "512");
+ System.setProperty("tests.hdfs.numdatanodes", "1");
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
-
- ZkConfigManager configManager = new ZkConfigManager(zkClient());
- configManager.uploadConfigDir(configset("cloud-hdfs"), "conf");
-
- System.setProperty("solr.hdfs.home", HdfsTestUtil.getDataDir(dfsCluster, "data"));
}
@AfterClass
public static void teardownClass() throws Exception {
- cluster.shutdown(); // need to close before the MiniDFSCluster
- HdfsTestUtil.teardownClass(dfsCluster);
- dfsCluster = null;
+ try {
+ HdfsTestUtil.teardownClass(dfsCluster);
+ } finally {
+ dfsCluster = null;
+ System.clearProperty("solr.hdfs.blockcache.blocksperbank");
+ System.clearProperty("tests.hdfs.numdatanodes");
+ }
+ }
+
+ @Override
+ protected String getConfigSet() {
+ return "cloud-hdfs";
}
}