Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-27148 Addendum uncomment the shutdown code in TestVerifyReplicationCrossDiffHdfs

This commit is contained in:
Duo Zhang 2022-07-06 14:48:08 +08:00
parent 41972cb460
commit 6f4a0476f2
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationCrossDiffHdfs.java
View File

@ -150,15 +150,15 @@ public class TestVerifyReplicationCrossDiffHdfs {
@AfterClass
public static void tearDownClass() throws Exception {
// if (mapReduceUtil != null) {
// mapReduceUtil.shutdownMiniCluster();
// }
// if (util2 != null) {
// util2.shutdownMiniCluster();
// }
// if (util1 != null) {
// util1.shutdownMiniCluster();
// }
if (mapReduceUtil != null) {
mapReduceUtil.shutdownMiniCluster();
}
if (util2 != null) {
util2.shutdownMiniCluster();
}
if (util1 != null) {
util1.shutdownMiniCluster();
}
}
@Test

3
hbase-server/src/main/java/org/apache/hadoop/hbase/master/SplitWALManager.java
View File

@ -26,7 +26,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
@ -160,7 +159,7 @@ public class SplitWALManager {
/**
* After the worker finished the split WAL task, it will release the worker, and wake up all the
* suspend procedures in the ProcedureEvent
* @param worker worker which is about to release
* @param worker worker which is about to release
*/
public void releaseSplitWALWorker(ServerName worker) {
LOG.debug("Release split WAL worker={}", worker);

1
hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/SnapshotManager.java
View File

@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;