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/01 16:50:08 UTC

lucene-solr:master: SOLR-10067: use one datanode for this test to reduce resource usage a bit.

Repository: lucene-solr
Updated Branches:
  refs/heads/master bc02b0f70 -> bbc455de1


SOLR-10067: use one datanode for this test to reduce resource usage a bit.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bbc455de
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bbc455de
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bbc455de

Branch: refs/heads/master
Commit: bbc455de195c83d9f807980b510fa46018f33b1b
Parents: bc02b0f
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 1 11:40:28 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 1 11:40:28 2017 -0500

----------------------------------------------------------------------
 .../org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java     | 2 ++
 solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bbc455de/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
index 70eaf90..97be823 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java
@@ -39,12 +39,14 @@ public class HdfsBasicDistributedZkTest extends BasicDistributedZkTest {
   
   @BeforeClass
   public static void setupClass() throws Exception {
+    System.setProperty("tests.hdfs.numdatanodes", "1");
     dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
   }
   
   @AfterClass
   public static void teardownClass() throws Exception {
     HdfsTestUtil.teardownClass(dfsCluster);
+    System.clearProperty("tests.hdfs.numdatanodes");
     dfsCluster = null;
   }
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bbc455de/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
index 12d5651..c6cf44c 100644
--- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
+++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java
@@ -75,7 +75,7 @@ public class HdfsTestUtil {
     
     if (!HA_TESTING_ENABLED) haTesting = false;
     
-    int dataNodes = 2;
+    int dataNodes = Integer.getInteger("tests.hdfs.numdatanodes", 2);
     
     Configuration conf = new Configuration();
     conf.set("dfs.block.access.token.enable", "false");