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 16:27:24 UTC
[1/2] lucene-solr:branch_6x: SOLR-10067: use one datanode for this
test to reduce resource usage a bit.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 6bda24706 -> d8797ce0e
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/a6d46ebd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a6d46ebd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a6d46ebd
Branch: refs/heads/branch_6x
Commit: a6d46ebdb6394a32ae585f3081f27c548d3ce85b
Parents: 6bda247
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 1 11:40:28 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:26:49 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/a6d46ebd/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/a6d46ebd/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 813476a..f83c1da 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
@@ -77,7 +77,7 @@ public class HdfsTestUtil {
if (!HA_TESTING_ENABLED) haTesting = false;
- int dataNodes = 2;
+ int dataNodes = Integer.getInteger("tests.hdfs.numdatanodes", 2);
// keep netty from using secure random on startup: SOLR-10098
ThreadLocalRandom.setInitialSeedUniquifier(1L);
[2/2] lucene-solr:branch_6x: SOLR-10071: Add @AwaitsFix for now.
Posted by ma...@apache.org.
SOLR-10071: Add @AwaitsFix for now.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d8797ce0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d8797ce0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d8797ce0
Branch: refs/heads/branch_6x
Commit: d8797ce0e63ee5ce6c0d95aab2b4d15b6a87893a
Parents: a6d46eb
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 19:07:26 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:27:17 2017 -0500
----------------------------------------------------------------------
.../solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d8797ce0/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
index 928f4d6..003a843 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.apache.lucene.util.LuceneTestCase.Nightly;
import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -43,8 +43,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Slow
-@SuppressSSL(bugUrl = "https://issues.apache.org/jira/browse/SOLR-5776")
@Nightly
+@AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-10071")
public class LeaderInitiatedRecoveryOnShardRestartTest extends AbstractFullDistribZkTestBase {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());