ZOOKEEPER-2687: Deadlock while shutting down the Leader server

Leader server enters into deadlock while shutting down itself. Shutdown of the leader server is called from the synchronized block which must be called from outside the synchronized block. For detail pls refer ZOOKEEPER-2380 Author: Mohammad Arshad <[email protected]> Reviewers: Abraham Fine <[email protected]>, Rakesh Radhakrishnan <[email protected]> Closes apache#176 from arshadmohammad/ZOOKEEPER-2687 and squashes the following commits: 7551f5c [Mohammad Arshad] Fixed Rakesh's comments 1e3ed70 [Mohammad Arshad] ZOOKEEPER-2687:Deadlock while shutting down the Leader server.
RokLenarcic · Feb 15, 2017 · fd211a5 · fd211a5
1 parent 15e3f7f
commit fd211a5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/java/main/org/apache/zookeeper/server/quorum/Leader.java b/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
@@ -590,8 +590,9 @@ void lead() throws IOException, InterruptedException {
 
                     // check leader running status
                     if (!this.isRunning()) {
-                        shutdown("Unexpected internal error");
-                        return;
+                        // set shutdown flag
+                        shutdownMessage = "Unexpected internal error";
+                        break;
                     }
 
                     if (!tickSkip && !syncedAckSet.hasAllQuorums()) {