Skip to content

Commit b16e11f

Browse files
zhtttylzzhtttylz
committed
address review comments.
1 parent 1bbe634 commit b16e11f

16 files changed

+184
-154
lines changed

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,11 @@
3535
import org.apache.hadoop.hdfs.server.protocol.StorageReport;
3636
import org.apache.hadoop.hdfs.util.RwLockMode;
3737
import org.apache.hadoop.test.Whitebox;
38-
import org.junit.jupiter.api.Assertions;
3938

4039
import org.apache.hadoop.util.Preconditions;
4140

41+
import static org.junit.jupiter.api.Assertions.assertNotNull;
42+
4243
public class BlockManagerTestUtil {
4344

4445
static final long SLEEP_TIME = 1000;
@@ -259,7 +260,7 @@ public static void noticeDeadDatanode(NameNode nn, String dnName) {
259260
theDND = dnd;
260261
}
261262
}
262-
Assertions.assertNotNull(theDND, "Could not find DN with name: " + dnName);
263+
assertNotNull(theDND, "Could not find DN with name: " + dnName);
263264

264265
synchronized (hbm) {
265266
DFSTestUtil.setDatanodeDead(theDND);

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestAvailableSpaceBPPBalanceLocal.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
import org.apache.hadoop.hdfs.server.namenode.NameNode;
2929
import org.apache.hadoop.net.NetworkTopology;
3030
import org.apache.hadoop.test.PathUtils;
31-
import org.junit.jupiter.api.Assertions;
3231
import org.junit.jupiter.api.BeforeAll;
3332
import org.junit.jupiter.api.Test;
3433

3534
import java.io.File;
3635
import java.util.ArrayList;
3736

3837
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_AVAILABLE_SPACE_BLOCK_PLACEMENT_POLICY_BALANCE_LOCAL_NODE_KEY;
38+
import static org.junit.jupiter.api.Assertions.assertEquals;
39+
import static org.junit.jupiter.api.Assertions.assertTrue;
3940

4041
/**
4142
* Tests AvailableSpaceBlockPlacementPolicy with balance local.
@@ -137,8 +138,8 @@ public void testChooseLocalNode() {
137138
.chooseTarget(FILE, 1, localNode,
138139
new ArrayList<DatanodeStorageInfo>(), false, null, BLOCK_SIZE,
139140
TestBlockStoragePolicy.DEFAULT_STORAGE_POLICY, null);
140-
Assertions.assertEquals(1, targets.length);
141-
Assertions.assertEquals(localNode, targets[0].getDatanodeDescriptor());
141+
assertEquals(1, targets.length);
142+
assertEquals(localNode, targets[0].getDatanodeDescriptor());
142143
}
143144
}
144145

@@ -154,11 +155,11 @@ public void testChooseLocalNodeWithLocalNodeLoaded() {
154155
new ArrayList<DatanodeStorageInfo>(), false, null, BLOCK_SIZE,
155156
TestBlockStoragePolicy.DEFAULT_STORAGE_POLICY, null);
156157

157-
Assertions.assertEquals(1, targets.length);
158+
assertEquals(1, targets.length);
158159
if (localNode == targets[0].getDatanodeDescriptor()) {
159160
numLocalChosen++;
160161
}
161162
}
162-
Assertions.assertTrue(numLocalChosen < (CHOOSE_TIMES - numLocalChosen));
163+
assertTrue(numLocalChosen < (CHOOSE_TIMES - numLocalChosen));
163164
}
164165
}

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
package org.apache.hadoop.hdfs.server.blockmanagement;
1919

2020
import static org.apache.hadoop.hdfs.server.namenode.INodeId.INVALID_INODE_ID;
21+
import static org.assertj.core.api.Assertions.assertThat;
2122
import static org.junit.jupiter.api.Assertions.assertEquals;
23+
import static org.junit.jupiter.api.Assertions.assertFalse;
2224
import static org.junit.jupiter.api.Assertions.assertNotNull;
2325

2426
import java.util.ArrayList;
2527
import java.util.Iterator;
2628
import java.util.Random;
29+
30+
import static org.junit.jupiter.api.Assertions.assertThrows;
31+
import static org.junit.jupiter.api.Assertions.assertTrue;
2732
import static org.mockito.Mockito.mock;
2833
import static org.mockito.Mockito.when;
29-
import static org.assertj.core.api.Assertions.assertThat;
3034

3135
import org.apache.hadoop.fs.StorageType;
3236
import org.slf4j.Logger;
@@ -36,7 +40,6 @@
3640
import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeStorageInfo.AddBlockResult;
3741
import org.apache.hadoop.hdfs.server.common.GenerationStamp;
3842
import org.apache.hadoop.hdfs.server.protocol.DatanodeStorage;
39-
import org.junit.jupiter.api.Assertions;
4043
import org.junit.jupiter.api.Test;
4144
import org.mockito.Mockito;
4245

@@ -56,9 +59,9 @@ public void testIsDeleted() {
5659
BlockInfo blockInfo = new BlockInfoContiguous((short) 3);
5760
BlockCollection bc = Mockito.mock(BlockCollection.class);
5861
blockInfo.setBlockCollectionId(1000);
59-
Assertions.assertFalse(blockInfo.isDeleted());
62+
assertFalse(blockInfo.isDeleted());
6063
blockInfo.setBlockCollectionId(INVALID_INODE_ID);
61-
Assertions.assertTrue(blockInfo.isDeleted());
64+
assertTrue(blockInfo.isDeleted());
6265
}
6366

6467
@Test
@@ -70,8 +73,8 @@ public void testAddStorage() throws Exception {
7073

7174
boolean added = blockInfo.addStorage(storage, blockInfo);
7275

73-
Assertions.assertTrue(added);
74-
Assertions.assertEquals(storage, blockInfo.getStorageInfo(0));
76+
assertTrue(added);
77+
assertEquals(storage, blockInfo.getStorageInfo(0));
7578
}
7679

7780
@Test
@@ -81,9 +84,9 @@ public void testAddProvidedStorage() throws Exception {
8184
DatanodeStorageInfo providedStorage = mock(DatanodeStorageInfo.class);
8285
when(providedStorage.getStorageType()).thenReturn(StorageType.PROVIDED);
8386
boolean added = blockInfo.addStorage(providedStorage, blockInfo);
84-
Assertions.assertTrue(added);
85-
Assertions.assertEquals(providedStorage, blockInfo.getStorageInfo(0));
86-
Assertions.assertTrue(blockInfo.isProvided());
87+
assertTrue(added);
88+
assertEquals(providedStorage, blockInfo.getStorageInfo(0));
89+
assertTrue(blockInfo.isProvided());
8790
}
8891

8992
@Test
@@ -95,16 +98,16 @@ public void testAddTwoStorageTypes() throws Exception {
9598
when(diskStorage.getDatanodeDescriptor()).thenReturn(mockDN);
9699
when(diskStorage.getStorageType()).thenReturn(StorageType.DISK);
97100
boolean added = blockInfo.addStorage(diskStorage, blockInfo);
98-
Assertions.assertTrue(added);
99-
Assertions.assertEquals(diskStorage, blockInfo.getStorageInfo(0));
100-
Assertions.assertFalse(blockInfo.isProvided());
101+
assertTrue(added);
102+
assertEquals(diskStorage, blockInfo.getStorageInfo(0));
103+
assertFalse(blockInfo.isProvided());
101104

102105
// now add provided storage
103106
DatanodeStorageInfo providedStorage = mock(DatanodeStorageInfo.class);
104107
when(providedStorage.getStorageType()).thenReturn(StorageType.PROVIDED);
105108
added = blockInfo.addStorage(providedStorage, blockInfo);
106-
Assertions.assertTrue(added);
107-
Assertions.assertTrue(blockInfo.isProvided());
109+
assertTrue(added);
110+
assertTrue(blockInfo.isProvided());
108111
}
109112

110113
@Test
@@ -133,7 +136,7 @@ public void testReplaceStorage() throws Exception {
133136

134137
@Test
135138
public void testAddStorageWithDifferentBlock() throws Exception {
136-
Assertions.assertThrows(IllegalArgumentException.class, () -> {
139+
assertThrows(IllegalArgumentException.class, () -> {
137140
BlockInfo blockInfo1 = new BlockInfoContiguous(new Block(1000L), (short) 3);
138141
BlockInfo blockInfo2 = new BlockInfoContiguous(new Block(1001L), (short) 3);
139142
final DatanodeStorageInfo storage = DFSTestUtil.createDatanodeStorageInfo(

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
import org.apache.hadoop.util.GSet;
8888
import org.apache.hadoop.util.LightWeightGSet;
8989
import org.slf4j.event.Level;
90-
import org.junit.jupiter.api.Assertions;
9190
import org.junit.jupiter.api.BeforeEach;
9291
import org.junit.jupiter.api.Test;
9392
import org.junit.jupiter.api.Timeout;
@@ -1403,11 +1402,11 @@ public void testUseDelHint() {
14031402
BlockPlacementPolicyDefault policyDefault =
14041403
(BlockPlacementPolicyDefault) bm.getBlockPlacementPolicy();
14051404
excessTypes.add(StorageType.DEFAULT);
1406-
Assertions.assertTrue(policyDefault.useDelHint(delHint, null, moreThan1Racks,
1405+
assertTrue(policyDefault.useDelHint(delHint, null, moreThan1Racks,
14071406
null, excessTypes));
14081407
excessTypes.remove(0);
14091408
excessTypes.add(StorageType.SSD);
1410-
Assertions.assertFalse(policyDefault.useDelHint(delHint, null, moreThan1Racks,
1409+
assertFalse(policyDefault.useDelHint(delHint, null, moreThan1Racks,
14111410
null, excessTypes));
14121411
}
14131412

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockReportRateLimiting.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_MAX_FULL_BLOCK_REPORT_LEASES;
2222
import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_FULL_BLOCK_REPORT_LEASE_LENGTH_MS;
23+
import static org.junit.jupiter.api.Assertions.assertEquals;
24+
import static org.junit.jupiter.api.Assertions.assertNotNull;
25+
import static org.junit.jupiter.api.Assertions.assertNull;
2326

2427
import org.apache.hadoop.thirdparty.com.google.common.base.Joiner;
2528
import java.util.function.Supplier;
@@ -31,7 +34,6 @@
3134
import org.apache.hadoop.hdfs.protocol.DatanodeID;
3235
import org.apache.hadoop.hdfs.server.protocol.BlockReportContext;
3336
import org.apache.hadoop.test.GenericTestUtils;
34-
import org.junit.jupiter.api.Assertions;
3537
import org.junit.jupiter.api.AfterEach;
3638
import org.junit.jupiter.api.BeforeAll;
3739
import org.junit.jupiter.api.Test;
@@ -157,7 +159,7 @@ public Boolean get() {
157159
}, 25, 50000);
158160
}
159161
cluster.shutdown();
160-
Assertions.assertEquals("", failure.get());
162+
assertEquals("", failure.get());
161163
}
162164

163165
/**
@@ -210,9 +212,9 @@ public void removeBlockReportLease(DatanodeDescriptor node, long leaseId) {
210212
BlockManagerFaultInjector.instance = injector;
211213
cluster.set(new MiniDFSCluster.Builder(conf).numDataNodes(2).build());
212214
cluster.get().waitActive();
213-
Assertions.assertNotNull(cluster.get().stopDataNode(datanodeToStop.get()));
215+
assertNotNull(cluster.get().stopDataNode(datanodeToStop.get()));
214216
gotFbrSem.acquire();
215-
Assertions.assertNull(failure.get());
217+
assertNull(failure.get());
216218
} finally {
217219
if (cluster.get() != null) {
218220
cluster.get().shutdown();

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@
4545
import org.junit.jupiter.api.Test;
4646
import org.slf4j.event.Level;
4747

48-
import static org.junit.jupiter.api.Assertions.*;
48+
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
49+
import static org.junit.jupiter.api.Assertions.assertEquals;
50+
import static org.junit.jupiter.api.Assertions.assertNull;
51+
import static org.junit.jupiter.api.Assertions.assertTrue;
52+
import static org.junit.jupiter.api.Assertions.fail;
4953

5054
public class TestBlocksWithNotEnoughRacks {
5155
public static final Logger LOG =

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeAdminMonitorBase.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
package org.apache.hadoop.hdfs.server.blockmanagement;
2020

21-
import org.junit.jupiter.api.Assertions;
2221
import org.junit.jupiter.api.Test;
2322
import org.slf4j.Logger;
2423
import org.slf4j.LoggerFactory;
@@ -30,6 +29,9 @@
3029

3130
import org.apache.hadoop.hdfs.protocol.DatanodeID;
3231

32+
import static org.junit.jupiter.api.Assertions.assertEquals;
33+
import static org.junit.jupiter.api.Assertions.assertNotNull;
34+
3335
public class TestDatanodeAdminMonitorBase {
3436
public static final Logger LOG = LoggerFactory.getLogger(TestDatanodeAdminMonitorBase.class);
3537

@@ -67,8 +69,8 @@ public void testPendingNodesQueueOrdering() {
6769

6870
for (int i = 0; i < NUM_DATANODE; i++) {
6971
final DatanodeDescriptor dn = pendingNodes.poll();
70-
Assertions.assertNotNull(dn);
71-
Assertions.assertEquals(ORDERED_LAST_UPDATE_TIMES[i], dn.getLastUpdate());
72+
assertNotNull(dn);
73+
assertEquals(ORDERED_LAST_UPDATE_TIMES[i], dn.getLastUpdate());
7274
}
7375
}
7476

@@ -83,9 +85,9 @@ public void testPendingNodesQueueReverseOrdering() {
8385
nodes.stream().sorted(DatanodeAdminMonitorBase.PENDING_NODES_QUEUE_COMPARATOR.reversed())
8486
.collect(Collectors.toList());
8587

86-
Assertions.assertEquals(NUM_DATANODE, reverseOrderNodes.size());
88+
assertEquals(NUM_DATANODE, reverseOrderNodes.size());
8789
for (int i = 0; i < NUM_DATANODE; i++) {
88-
Assertions.assertEquals(REVERSE_ORDER_LAST_UPDATE_TIMES[i],
90+
assertEquals(REVERSE_ORDER_LAST_UPDATE_TIMES[i],
8991
reverseOrderNodes.get(i).getLastUpdate());
9092
}
9193
}

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestDatanodeManager.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,18 @@
6969
import org.apache.hadoop.net.NetworkTopology;
7070
import org.apache.hadoop.util.Shell;
7171
import org.apache.hadoop.test.Whitebox;
72-
import org.junit.jupiter.api.Assertions;
7372
import org.junit.jupiter.api.Test;
7473
import org.junit.jupiter.api.Timeout;
7574
import org.mockito.Mockito;
7675
import org.mockito.ArgumentCaptor;
7776
import org.mockito.ArgumentMatchers;
7877

79-
import static org.junit.jupiter.api.Assertions.*;
8078
import static org.assertj.core.api.Assertions.assertThat;
79+
import static org.junit.jupiter.api.Assertions.assertEquals;
80+
import static org.junit.jupiter.api.Assertions.assertNotNull;
81+
import static org.junit.jupiter.api.Assertions.assertNull;
82+
import static org.junit.jupiter.api.Assertions.assertTrue;
83+
import static org.junit.jupiter.api.Assertions.fail;
8184

8285
public class TestDatanodeManager {
8386

@@ -331,12 +334,12 @@ public void testRejectUnresolvedDatanodes() throws IOException {
331334
try {
332335
//Register this node
333336
dm.registerDatanode(dr);
334-
Assertions.fail("Expected an UnresolvedTopologyException");
337+
fail("Expected an UnresolvedTopologyException");
335338
} catch (UnresolvedTopologyException ute) {
336339
LOG.info("Expected - topology is not resolved and " +
337340
"registration is rejected.");
338341
} catch (Exception e) {
339-
Assertions.fail("Expected an UnresolvedTopologyException");
342+
fail("Expected an UnresolvedTopologyException");
340343
}
341344
}
342345

@@ -956,10 +959,10 @@ public void testRemoveIncludedNode() throws IOException {
956959
// Sort the list so that we know which one is which
957960
Collections.sort(both);
958961

959-
Assertions.assertEquals(2, both.size(), "Incorrect number of hosts reported");
960-
Assertions.assertEquals("127.0.0.1:12345", both.get(0).getInfoAddr(),
962+
assertEquals(2, both.size(), "Incorrect number of hosts reported");
963+
assertEquals("127.0.0.1:12345", both.get(0).getInfoAddr(),
961964
"Unexpected host or host in unexpected position");
962-
Assertions.assertEquals("127.0.0.1:23456", both.get(1).getInfoAddr(),
965+
assertEquals("127.0.0.1:23456", both.get(1).getInfoAddr(),
963966
"Unexpected host or host in unexpected position");
964967

965968
// Remove one node from includes, but do not add it to excludes.
@@ -969,9 +972,9 @@ public void testRemoveIncludedNode() throws IOException {
969972
List<DatanodeDescriptor> onlyOne =
970973
dm.getDatanodeListForReport(HdfsConstants.DatanodeReportType.ALL);
971974

972-
Assertions.assertEquals(1, onlyOne.size(),
975+
assertEquals(1, onlyOne.size(),
973976
"Incorrect number of hosts reported");
974-
Assertions.assertEquals("127.0.0.1:23456", onlyOne.get(0).getInfoAddr(),
977+
assertEquals("127.0.0.1:23456", onlyOne.get(0).getInfoAddr(),
975978
"Unexpected host reported");
976979

977980
// Remove all nodes from includes
@@ -984,11 +987,11 @@ public void testRemoveIncludedNode() throws IOException {
984987
// Sort the list so that we know which one is which
985988
Collections.sort(bothAgain);
986989

987-
Assertions.assertEquals(2, bothAgain.size(),
990+
assertEquals(2, bothAgain.size(),
988991
"Incorrect number of hosts reported");
989-
Assertions.assertEquals("127.0.0.1:12345", bothAgain.get(0).getInfoAddr(),
992+
assertEquals("127.0.0.1:12345", bothAgain.get(0).getInfoAddr(),
990993
"Unexpected host or host in unexpected position");
991-
Assertions.assertEquals("127.0.0.1:23456", bothAgain.get(1).getInfoAddr(),
994+
assertEquals("127.0.0.1:23456", bothAgain.get(1).getInfoAddr(),
992995
"Unexpected host or host in unexpected position");
993996
}
994997

‎hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.apache.hadoop.hdfs.server.protocol.StorageReport;
4747
import org.apache.hadoop.hdfs.util.RwLockMode;
4848
import org.apache.hadoop.test.GenericTestUtils;
49-
import org.junit.jupiter.api.Assertions;
5049
import org.junit.jupiter.api.Test;
5150
import org.junit.jupiter.api.Timeout;
5251
import org.slf4j.event.Level;
@@ -67,6 +66,7 @@
6766
import static org.junit.jupiter.api.Assertions.assertNotNull;
6867
import static org.junit.jupiter.api.Assertions.assertEquals;
6968
import static org.assertj.core.api.Assertions.assertThat;
69+
import static org.junit.jupiter.api.Assertions.fail;
7070

7171
public class TestNameNodePrunesMissingStorages {
7272
static final Logger LOG =
@@ -212,7 +212,7 @@ public void testRemovingStorageDoesNotProduceZombies() throws Exception {
212212
int datanodeToRemoveStorageFromIdx = 0;
213213
while (true) {
214214
if (datanodeToRemoveStorageFromIdx >= cluster.getDataNodes().size()) {
215-
Assertions.fail("failed to find datanode with uuid " + datanodeUuid);
215+
fail("failed to find datanode with uuid " + datanodeUuid);
216216
datanodeToRemoveStorageFrom = null;
217217
break;
218218
}

0 commit comments

Comments
 (0)