[lucene-solr] branch reference_impl updated: @275 The high speed train has no mercy.

[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 d61a671  @275 The high speed train has no mercy.
d61a671 is described below

commit d61a67182328c5daacd1e201e1a634d6e34c0a46
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 21 18:22:35 2020 -0500

    @275 The high speed train has no mercy.
---
 solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java    | 8 +++++++-
 solr/core/src/java/org/apache/solr/cloud/ZkController.java        | 4 ++--
 .../org/apache/solr/security/JWTVerificationkeyResolverTest.java  | 2 ++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 6da21a5..8aa00d5 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -927,7 +927,13 @@ public class RecoveryStrategy implements Runnable, Closeable {
     } else {
       log.info("Replaying buffered documents.");
       // wait for replay
-      RecoveryInfo report = future.get();
+      RecoveryInfo report;
+      try {
+        report = future.get();
+      } catch (InterruptedException e) {
+        ParWork.propegateInterrupt(e);
+        throw new InterruptedException();
+      }
       if (report.failed) {
         SolrException.log(log, "Replay failed");
         throw new SolrException(ErrorCode.SERVER_ERROR, "Replay failed");
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 6c7ee25..d81e482 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -440,9 +440,9 @@ public class ZkController implements Closeable {
 
       @Override
       public void command() throws SessionExpiredException {
-        if (cc.isShutDown() || !zkClient.isConnected()) return;
-        log.info("ZooKeeper session re-connected ... refreshing core states after session expiration.");
         synchronized (initLock) {
+          if (cc.isShutDown() || !zkClient.isConnected()) return;
+          log.info("ZooKeeper session re-connected ... refreshing core states after session expiration.");
           try {
             // recreate our watchers first so that they exist even on any problems below
             zkStateReader.createClusterStateWatchersAndUpdate();
diff --git a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
index 4b88787..d6c2fd7 100644
--- a/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
+++ b/solr/core/src/test/org/apache/solr/security/JWTVerificationkeyResolverTest.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.lucene.util.LuceneTestCase;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.security.JWTIssuerConfig.HttpsJwksFactory;
 import org.jose4j.jwk.HttpsJwks;
@@ -46,6 +47,7 @@ import static org.mockito.Mockito.when;
 /**
  * Tests the multi jwks resolver that can fetch keys from multiple JWKs
  */
+@LuceneTestCase.Nightly // JWT stuff is slow
 public class JWTVerificationkeyResolverTest extends SolrTestCaseJ4 {
   private JWTVerificationkeyResolver resolver;