You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2017/02/22 17:39:32 UTC
[4/4] lucene-solr:branch_6x: SOLR-10064: The Nightly test
HdfsCollectionsAPIDistributedZkTest appears to be too fragile.
SOLR-10064: The Nightly test HdfsCollectionsAPIDistributedZkTest appears to be too fragile.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/887d39ff
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/887d39ff
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/887d39ff
Branch: refs/heads/branch_6x
Commit: 887d39ffd8ffbad5f04dafd41a86b55a79468502
Parents: c9027ad
Author: markrmiller <ma...@apache.org>
Authored: Fri Feb 17 11:03:08 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 12:39:06 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java | 2 +-
.../solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/887d39ff/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
index 5e4b9bb..0cf8010 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
@@ -481,7 +481,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
public void testCollectionsAPI() throws Exception {
// create new collections rapid fire
- int cnt = random().nextInt(TEST_NIGHTLY ? 6 : 1) + 1;
+ int cnt = random().nextInt(TEST_NIGHTLY ? 3 : 1) + 1;
CollectionAdminRequest.Create[] createRequests = new CollectionAdminRequest.Create[cnt];
for (int i = 0; i < cnt; i++) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/887d39ff/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
index c9a9a0f..1b830ad 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java
@@ -38,6 +38,8 @@ public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistribut
@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());
@@ -53,6 +55,7 @@ public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistribut
HdfsTestUtil.teardownClass(dfsCluster);
dfsCluster = null;
System.clearProperty("solr.hdfs.blockcache.blocksperbank");
+ System.clearProperty("tests.hdfs.numdatanodes");
System.clearProperty("solr.hdfs.home");
}