[hbase] branch branch-2 updated: HBASE-22291 Fix recovery of recovered.edits files under root dir

[ap...@apache.org]

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

apurtell 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 aa9f36a  HBASE-22291 Fix recovery of recovered.edits files under root dir
aa9f36a is described below

commit aa9f36ae533cb555c48ed92bdd3872046ed120e8
Author: Zach York <zy...@apache.org>
AuthorDate: Mon Apr 22 16:34:30 2019 -0700

    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 <ap...@apache.org>
---
 .../src/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 10e5ba8..10d2614 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);