lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject lucene-solr:branch_6x: SOLR-10098: Keep netty from using secure random on startup in tests.
Date Wed, 22 Feb 2017 16:22:52 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/branch_6x 2638f1a12 -> bc91e86cd


SOLR-10098: Keep netty from using secure random on startup in tests.

# Conflicts:
#	solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.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/bc91e86c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bc91e86c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bc91e86c

Branch: refs/heads/branch_6x
Commit: bc91e86cd8469a875f975ccc59485eead6d2ae24
Parents: 2638f1a
Author: markrmiller <markrmiller@apache.org>
Authored: Wed Feb 8 13:43:07 2017 -0500
Committer: markrmiller <markrmiller@apache.org>
Committed: Wed Feb 22 11:22:44 2017 -0500

----------------------------------------------------------------------
 solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bc91e86c/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..813476a 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
@@ -42,6 +42,8 @@ import org.apache.solr.util.HdfsUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.netty.util.internal.ThreadLocalRandom;
+
 public class HdfsTestUtil {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   
@@ -77,6 +79,9 @@ public class HdfsTestUtil {
     
     int dataNodes = 2;
     
+    // keep netty from using secure random on startup: SOLR-10098
+    ThreadLocalRandom.setInitialSeedUniquifier(1L);
+    
     Configuration conf = new Configuration();
     conf.set("dfs.block.access.token.enable", "false");
     conf.set("dfs.permissions.enabled", "false");


Mime
View raw message