From aa9f36ae533cb555c48ed92bdd3872046ed120e8 Mon Sep 17 00:00:00 2001 From: Zach York Date: Mon, 22 Apr 2019 16:34:30 -0700 Subject: [PATCH] HBASE-22291 Fix recovery of recovered.edits files under root dir When trying to recover a recovered.edits file under the root directory, it is possible to get a WrongFS exception. Signed-off-by: Andrew Purtell --- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 10e5ba844ff..10d2614fb93 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 @@ -4682,7 +4682,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);