[hbase] branch branch-2 updated: HBASE-27810. Check if the executor has already been shut down before submitting new job (#5207)

[me...@apache.org]

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

meszibalu pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2 by this push:
     new de3d0aefe1c HBASE-27810. Check if the executor has already been shut down before submitting new job (#5207)
de3d0aefe1c is described below

commit de3d0aefe1ced2156631b41ef648aad0020f01f6
Author: Andor Molnár <an...@cloudera.com>
AuthorDate: Fri Apr 28 16:46:22 2023 +0200

    HBASE-27810. Check if the executor has already been shut down before submitting new job (#5207)
    
    Signed-off-by: Wellington Chevreuil <wc...@apache.org>
    Signed-off-by: Duo Zhang <zh...@apache.org>
    (cherry picked from commit a6e89bf624d70a7f220f961e4f8808374400d774)
---
 .../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
index f499d0f9487..8f0cfc811b8 100644
--- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
+++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKWatcher.java
@@ -604,7 +604,9 @@ public class ZKWatcher implements Watcher, Abortable, Closeable {
     LOG.debug(prefix("Received ZooKeeper Event, " + "type=" + event.getType() + ", " + "state="
       + event.getState() + ", " + "path=" + event.getPath()));
     final String spanName = ZKWatcher.class.getSimpleName() + "-" + identifier;
-    zkEventProcessor.execute(TraceUtil.tracedRunnable(() -> processEvent(event), spanName));
+    if (!zkEventProcessor.isShutdown()) {
+      zkEventProcessor.execute(TraceUtil.tracedRunnable(() -> processEvent(event), spanName));
+    }
   }
 
   // Connection management