You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2018/11/13 15:40:14 UTC
hbase git commit: HBASE-21457 BackupUtils#getWALFilesOlderThan refers
to wrong FileSystem
Repository: hbase
Updated Branches:
refs/heads/master 64c486127 -> 00acda3c5
HBASE-21457 BackupUtils#getWALFilesOlderThan refers to wrong FileSystem
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/00acda3c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/00acda3c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/00acda3c
Branch: refs/heads/master
Commit: 00acda3c58533b26716f8c0d471a73444186059e
Parents: 64c4861
Author: tedyu <yu...@gmail.com>
Authored: Tue Nov 13 07:40:07 2018 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Tue Nov 13 07:40:07 2018 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/backup/util/BackupUtils.java | 13 +++++++------
.../org/apache/hadoop/hbase/backup/TestBackupBase.java | 5 +++++
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/00acda3c/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
index da11756..af8b954 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/util/BackupUtils.java
@@ -55,6 +55,7 @@ import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;
+import org.apache.hadoop.hbase.util.CommonFSUtils;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.FSTableDescriptors;
import org.apache.hadoop.hbase.util.FSUtils;
@@ -249,9 +250,9 @@ public final class BackupUtils {
*/
public static List<String> getWALFilesOlderThan(final Configuration c,
final HashMap<String, Long> hostTimestampMap) throws IOException {
- Path rootDir = FSUtils.getRootDir(c);
- Path logDir = new Path(rootDir, HConstants.HREGION_LOGDIR_NAME);
- Path oldLogDir = new Path(rootDir, HConstants.HREGION_OLDLOGDIR_NAME);
+ Path walRootDir = CommonFSUtils.getWALRootDir(c);
+ Path logDir = new Path(walRootDir, HConstants.HREGION_LOGDIR_NAME);
+ Path oldLogDir = new Path(walRootDir, HConstants.HREGION_OLDLOGDIR_NAME);
List<String> logFiles = new ArrayList<>();
PathFilter filter = p -> {
@@ -271,9 +272,9 @@ public final class BackupUtils {
return false;
}
};
- FileSystem fs = FileSystem.get(c);
- logFiles = BackupUtils.getFiles(fs, logDir, logFiles, filter);
- logFiles = BackupUtils.getFiles(fs, oldLogDir, logFiles, filter);
+ FileSystem walFs = CommonFSUtils.getWALFileSystem(c);
+ logFiles = BackupUtils.getFiles(walFs, logDir, logFiles, filter);
+ logFiles = BackupUtils.getFiles(walFs, oldLogDir, logFiles, filter);
return logFiles;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/00acda3c/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
index 94c2271..2afdb4f 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
@@ -64,6 +64,7 @@ import org.apache.hadoop.hbase.security.UserProvider;
import org.apache.hadoop.hbase.security.access.SecureTestUtil;
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;
import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.CommonFSUtils;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.wal.WALFactory;
import org.junit.AfterClass;
@@ -304,6 +305,10 @@ public class TestBackupBase {
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
TEST_UTIL2 = new HBaseTestingUtility(conf2);
TEST_UTIL2.setZkCluster(TEST_UTIL.getZkCluster());
+ TEST_UTIL2.startMiniDFSCluster(3);
+ String root2 = TEST_UTIL2.getConfiguration().get("fs.defaultFS");
+ Path p = new Path(new Path(root2), "/tmp/wal");
+ CommonFSUtils.setWALRootDir(TEST_UTIL2.getConfiguration(), p);
TEST_UTIL2.startMiniCluster();
}
conf1 = TEST_UTIL.getConfiguration();