HBASE-28076 NPE on initialization error in RecoveredReplicationSource…

…Shipper (#5397) Signed-off-by: Viraj Jasani <[email protected]>
apache · Sep 14, 2023 · a9fddff · a9fddff
1 parent 3b34bc2
commit a9fddff
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...a/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java b/...a/org/apache/hadoop/hbase/replication/regionserver/RecoveredReplicationSourceShipper.java
@@ -97,8 +97,10 @@ private void terminate(String reason, Exception cause) {
         "Closing worker for wal group " + this.walGroupId + " because an error occurred: " + reason,
         cause);
     }
-    entryReader.interrupt();
-    Threads.shutdown(entryReader, sleepForRetries);
+    if (entryReader != null) {
+      entryReader.interrupt();
+      Threads.shutdown(entryReader, sleepForRetries);
+    }
     this.interrupt();
     Threads.shutdown(this, sleepForRetries);
     LOG.info("ReplicationSourceWorker {} terminated", this.getName());