Skip to content

Commit 30bb72b

Browse files
pankaj72981Duo Zhang
authored andcommitted
HBASE-26227 Forward port HBASE-26223 test code to branch-2.4+ (#3632)
Signed-off-by: Duo Zhang <zhangduo@apache.org>
1 parent f4edf59 commit 30bb72b

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitWALManager.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.List;
2626
import java.util.concurrent.CountDownLatch;
2727
import org.apache.hadoop.fs.FileStatus;
28+
import org.apache.hadoop.fs.FileSystem;
2829
import org.apache.hadoop.fs.Path;
2930
import org.apache.hadoop.hbase.HBaseClassTestRule;
3031
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -233,11 +234,20 @@ private void splitLogsTestHelper(HBaseTestingUtility testUtil) throws Exception
233234
ProcedureTestingUtility.submitAndWait(masterPE, procedures.get(0));
234235
Assert.assertEquals(0, splitWALManager.getWALsToSplit(testServer, false).size());
235236

237+
// Validate the old WAL file archive dir
238+
Path walRootDir = hmaster.getMasterFileSystem().getWALRootDir();
239+
Path walArchivePath = new Path(walRootDir, HConstants.HREGION_OLDLOGDIR_NAME);
240+
FileSystem walFS = hmaster.getMasterFileSystem().getWALFileSystem();
241+
int archiveFileCount = walFS.listStatus(walArchivePath).length;
242+
236243
procedures = splitWALManager.splitWALs(metaServer, true);
237244
Assert.assertEquals(1, procedures.size());
238245
ProcedureTestingUtility.submitAndWait(masterPE, procedures.get(0));
239246
Assert.assertEquals(0, splitWALManager.getWALsToSplit(metaServer, true).size());
240247
Assert.assertEquals(1, splitWALManager.getWALsToSplit(metaServer, false).size());
248+
// There should be archiveFileCount + 1 WALs after SplitWALProcedure finish
249+
Assert.assertEquals("Splitted WAL files should be archived", archiveFileCount + 1,
250+
walFS.listStatus(walArchivePath).length);
241251
}
242252

243253
@Test

0 commit comments

Comments
 (0)