(hbase) branch branch-2.5 updated: HBASE-29532 Fix the potential NPE issue when the specific recover edit path set (#7231)

[zhangduo]

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

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


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new d77dfc330e6 HBASE-29532 Fix the potential NPE issue when the specific 
recover edit path set (#7231)
d77dfc330e6 is described below

commit d77dfc330e6d8dc419fa05a6446cc8e98d476d3f
Author: alexdongli0829 <40448063+alexdongli0...@users.noreply.github.com>
AuthorDate: Fri Aug 29 11:43:09 2025 +1000

    HBASE-29532 Fix the potential NPE issue when the specific recover edit path 
set (#7231)
    
    Co-authored-by: Dong Li <dong...@amazon.com>
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit 3b4c023e0b4dabdf1c83c7a1e9e60c346062d180)
---
 .../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java   | 4 ++--
 .../src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index ca0e7db716d..39d06e4c75c 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -5485,7 +5485,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
           coprocessorHost.postReplayWALs(this.getRegionInfo(), edits);
         }
       } catch (EOFException eof) {
-        Path p = WALSplitUtil.moveAsideBadEditsFile(walFS, edits);
+        Path p = WALSplitUtil.moveAsideBadEditsFile(fs, edits);
         msg = "EnLongAddered EOF. Most likely due to Master failure during "
           + "wal splitting, so we have this data in another edit. Continuing, 
but renaming " + edits
           + " as " + p + " for region " + this;
@@ -5495,7 +5495,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
         // If the IOE resulted from bad file format,
         // then this problem is idempotent and retrying won't help
         if (ioe.getCause() instanceof ParseException) {
-          Path p = WALSplitUtil.moveAsideBadEditsFile(walFS, edits);
+          Path p = WALSplitUtil.moveAsideBadEditsFile(fs, edits);
           msg =
             "File corruption enLongAddered!  " + "Continuing, but renaming " + 
edits + " as " + p;
           LOG.warn(msg, ioe);
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java
index 73f41604361..68cfca3c8b6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/wal/TestWALSplit.java
@@ -61,9 +61,9 @@ import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.coordination.SplitLogWorkerCoordination;
 import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.wal.FaultyProtobufLogReader;
 import org.apache.hadoop.hbase.regionserver.LastSequenceId;
 import org.apache.hadoop.hbase.regionserver.RegionServerServices;
+import org.apache.hadoop.hbase.regionserver.wal.FaultyProtobufLogReader;
 import org.apache.hadoop.hbase.regionserver.wal.InstrumentedLogWriter;
 import org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader;
 import org.apache.hadoop.hbase.security.User;