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:29 UTC
[1/4] lucene-solr:branch_6x: SOLR-10064: Lower block cache size to
fit within default limits.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 6323f9ae5 -> 887d39ffd
SOLR-10064: Lower block cache size to fit within default limits.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/141ed719
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/141ed719
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/141ed719
Branch: refs/heads/branch_6x
Commit: 141ed719753fd603beeb7329071b9544110fb7ff
Parents: 3357aab
Author: markrmiller <ma...@apache.org>
Authored: Fri Feb 3 18:12:59 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 12:39:05 2017 -0500
----------------------------------------------------------------------
.../solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/141ed719/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 fc938a1..80aa78d 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,7 +38,7 @@ public class HdfsCollectionsAPIDistributedZkTest extends CollectionsAPIDistribut
@BeforeClass
public static void setupClass() throws Exception {
dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
- System.setProperty("solr.hdfs.blockcache.blocksperbank", "2048");
+ System.setProperty("solr.hdfs.blockcache.blocksperbank", "1024");
ZkConfigManager configManager = new ZkConfigManager(zkClient());
configManager.uploadConfigDir(configset("cloud-hdfs"), "conf");
[3/4] lucene-solr:branch_6x: 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/c9027ade
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c9027ade
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c9027ade
Branch: refs/heads/branch_6x
Commit: c9027adee85b73a368f6697e0799871fe5fe4385
Parents: 141ed71
Author: markrmiller <ma...@apache.org>
Authored: Wed Feb 15 10:20:22 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 12:39:06 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/c9027ade/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");
}
}
[2/4] lucene-solr:branch_6x: 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.
# Conflicts:
# solr/test-framework/src/java/org/apache/solr/cloud/SolrCloudTestCase.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3357aab8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3357aab8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3357aab8
Branch: refs/heads/branch_6x
Commit: 3357aab84221081a5460e62dd41a56c2008cd9a4
Parents: 6323f9a
Author: markrmiller <ma...@apache.org>
Authored: Thu Feb 2 13:21:23 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 12:39:05 2017 -0500
----------------------------------------------------------------------
.../org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3357aab8/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 1cfb53a..5e4b9bb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
@@ -371,7 +371,7 @@ public class CollectionsAPIDistributedZkTest extends SolrCloudTestCase {
cluster.getSolrClient().request(createCmd);
});
- TimeUnit.MILLISECONDS.sleep(200);
+ TimeUnit.MILLISECONDS.sleep(1000);
// in both cases, the collection should have default to the core name
cloudClient.getZkStateReader().forceUpdateCollection("corewithnocollection3");
[4/4] lucene-solr:branch_6x: 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/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");
}