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 2018/09/11 23:04:48 UTC
[1/4] hbase git commit: HBASE-21181 Use the same filesystem for wal
archive directory and wal directory
Repository: hbase
Updated Branches:
refs/heads/branch-2 c0acad92d -> b82a1d65d
refs/heads/branch-2.0 e3cf59e7c -> 2ee755b76
refs/heads/branch-2.1 1c8c7e10f -> 2c19b0427
refs/heads/master c372175da -> 7ecb435d9
HBASE-21181 Use the same filesystem for wal archive directory and wal directory
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7ecb435d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7ecb435d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7ecb435d
Branch: refs/heads/master
Commit: 7ecb435d9dde3e8cfcf28c7ba2a664cb8c9f57bd
Parents: c372175
Author: TAK LON WU <wu...@amazon.com>
Authored: Fri Sep 7 11:55:02 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 11 15:32:51 2018 -0700
----------------------------------------------------------------------
.../procedure2/store/wal/WALProcedureStore.java | 8 +++++++-
.../procedure2/store/wal/TestWALProcedureStore.java | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7ecb435d/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 8e7b2cc..7d5d6d2 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -200,7 +200,8 @@ public class WALProcedureStore extends ProcedureStoreBase {
throws IOException {
this(conf,
new Path(CommonFSUtils.getWALRootDir(conf), MASTER_PROCEDURE_LOGDIR),
- new Path(CommonFSUtils.getRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME), leaseRecovery);
+ new Path(CommonFSUtils.getWALRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME),
+ leaseRecovery);
}
@VisibleForTesting
@@ -1189,6 +1190,11 @@ public class WALProcedureStore extends ProcedureStoreBase {
return this.walDir;
}
+ @VisibleForTesting
+ Path getWalArchiveDir() {
+ return this.walArchiveDir;
+ }
+
public FileSystem getFileSystem() {
return this.fs;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/7ecb435d/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 64cf211..b1bd254 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -898,6 +898,22 @@ public class TestWALProcedureStore {
assertEquals("WALs=" + procStore.getActiveLogs(), 1, procStore.getActiveLogs().size());
}
+ @Test
+ public void testWALDirAndWALArchiveDir() throws IOException {
+ Configuration conf = htu.getConfiguration();
+ procStore = createWALProcedureStore(conf);
+ assertEquals(procStore.getFileSystem(), procStore.getWalArchiveDir().getFileSystem(conf));
+ }
+
+ private WALProcedureStore createWALProcedureStore(Configuration conf) throws IOException {
+ return new WALProcedureStore(conf, new WALProcedureStore.LeaseRecovery() {
+ @Override
+ public void recoverFileLease(FileSystem fs, Path path) throws IOException {
+ // no-op
+ }
+ });
+ }
+
private LoadCounter restartAndAssert(long maxProcId, long runnableCount,
int completedCount, int corruptedCount) throws Exception {
return ProcedureTestingUtility.storeRestartAndAssert(procStore, maxProcId,
[4/4] hbase git commit: HBASE-21181 Use the same filesystem for wal
archive directory and wal directory
Posted by ap...@apache.org.
HBASE-21181 Use the same filesystem for wal archive directory and wal directory
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b82a1d65
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b82a1d65
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b82a1d65
Branch: refs/heads/branch-2
Commit: b82a1d65dd5e79fa7a6407893157d13fd9b9089f
Parents: c0acad9
Author: TAK LON WU <wu...@amazon.com>
Authored: Fri Sep 7 11:55:02 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 11 15:50:51 2018 -0700
----------------------------------------------------------------------
.../procedure2/store/wal/WALProcedureStore.java | 8 +++++++-
.../procedure2/store/wal/TestWALProcedureStore.java | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b82a1d65/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 70c71f5..951f05e 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -200,7 +200,8 @@ public class WALProcedureStore extends ProcedureStoreBase {
throws IOException {
this(conf,
new Path(CommonFSUtils.getWALRootDir(conf), MASTER_PROCEDURE_LOGDIR),
- new Path(CommonFSUtils.getRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME), leaseRecovery);
+ new Path(CommonFSUtils.getWALRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME),
+ leaseRecovery);
}
@VisibleForTesting
@@ -1189,6 +1190,11 @@ public class WALProcedureStore extends ProcedureStoreBase {
return this.walDir;
}
+ @VisibleForTesting
+ Path getWalArchiveDir() {
+ return this.walArchiveDir;
+ }
+
public FileSystem getFileSystem() {
return this.fs;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/b82a1d65/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 64cf211..b1bd254 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -898,6 +898,22 @@ public class TestWALProcedureStore {
assertEquals("WALs=" + procStore.getActiveLogs(), 1, procStore.getActiveLogs().size());
}
+ @Test
+ public void testWALDirAndWALArchiveDir() throws IOException {
+ Configuration conf = htu.getConfiguration();
+ procStore = createWALProcedureStore(conf);
+ assertEquals(procStore.getFileSystem(), procStore.getWalArchiveDir().getFileSystem(conf));
+ }
+
+ private WALProcedureStore createWALProcedureStore(Configuration conf) throws IOException {
+ return new WALProcedureStore(conf, new WALProcedureStore.LeaseRecovery() {
+ @Override
+ public void recoverFileLease(FileSystem fs, Path path) throws IOException {
+ // no-op
+ }
+ });
+ }
+
private LoadCounter restartAndAssert(long maxProcId, long runnableCount,
int completedCount, int corruptedCount) throws Exception {
return ProcedureTestingUtility.storeRestartAndAssert(procStore, maxProcId,
[2/4] hbase git commit: HBASE-21181 Use the same filesystem for wal
archive directory and wal directory
Posted by ap...@apache.org.
HBASE-21181 Use the same filesystem for wal archive directory and wal directory
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2c19b042
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2c19b042
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2c19b042
Branch: refs/heads/branch-2.1
Commit: 2c19b042745fd3de4c1600d1039282e28196873b
Parents: 1c8c7e1
Author: TAK LON WU <wu...@amazon.com>
Authored: Fri Sep 7 11:55:02 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 11 15:50:41 2018 -0700
----------------------------------------------------------------------
.../procedure2/store/wal/WALProcedureStore.java | 8 +++++++-
.../procedure2/store/wal/TestWALProcedureStore.java | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2c19b042/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index 70c71f5..951f05e 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -200,7 +200,8 @@ public class WALProcedureStore extends ProcedureStoreBase {
throws IOException {
this(conf,
new Path(CommonFSUtils.getWALRootDir(conf), MASTER_PROCEDURE_LOGDIR),
- new Path(CommonFSUtils.getRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME), leaseRecovery);
+ new Path(CommonFSUtils.getWALRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME),
+ leaseRecovery);
}
@VisibleForTesting
@@ -1189,6 +1190,11 @@ public class WALProcedureStore extends ProcedureStoreBase {
return this.walDir;
}
+ @VisibleForTesting
+ Path getWalArchiveDir() {
+ return this.walArchiveDir;
+ }
+
public FileSystem getFileSystem() {
return this.fs;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/2c19b042/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 64cf211..b1bd254 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -898,6 +898,22 @@ public class TestWALProcedureStore {
assertEquals("WALs=" + procStore.getActiveLogs(), 1, procStore.getActiveLogs().size());
}
+ @Test
+ public void testWALDirAndWALArchiveDir() throws IOException {
+ Configuration conf = htu.getConfiguration();
+ procStore = createWALProcedureStore(conf);
+ assertEquals(procStore.getFileSystem(), procStore.getWalArchiveDir().getFileSystem(conf));
+ }
+
+ private WALProcedureStore createWALProcedureStore(Configuration conf) throws IOException {
+ return new WALProcedureStore(conf, new WALProcedureStore.LeaseRecovery() {
+ @Override
+ public void recoverFileLease(FileSystem fs, Path path) throws IOException {
+ // no-op
+ }
+ });
+ }
+
private LoadCounter restartAndAssert(long maxProcId, long runnableCount,
int completedCount, int corruptedCount) throws Exception {
return ProcedureTestingUtility.storeRestartAndAssert(procStore, maxProcId,
[3/4] hbase git commit: HBASE-21181 Use the same filesystem for wal
archive directory and wal directory
Posted by ap...@apache.org.
HBASE-21181 Use the same filesystem for wal archive directory and wal directory
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2ee755b7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ee755b7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ee755b7
Branch: refs/heads/branch-2.0
Commit: 2ee755b760b0c14c772f4936cbff02b03a6c9745
Parents: e3cf59e
Author: TAK LON WU <wu...@amazon.com>
Authored: Fri Sep 7 11:55:02 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Sep 11 15:50:48 2018 -0700
----------------------------------------------------------------------
.../procedure2/store/wal/WALProcedureStore.java | 8 +++++++-
.../procedure2/store/wal/TestWALProcedureStore.java | 16 ++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ee755b7/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
index cc3eea3..7be8da1 100644
--- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
+++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.java
@@ -196,7 +196,8 @@ public class WALProcedureStore extends ProcedureStoreBase {
throws IOException {
this(conf,
new Path(CommonFSUtils.getWALRootDir(conf), MASTER_PROCEDURE_LOGDIR),
- new Path(CommonFSUtils.getRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME), leaseRecovery);
+ new Path(CommonFSUtils.getWALRootDir(conf), HConstants.HREGION_OLDLOGDIR_NAME),
+ leaseRecovery);
}
@VisibleForTesting
@@ -1184,6 +1185,11 @@ public class WALProcedureStore extends ProcedureStoreBase {
return this.walDir;
}
+ @VisibleForTesting
+ Path getWalArchiveDir() {
+ return this.walArchiveDir;
+ }
+
public FileSystem getFileSystem() {
return this.fs;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/2ee755b7/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
----------------------------------------------------------------------
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index 64cf211..b1bd254 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -898,6 +898,22 @@ public class TestWALProcedureStore {
assertEquals("WALs=" + procStore.getActiveLogs(), 1, procStore.getActiveLogs().size());
}
+ @Test
+ public void testWALDirAndWALArchiveDir() throws IOException {
+ Configuration conf = htu.getConfiguration();
+ procStore = createWALProcedureStore(conf);
+ assertEquals(procStore.getFileSystem(), procStore.getWalArchiveDir().getFileSystem(conf));
+ }
+
+ private WALProcedureStore createWALProcedureStore(Configuration conf) throws IOException {
+ return new WALProcedureStore(conf, new WALProcedureStore.LeaseRecovery() {
+ @Override
+ public void recoverFileLease(FileSystem fs, Path path) throws IOException {
+ // no-op
+ }
+ });
+ }
+
private LoadCounter restartAndAssert(long maxProcId, long runnableCount,
int completedCount, int corruptedCount) throws Exception {
return ProcedureTestingUtility.storeRestartAndAssert(procStore, maxProcId,