You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2025/08/29 02:33:02 UTC
(hbase) branch branch-2 updated: HBASE-29532 Fix the potential NPE issue when the specific recover edit path set (#7231)
This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 b1da81ac770 HBASE-29532 Fix the potential NPE issue when the specific recover edit path set (#7231)
b1da81ac770 is described below
commit b1da81ac770adc37c960731d9cd2b9e06d699189
Author: alexdongli0829 <40...@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 <do...@amazon.com>
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 3b4c023e0b4dabdf1c83c7a1e9e60c346062d180)
---
.../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 4 ++--
1 file changed, 2 insertions(+), 2 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 d9dbc950a0f..0113d439dc0 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
@@ -5596,7 +5596,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
} catch (EOFException eof) {
if (!conf.getBoolean(RECOVERED_EDITS_IGNORE_EOF, false)) {
- 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;
@@ -5610,7 +5610,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);