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:26:26 UTC

[1/2] lucene-solr:branch_6x: SOLR-10068: Only use global hdfs block cache for this test.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 49739e9d4 -> 6bda24706


SOLR-10068: Only use global hdfs block cache for this test.


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

Branch: refs/heads/branch_6x
Commit: 7a4e834da325ce997b184e649c6b494c4e7dea6f
Parents: 49739e9
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 16:33:38 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:26:03 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/7a4e834d/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 90729da..a7209a0 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import com.carrotsearch.randomizedtesting.annotations.Nightly;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
@@ -87,6 +88,7 @@ public class SharedFSAutoReplicaFailoverTest extends AbstractFullDistribZkTestBa
   public static void hdfsFailoverBeforeClass() throws Exception {
     System.setProperty("solr.hdfs.blockcache.blocksperbank", "512");
     dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath());
+    System.setProperty("solr.hdfs.blockcache.global", "true"); // always use global cache, this test can create a lot of directories
     schemaString = "schema15.xml"; 
   }
   


[2/2] lucene-solr:branch_6x: SOLR-10068: Remove unused import.

Posted by ma...@apache.org.
SOLR-10068: Remove unused import.


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

Branch: refs/heads/branch_6x
Commit: 6bda24706c3daa315532415b50ce60976b9410c2
Parents: 7a4e834
Author: markrmiller <ma...@apache.org>
Authored: Sun Feb 19 18:53:49 2017 -0500
Committer: markrmiller <ma...@apache.org>
Committed: Wed Feb 22 11:26:13 2017 -0500

----------------------------------------------------------------------
 .../test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6bda2470/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 a7209a0..18503e7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import com.carrotsearch.randomizedtesting.annotations.Nightly;
 import org.apache.solr.SolrTestCaseJ4.SuppressSSL;