[lucene-solr] branch reference_impl updated: @364 Proper session timeout.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/reference_impl by this push:
     new 6e7fe47  @364 Proper session timeout.
6e7fe47 is described below

commit 6e7fe47b07e360463294b3e72c422bb59f1f47b7
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sun Jul 26 17:01:59 2020 -0500

    @364 Proper session timeout.
---
 solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 2 +-
 solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 33c095a..9a2da63 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -284,7 +284,7 @@ public class SolrDispatchFilter extends BaseSolrFilter {
   protected synchronized CoreContainer createCoreContainer(Path solrHome, Properties extraProperties) {
     String zkHost = System.getProperty("zkHost");
     if (!StringUtils.isEmpty(zkHost)) {
-      int startUpZkTimeOut = Integer.getInteger("waitForZk", 10); // nocommit - zk settings
+      int startUpZkTimeOut = Integer.getInteger("waitForZk", 30); // nocommit - zk settings
       if (zkClient != null) {
         throw new IllegalStateException();
       }
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java
index 78f3593..ed0e7b7 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkFailoverTest.java
@@ -33,7 +33,7 @@ public class ZkFailoverTest extends SolrCloudTestCase {
 
   @BeforeClass
   public static void setupCluster() throws Exception {
-    System.setProperty("waitForZk", "60");
+    System.setProperty("waitForZk", "30");
     useFactory("solr.StandardDirectoryFactory");
     configureCluster(2)
         .addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-dynamic").resolve("conf"))