HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should shutdown cluster (vinayakumarb)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/772d1fb0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/772d1fb0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/772d1fb0 Branch: refs/heads/HDFS-6581 Commit: 772d1fb01e65ca42ef4365d2a9307da6c2448c3f Parents: 6104520 Author: Vinayakumar B <[email protected]> Authored: Fri Sep 5 10:25:09 2014 +0530 Committer: Vinayakumar B <[email protected]> Committed: Fri Sep 5 10:25:09 2014 +0530 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hadoop/hdfs/TestBlocksScheduledCounter.java | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/772d1fb0/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8964d2d..6a4cf28 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -697,6 +697,9 @@ Release 2.6.0 - UNRELEASED HDFS-6905. fs-encryption merge triggered release audit failures. (clamb via tucu) + HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should + shutdown cluster (vinayakumarb) + Release 2.5.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/772d1fb0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java index 59dbb30..a66cd1d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java @@ -27,6 +27,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeManager; +import org.junit.After; import org.junit.Test; /** @@ -35,14 +36,25 @@ import org.junit.Test; * scheduled to a datanode. */ public class TestBlocksScheduledCounter { + MiniDFSCluster cluster = null; + FileSystem fs = null; + + @After + public void tearDown() throws IOException { + if (fs != null) { + fs.close(); + } + if(cluster!=null){ + cluster.shutdown(); + } + } @Test public void testBlocksScheduledCounter() throws IOException { - MiniDFSCluster cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()) - .build(); + cluster = new MiniDFSCluster.Builder(new HdfsConfiguration()).build(); cluster.waitActive(); - FileSystem fs = cluster.getFileSystem(); + fs = cluster.getFileSystem(); //open a file an write a few bytes: FSDataOutputStream out = fs.create(new Path("/testBlockScheduledCounter"));
