You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/05/17 02:25:09 UTC
[2/5] hadoop git commit: HDFS-13559. TestBlockScanner does not close
TestContext properly. Contributed by Anbang Hu.
HDFS-13559. TestBlockScanner does not close TestContext properly. Contributed by Anbang Hu.
(cherry picked from commit 454de3b543c8b00a9ab566c7d1c64d7e4cffee0f)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d1806f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d1806f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d1806f8
Branch: refs/heads/branch-3.1
Commit: 1d1806f862e0929d919c894b267cc86c1fa6feab
Parents: 45dd200
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 19:23:02 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 19:23:33 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hdfs/server/datanode/TestBlockScanner.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d1806f8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
index b627800..1e92a5d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
@@ -125,6 +125,7 @@ public class TestBlockScanner {
if (cluster != null) {
for (int i = 0; i < numNameServices; i++) {
dfs[i].delete(new Path("/test"), true);
+ dfs[i].close();
}
cluster.shutdown();
}
@@ -817,6 +818,7 @@ public class TestBlockScanner {
"in recentSuspectBlocks.", info.goodBlocks.contains(first));
info.blocksScanned = 0;
}
+ ctx.close();
}
/**
@@ -873,6 +875,7 @@ public class TestBlockScanner {
info.blocksScanned = 0;
}
info.sem.release(1);
+ ctx.close();
}
/**
@@ -933,12 +936,12 @@ public class TestBlockScanner {
os.write(bytes);
os.hflush();
os.close();
- fs.close();
// verify that volume scanner does not find bad blocks after append.
waitForRescan(info, numExpectedBlocks);
GenericTestUtils.setLogLevel(DataNode.LOG, Level.INFO);
+ ctx.close();
}
private void waitForRescan(final TestScanResultHandler.Info info,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org