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/15 15:20:31 UTC
[1/2] lucene-solr:master: SOLR-10068: The Nightly test
SharedFSAutoReplicaFailoverTest appears to be too fragile.
Repository: lucene-solr
Updated Branches:
refs/heads/master b71a667d7 -> 9275c2f87
SOLR-10068: The Nightly test SharedFSAutoReplicaFailoverTest 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/b760f954
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b760f954
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b760f954
Branch: refs/heads/master
Commit: b760f95486f533395ca0d89a54b4590fa85eb591
Parents: b71a667
Author: markrmiller <ma...@apache.org>
Authored: Tue Feb 14 23:21:21 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 15 10:20:00 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b760f954/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
index d87e82f..90729da 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
@@ -85,6 +85,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
@BeforeClass
public static void hdfsFailoverBeforeClass() throws Exception {
+ System.setProperty("solr.hdfs.blockcache.blocksperbank", "512");
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
schemaString = "schema15.xml";
}
@@ -92,6 +93,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
@AfterClass
public static void hdfsFailoverAfterClass() throws Exception {
HdfsTestUtil.teardownClass(dfsCluster);
+ System.clearProperty("solr.hdfs.blockcache.blocksperbank");
dfsCluster = null;
}
[2/2] lucene-solr:master: SOLR-10064: The Nightly test
HdfsCollectionsAPIDistributedZkTest appears to be too fragile.
Posted by ma...@apache.org.
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/9275c2f8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9275c2f8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9275c2f8
Branch: refs/heads/master
Commit: 9275c2f87ff4fb6909bc748c59ba673cbc599c2c
Parents: b760f95
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 15 10:20:22 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 15 10:20:22 2017 -0500
----------------------------------------------------------------------
.../solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9275c2f8/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 80aa78d..c9a9a0f 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
@@ -37,8 +37,8 @@ public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistribut
@BeforeClass
public static void setupClass() throws Exception {
+ System.setProperty("solr.hdfs.blockcache.blocksperbank", "512");
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
- System.setProperty("solr.hdfs.blockcache.blocksperbank", "1024");
ZkConfigManager configManager = new ZkConfigManager(zkClient());
configManager.uploadConfigDir(configset("cloud-hdfs"), "conf");
@@ -52,6 +52,8 @@ public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistribut
cluster.shutdown(); // need to close before the MiniDFSCluster
HdfsTestUtil.teardownClass(dfsCluster);
dfsCluster = null;
+ System.clearProperty("solr.hdfs.blockcache.blocksperbank");
+ System.clearProperty("solr.hdfs.home");
}
}