You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/04/26 01:26:44 UTC
[hbase] branch branch-1.3 updated: HBASE-22291 Fix recovery of
recovered.edits files under root dir
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.3 by this push:
new 0153872 HBASE-22291 Fix recovery of recovered.edits files under root dir
0153872 is described below
commit 0153872b3679ac791288c76c06bd73a98d20f0f1
Author: Zach York <zy...@apache.org>
AuthorDate: Mon Apr 22 16:41:08 2019 -0700
HBASE-22291 Fix recovery of recovered.edits files under root dir
Signed-off-by: Andrew Purtell <ap...@apache.org>
---
.../src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 6 +++---
1 file 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 a2cbe84..e350b99 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
@@ -4218,11 +4218,11 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
for (Path edits : files) {
- if (edits == null || !walFS.exists(edits)) {
+ if (edits == null || !fs.exists(edits)) {
LOG.warn("Null or non-existent edits file: " + edits);
continue;
}
- if (isZeroLengthThenDelete(walFS, edits)) {
+ if (isZeroLengthThenDelete(fs, edits)) {
continue;
}
@@ -4252,7 +4252,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
HConstants.HREGION_EDITS_REPLAY_SKIP_ERRORS + " instead.");
}
if (skipErrors) {
- Path p = WALSplitter.moveAsideBadEditsFile(walFS, edits);
+ Path p = WALSplitter.moveAsideBadEditsFile(fs, edits);
LOG.error(HConstants.HREGION_EDITS_REPLAY_SKIP_ERRORS +
"=true so continuing. Renamed " + edits + " as " + p, e);
} else {