You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/08/27 08:47:37 UTC
[hbase] branch branch-2.4 updated: HBASE-26227 Forward port
HBASE-26223 test code to branch-2.4+ (#3632)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 1a5b9b7 HBASE-26227 Forward port HBASE-26223 test code to branch-2.4+ (#3632)
1a5b9b7 is described below
commit 1a5b9b7ff65ab06042d0429d824ad16c8941ad68
Author: Pankaj <pa...@apache.org>
AuthorDate: Fri Aug 27 14:12:27 2021 +0530
HBASE-26227 Forward port HBASE-26223 test code to branch-2.4+ (#3632)
Signed-off-by: Duo Zhang <zh...@apache.org>
---
.../org/apache/hadoop/hbase/master/TestSplitWALManager.java | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java
index e1f3188..5cabe0e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import org.apache.hadoop.fs.FileStatus;
+import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -233,11 +234,20 @@ public class TestSplitWALManager {
ProcedureTestingUtility.submitAndWait(masterPE, procedures.get(0));
Assert.assertEquals(0, splitWALManager.getWALsToSplit(testServer, false).size());
+ // Validate the old WAL file archive dir
+ Path walRootDir = hmaster.getMasterFileSystem().getWALRootDir();
+ Path walArchivePath = new Path(walRootDir, HConstants.HREGION_OLDLOGDIR_NAME);
+ FileSystem walFS = hmaster.getMasterFileSystem().getWALFileSystem();
+ int archiveFileCount = walFS.listStatus(walArchivePath).length;
+
procedures = splitWALManager.splitWALs(metaServer, true);
Assert.assertEquals(1, procedures.size());
ProcedureTestingUtility.submitAndWait(masterPE, procedures.get(0));
Assert.assertEquals(0, splitWALManager.getWALsToSplit(metaServer, true).size());
Assert.assertEquals(1, splitWALManager.getWALsToSplit(metaServer, false).size());
+ // There should be archiveFileCount + 1 WALs after SplitWALProcedure finish
+ Assert.assertEquals("Splitted WAL files should be archived", archiveFileCount + 1,
+ walFS.listStatus(walArchivePath).length);
}
@Test