This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 038759e HDFS-16345. Fix test case fail in TestBlockStoragePolicy
(#3696). Contributed by guophilipse.
038759e is described below
commit 038759e444c6dac28ae4b5474b1a43165ad5cd41
Author: GuoPhilipse <[email protected]>
AuthorDate: Wed Dec 8 19:04:54 2021 +0800
HDFS-16345. Fix test case fail in TestBlockStoragePolicy (#3696).
Contributed by guophilipse.
Reviewed-by: Akira Ajisaka <[email protected]>
Signed-off-by: Ayush Saxena <[email protected]>
(cherry picked from commit 25849ff7b7430692d1f40f59e9cb24690cbda216)
---
.../apache/hadoop/hdfs/TestBlockStoragePolicy.java | 106 ++++++++++++---------
1 file changed, 62 insertions(+), 44 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
index ab1f1ab..511838c 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
@@ -1237,23 +1237,29 @@ public class TestBlockStoragePolicy {
DFSTestUtil.formatNameNode(conf);
NameNode namenode = new NameNode(conf);
- final BlockManager bm = namenode.getNamesystem().getBlockManager();
- BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
- NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
- for (DatanodeDescriptor datanode : dataNodes) {
- cluster.add(datanode);
- }
-
- DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 3,
- dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(), false,
- new HashSet<Node>(), 0, policy1, null);
- System.out.println(Arrays.asList(targets));
- Assert.assertEquals(3, targets.length);
- targets = replicator.chooseTarget("/foo", 3,
- dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(), false,
- new HashSet<Node>(), 0, policy2, null);
- System.out.println(Arrays.asList(targets));
- Assert.assertEquals(3, targets.length);
+ try {
+ final BlockManager bm = namenode.getNamesystem().getBlockManager();
+ BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
+ NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
+ for (DatanodeDescriptor datanode : dataNodes) {
+ cluster.add(datanode);
+ }
+
+ DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 3,
+ dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(),
false,
+ new HashSet<Node>(), 0, policy1, null);
+ System.out.println(Arrays.asList(targets));
+ Assert.assertEquals(3, targets.length);
+ targets = replicator.chooseTarget("/foo", 3,
+ dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(),
false,
+ new HashSet<Node>(), 0, policy2, null);
+ System.out.println(Arrays.asList(targets));
+ Assert.assertEquals(3, targets.length);
+ } finally {
+ if (namenode != null) {
+ namenode.stop();
+ }
+ }
}
@Test
@@ -1284,20 +1290,26 @@ public class TestBlockStoragePolicy {
DFSTestUtil.formatNameNode(conf);
NameNode namenode = new NameNode(conf);
- final BlockManager bm = namenode.getNamesystem().getBlockManager();
- BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
- NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
- for (DatanodeDescriptor datanode : dataNodes) {
- cluster.add(datanode);
- }
+ try {
+ final BlockManager bm = namenode.getNamesystem().getBlockManager();
+ BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
+ NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
+ for (DatanodeDescriptor datanode : dataNodes) {
+ cluster.add(datanode);
+ }
- DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 3,
- dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(), false,
- new HashSet<Node>(), 0, policy, null);
- System.out.println(policy.getName() + ": " + Arrays.asList(targets));
- Assert.assertEquals(2, targets.length);
- Assert.assertEquals(StorageType.SSD, targets[0].getStorageType());
- Assert.assertEquals(StorageType.DISK, targets[1].getStorageType());
+ DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 3,
+ dataNodes[0], Collections.<DatanodeStorageInfo>emptyList(),
false,
+ new HashSet<Node>(), 0, policy, null);
+ System.out.println(policy.getName() + ": " + Arrays.asList(targets));
+ Assert.assertEquals(2, targets.length);
+ Assert.assertEquals(StorageType.SSD, targets[0].getStorageType());
+ Assert.assertEquals(StorageType.DISK, targets[1].getStorageType());
+ } finally {
+ if (namenode != null) {
+ namenode.stop();
+ }
+ }
}
/**
@@ -1337,20 +1349,26 @@ public class TestBlockStoragePolicy {
DFSTestUtil.formatNameNode(conf);
NameNode namenode = new NameNode(conf);
- final BlockManager bm = namenode.getNamesystem().getBlockManager();
- BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
- NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
- for (DatanodeDescriptor datanode : dataNodes) {
- cluster.add(datanode);
- }
- // chsenDs are DISK StorageType to simulate not enough SDD Storage
- List<DatanodeStorageInfo> chsenDs = new ArrayList<>();
- chsenDs.add(diskStorages[0]);
- chsenDs.add(diskStorages[1]);
- DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 1,
- null, chsenDs, true,
- new HashSet<Node>(), 0, policy, null);
- Assert.assertEquals(3, targets.length);
+ try {
+ final BlockManager bm = namenode.getNamesystem().getBlockManager();
+ BlockPlacementPolicy replicator = bm.getBlockPlacementPolicy();
+ NetworkTopology cluster = bm.getDatanodeManager().getNetworkTopology();
+ for (DatanodeDescriptor datanode : dataNodes) {
+ cluster.add(datanode);
+ }
+ // chsenDs are DISK StorageType to simulate not enough SDD Storage
+ List<DatanodeStorageInfo> chsenDs = new ArrayList<>();
+ chsenDs.add(diskStorages[0]);
+ chsenDs.add(diskStorages[1]);
+ DatanodeStorageInfo[] targets = replicator.chooseTarget("/foo", 1,
+ null, chsenDs, true,
+ new HashSet<Node>(), 0, policy, null);
+ Assert.assertEquals(3, targets.length);
+ } finally {
+ if (namenode != null) {
+ namenode.stop();
+ }
+ }
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
