HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized reference. (Contributed by Wei-Chiu Chuang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f623fb8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f623fb8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f623fb8 Branch: refs/heads/yarn-2877 Commit: 2f623fb8cc3dc49221216c3b46b6f51144811904 Parents: db37f02 Author: Arpit Agarwal <a...@apache.org> Authored: Thu Dec 17 13:43:27 2015 -0800 Committer: Arpit Agarwal <a...@apache.org> Committed: Thu Dec 17 13:57:08 2015 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../bkjournal/TestBootstrapStandbyWithBKJM.java | 1 + .../org/apache/hadoop/TestRefreshCallQueue.java | 1 + .../java/org/apache/hadoop/cli/TestAclCLI.java | 2 ++ .../org/apache/hadoop/cli/TestCacheAdminCLI.java | 2 ++ .../org/apache/hadoop/cli/TestCryptoAdminCLI.java | 2 ++ .../java/org/apache/hadoop/cli/TestDeleteCLI.java | 2 ++ .../apache/hadoop/cli/TestErasureCodingCLI.java | 2 ++ .../java/org/apache/hadoop/cli/TestHDFSCLI.java | 2 ++ .../java/org/apache/hadoop/cli/TestXAttrCLI.java | 2 ++ .../apache/hadoop/fs/TestFcHdfsCreateMkdir.java | 4 +++- .../org/apache/hadoop/fs/TestFcHdfsPermission.java | 4 +++- .../org/apache/hadoop/fs/TestFcHdfsSetUMask.java | 4 +++- .../java/org/apache/hadoop/fs/TestSymlinkHdfs.java | 4 +++- .../hadoop/fs/contract/hdfs/HDFSContract.java | 1 + .../hadoop/fs/shell/TestHdfsTextCommand.java | 2 ++ .../hadoop/fs/viewfs/TestViewFileSystemHdfs.java | 4 +++- .../fs/viewfs/TestViewFileSystemWithAcls.java | 4 +++- .../fs/viewfs/TestViewFileSystemWithXAttrs.java | 4 +++- .../hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java | 4 +++- .../apache/hadoop/fs/viewfs/TestViewFsHdfs.java | 4 +++- .../hadoop/fs/viewfs/TestViewFsWithAcls.java | 4 +++- .../hadoop/fs/viewfs/TestViewFsWithXAttrs.java | 4 +++- .../org/apache/hadoop/hdfs/FileAppendTest4.java | 4 +++- .../org/apache/hadoop/hdfs/TestAbandonBlock.java | 10 ++++++++-- .../hadoop/hdfs/TestBlocksScheduledCounter.java | 2 ++ .../hadoop/hdfs/TestClientReportBadBlock.java | 10 ++++++++-- .../hadoop/hdfs/TestDFSClientExcludedNodes.java | 1 + .../apache/hadoop/hdfs/TestDFSClientFailover.java | 1 + .../hadoop/hdfs/TestDFSClientSocketSize.java | 1 + .../org/apache/hadoop/hdfs/TestDFSFinalize.java | 5 ++++- .../apache/hadoop/hdfs/TestDFSOutputStream.java | 4 +++- .../org/apache/hadoop/hdfs/TestDFSPermission.java | 1 + .../org/apache/hadoop/hdfs/TestDFSRollback.java | 5 ++++- .../apache/hadoop/hdfs/TestDFSStartupVersions.java | 5 ++++- .../hadoop/hdfs/TestDFSStorageStateRecovery.java | 5 ++++- .../hadoop/hdfs/TestDFSStripedInputStream.java | 1 + .../hadoop/hdfs/TestDFSStripedOutputStream.java | 1 + .../hadoop/hdfs/TestDataTransferKeepalive.java | 5 ++++- .../org/apache/hadoop/hdfs/TestDecommission.java | 1 + .../apache/hadoop/hdfs/TestEncryptionZones.java | 1 + .../hadoop/hdfs/TestEncryptionZonesWithHA.java | 1 + .../hadoop/hdfs/TestErasureCodingPolicies.java | 1 + .../hdfs/TestErasureCodingPolicyWithSnapshot.java | 1 + .../hadoop/hdfs/TestFileConcurrentReader.java | 6 ++++-- .../org/apache/hadoop/hdfs/TestFileStatus.java | 8 ++++++-- .../hadoop/hdfs/TestFileStatusWithECPolicy.java | 1 + .../apache/hadoop/hdfs/TestGetFileChecksum.java | 1 + .../hadoop/hdfs/TestHDFSFileSystemContract.java | 6 ++++-- .../java/org/apache/hadoop/hdfs/TestHdfsAdmin.java | 1 + .../org/apache/hadoop/hdfs/TestLeaseRecovery.java | 1 + .../org/apache/hadoop/hdfs/TestLeaseRecovery2.java | 6 ++++-- .../org/apache/hadoop/hdfs/TestListFilesInDFS.java | 6 ++++-- .../hadoop/hdfs/TestListFilesInFileContext.java | 4 +++- .../java/org/apache/hadoop/hdfs/TestPipelines.java | 5 ++++- .../hdfs/TestReadStripedFileWithDecoding.java | 1 + .../hdfs/TestReadStripedFileWithMissingBlocks.java | 1 + .../apache/hadoop/hdfs/TestRecoverStripedFile.java | 1 + .../apache/hadoop/hdfs/TestReservedRawPaths.java | 1 + .../java/org/apache/hadoop/hdfs/TestSafeMode.java | 2 ++ .../hadoop/hdfs/TestSafeModeWithStripedFile.java | 1 + .../java/org/apache/hadoop/hdfs/TestWriteRead.java | 5 ++++- .../hadoop/hdfs/TestWriteReadStripedFile.java | 1 + .../datatransfer/sasl/TestSaslDataTransfer.java | 1 + .../hadoop/hdfs/qjournal/TestSecureNNWithQJM.java | 2 ++ .../qjournal/client/TestQuorumJournalManager.java | 1 + .../qjournal/server/TestJournalNodeMXBean.java | 1 + .../hadoop/hdfs/security/TestDelegationToken.java | 1 + .../blockmanagement/TestBlockStatsMXBean.java | 1 + .../blockmanagement/TestComputeInvalidateWork.java | 1 + .../TestPendingInvalidateBlock.java | 1 + .../TestSequentialBlockGroupId.java | 1 + .../hdfs/server/datanode/BlockReportTestBase.java | 2 ++ .../hdfs/server/datanode/TestDataNodeExit.java | 4 +++- .../server/datanode/TestDataNodeVolumeFailure.java | 3 +++ .../TestDataNodeVolumeFailureReporting.java | 1 + .../TestDataNodeVolumeFailureToleration.java | 1 + .../hadoop/hdfs/server/datanode/TestDiskError.java | 5 ++++- .../hdfs/server/datanode/TestFsDatasetCache.java | 2 ++ .../datanode/TestIncrementalBrVariations.java | 11 +++++++---- .../hdfs/server/namenode/TestAclConfigFlag.java | 1 + .../hadoop/hdfs/server/namenode/TestAddBlock.java | 1 + .../hdfs/server/namenode/TestAddBlockRetry.java | 1 + .../TestAddOverReplicatedStripedBlocks.java | 1 + .../hdfs/server/namenode/TestAddStripedBlocks.java | 1 + .../hadoop/hdfs/server/namenode/TestAuditLogs.java | 10 ++++++++-- .../hdfs/server/namenode/TestBackupNode.java | 4 +++- .../TestBlockPlacementPolicyRackFaultTolerant.java | 1 + .../hdfs/server/namenode/TestCacheDirectives.java | 1 + .../TestCommitBlockWithInvalidGenStamp.java | 1 + .../hdfs/server/namenode/TestDeadDatanode.java | 5 ++++- .../namenode/TestDefaultBlockPlacementPolicy.java | 1 + .../server/namenode/TestDiskspaceQuotaUpdate.java | 1 + .../hdfs/server/namenode/TestEditLogAutoroll.java | 2 ++ .../namenode/TestEditLogJournalFailures.java | 5 ++++- .../hdfs/server/namenode/TestFSDirectory.java | 1 + .../hdfs/server/namenode/TestFSImageWithAcl.java | 4 +++- .../server/namenode/TestFSImageWithSnapshot.java | 1 + .../hdfs/server/namenode/TestFSImageWithXAttr.java | 4 +++- .../hdfs/server/namenode/TestFileTruncate.java | 10 ++++++++-- .../hdfs/server/namenode/TestHDFSConcat.java | 2 ++ .../namenode/TestINodeAttributeProvider.java | 1 + .../hdfs/server/namenode/TestMalformedURLs.java | 1 + .../server/namenode/TestMetadataVersionOutput.java | 1 + .../namenode/TestNameNodeMetadataConsistency.java | 1 + .../namenode/TestNameNodeRetryCacheMetrics.java | 1 + .../namenode/TestNameNodeRpcServerMethods.java | 4 +++- .../server/namenode/TestNamenodeRetryCache.java | 5 ++++- .../server/namenode/TestQuotaByStorageType.java | 1 + .../namenode/TestQuotaWithStripedBlocks.java | 1 + .../hdfs/server/namenode/TestXAttrConfigFlag.java | 1 + .../server/namenode/ha/TestBootstrapStandby.java | 1 + .../namenode/ha/TestBootstrapStandbyWithQJM.java | 2 ++ .../hdfs/server/namenode/ha/TestDNFencing.java | 1 + .../namenode/ha/TestDelegationTokensWithHA.java | 1 + .../ha/TestFailoverWithBlockTokensEnabled.java | 1 + .../server/namenode/ha/TestFailureToReadEdits.java | 3 +++ .../server/namenode/ha/TestGetGroupsWithHA.java | 1 + .../hdfs/server/namenode/ha/TestHASafeMode.java | 1 + .../namenode/ha/TestInitializeSharedEdits.java | 1 + .../hdfs/server/namenode/ha/TestNNHealthCheck.java | 1 + .../hdfs/server/namenode/ha/TestQuotasWithHA.java | 1 + .../server/namenode/ha/TestRetryCacheWithHA.java | 1 + .../server/namenode/ha/TestStandbyCheckpoints.java | 1 + .../hdfs/server/namenode/ha/TestXAttrsWithHA.java | 1 + .../metrics/TestNNMetricFilesInGetListingOps.java | 5 ++++- .../namenode/metrics/TestNameNodeMetrics.java | 5 ++++- .../namenode/snapshot/TestFileContextSnapshot.java | 1 + .../TestGetContentSummaryWithSnapshot.java | 1 + ...TestINodeFileUnderConstructionWithSnapshot.java | 1 + .../namenode/snapshot/TestNestedSnapshots.java | 1 + .../snapshot/TestOpenFilesWithSnapshot.java | 2 ++ .../namenode/snapshot/TestRenameWithSnapshots.java | 1 + .../snapshot/TestSetQuotaWithSnapshot.java | 1 + .../server/namenode/snapshot/TestSnapshot.java | 1 + .../namenode/snapshot/TestSnapshotBlocksMap.java | 1 + .../namenode/snapshot/TestSnapshotDeletion.java | 1 + .../namenode/snapshot/TestSnapshotDiffReport.java | 1 + .../namenode/snapshot/TestSnapshotListing.java | 1 + .../namenode/snapshot/TestSnapshotMetrics.java | 1 + .../namenode/snapshot/TestSnapshotRename.java | 1 + .../namenode/snapshot/TestSnapshotReplication.java | 1 + .../snapshot/TestSnapshottableDirListing.java | 1 + .../hdfs/tools/TestDFSHAAdminMiniCluster.java | 5 ++++- .../hdfs/tools/TestDFSZKFailoverController.java | 8 +++++++- .../apache/hadoop/hdfs/tools/TestGetGroups.java | 5 ++++- .../hdfs/tools/TestStoragePolicyCommands.java | 2 ++ .../hadoop/hdfs/web/TestHttpsFileSystem.java | 4 +++- .../web/TestWebHdfsWithAuthenticationFilter.java | 8 ++++++-- .../hadoop/security/TestRefreshUserMappings.java | 2 ++ .../java/org/apache/hadoop/tools/TestJMXGet.java | 17 ++++++++++------- .../org/apache/hadoop/tracing/TestTracing.java | 5 ++++- 152 files changed, 336 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/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 ea1a78a..59b3f75 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2510,6 +2510,9 @@ Release 2.8.0 - UNRELEASED HDFS-9570. Minor typos, grammar, and case sensitivity cleanup in HdfsPermissionsGuide.md's (Travis Campbell via aw) + HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized + reference. (Wei-Chiu Chuang via Arpit Agarwal) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java index 18dedc8..ef7f708 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java @@ -63,6 +63,7 @@ public class TestBootstrapStandbyWithBKJM { public void teardown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java index f66f9b6..1be2752 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java @@ -86,6 +86,7 @@ public class TestRefreshCallQueue { public void tearDown() throws Exception { if(cluster!=null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java index a6f8651..061d328 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java @@ -49,9 +49,11 @@ public class TestAclCLI extends CLITestHelperDFS { super.tearDown(); if (fs != null) { fs.close(); + fs = null; } if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java index ddb11b6..28321cb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java @@ -76,9 +76,11 @@ public class TestCacheAdminCLI extends CLITestHelper { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java index 44e662f..bd5349d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java @@ -86,9 +86,11 @@ public class TestCryptoAdminCLI extends CLITestHelperDFS { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java index 04328f5..4c27f79 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java @@ -58,9 +58,11 @@ public class TestDeleteCLI extends CLITestHelperDFS { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java index 29ec98e..664c044 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java @@ -61,9 +61,11 @@ public class TestErasureCodingCLI extends CLITestHelper { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java index 3630726..e0e7894 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java @@ -77,9 +77,11 @@ public class TestHDFSCLI extends CLITestHelperDFS { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java index 45c7909..d83baf3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java @@ -67,9 +67,11 @@ public class TestXAttrCLI extends CLITestHelperDFS { public void tearDown() throws Exception { if (fs != null) { fs.close(); + fs = null; } if (dfsCluster != null) { dfsCluster.shutdown(); + dfsCluster = null; } Thread.sleep(2000); super.tearDown(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java index 40dbc4e..0d3e6ff 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java @@ -58,7 +58,9 @@ public class TestFcHdfsCreateMkdir extends @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java index 9f0b23c..10ae1ef 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java @@ -65,7 +65,9 @@ public class TestFcHdfsPermission extends FileContextPermissionBase { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java index 34fbe7f..0916347 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java @@ -96,7 +96,9 @@ public class TestFcHdfsSetUMask { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java index 6d7ef55..042431e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java @@ -96,7 +96,9 @@ abstract public class TestSymlinkHdfs extends SymlinkBaseTest { @AfterClass public static void afterClassTeardown() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Test(timeout=10000) http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java index 258703a..74b9a35 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java @@ -62,6 +62,7 @@ public class HDFSContract extends AbstractFSContract { public static void destroyCluster() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java index 76c32bf..23de658 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java @@ -60,9 +60,11 @@ public class TestHdfsTextCommand { public void tearDown() throws IOException{ if(fs != null){ fs.close(); + fs = null; } if(cluster != null){ cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java index 24dd7a3..9221317 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java @@ -88,7 +88,9 @@ public class TestViewFileSystemHdfs extends ViewFileSystemBaseTest { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java index 68dd7f2..a3e5657 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java @@ -76,7 +76,9 @@ public class TestViewFileSystemWithAcls { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java index 227548d..b487188 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java @@ -71,7 +71,9 @@ public class TestViewFileSystemWithXAttrs { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java index 9fb3a5b..8866465 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java @@ -64,7 +64,9 @@ public class TestViewFsAtHdfsRoot extends ViewFsBaseTest { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java index 96a395c..fda6672 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java @@ -64,7 +64,9 @@ public class TestViewFsHdfs extends ViewFsBaseTest { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java index 70918e9..e7e6648 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java @@ -76,7 +76,9 @@ public class TestViewFsWithAcls { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java index 431f851..9a4223a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java @@ -70,7 +70,9 @@ public class TestViewFsWithXAttrs { @AfterClass public static void ClusterShutdownAtEnd() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java index 6b9c138..9e7b598 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java @@ -68,7 +68,9 @@ public class FileAppendTest4 { @AfterClass public static void tearDown() { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java index 22a471e..301f6a7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java @@ -56,8 +56,14 @@ public class TestAbandonBlock { @After public void tearDown() throws Exception { - fs.close(); - cluster.shutdown(); + if (fs != null) { + fs.close(); + fs = null; + } + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/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 a66cd1d..b943219 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 @@ -43,9 +43,11 @@ public class TestBlocksScheduledCounter { public void tearDown() throws IOException { if (fs != null) { fs.close(); + fs = null; } if(cluster!=null){ cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java index 6b2eb3c..ce2e79b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java @@ -82,8 +82,14 @@ public class TestClientReportBadBlock { @After public void shutDownCluster() throws IOException { - dfs.close(); - cluster.shutdown(); + if (dfs != null) { + dfs.close(); + dfs = null; + } + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } /* http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java index c253f47..59cc154 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java @@ -54,6 +54,7 @@ public class TestDFSClientExcludedNodes { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java index 60ffe30..7563519 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java @@ -88,6 +88,7 @@ public class TestDFSClientFailover { public void tearDownCluster() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java index aaeaa01..2376576 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java @@ -82,6 +82,7 @@ public class TestDFSClientSocketSize { if (cluster != null) { LOG.info("Shutting down MiniDFSCluster."); cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java index 39d3c96..d0df9fe 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java @@ -188,7 +188,10 @@ public class TestDFSFinalize { @After public void tearDown() throws Exception { LOG.info("Shutting down MiniDFSCluster"); - if (cluster != null) cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java index 821d259..a404ac8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java @@ -150,6 +150,8 @@ public class TestDFSOutputStream { @AfterClass public static void tearDown() { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 80b2eb4..8f2f0a0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -123,6 +123,7 @@ public class TestDFSPermission { public void tearDown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java index 3fe5626..25eb5b6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java @@ -346,7 +346,10 @@ public class TestDFSRollback { @After public void tearDown() throws Exception { LOG.info("Shutting down MiniDFSCluster"); - if (cluster != null) cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java index 3a27be6..d202223 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java @@ -282,7 +282,10 @@ public class TestDFSStartupVersions { @After public void tearDown() throws Exception { LOG.info("Shutting down MiniDFSCluster"); - if (cluster != null) cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java index 176e9cc..cd51631 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java @@ -452,6 +452,9 @@ public class TestDFSStorageStateRecovery { @After public void tearDown() throws Exception { LOG.info("Shutting down MiniDFSCluster"); - if (cluster != null) cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java index 495f1b5..3b8141f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java @@ -86,6 +86,7 @@ public class TestDFSStripedInputStream { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java index 76b471a..1846196 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java @@ -69,6 +69,7 @@ public class TestDFSStripedOutputStream { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java index dbe2f1e..9e3ddcf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java @@ -69,7 +69,10 @@ public class TestDataTransferKeepalive { @After public void teardown() { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java index 0b70e24..edc81ae 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java @@ -126,6 +126,7 @@ public class TestDecommission { cleanupFile(localFileSys, dir); if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java index b476483..66fef2d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java @@ -170,6 +170,7 @@ public class TestEncryptionZones { public void teardown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } EncryptionFaultInjector.instance = new EncryptionFaultInjector(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java index e61a02b..476d024 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java @@ -87,6 +87,7 @@ public class TestEncryptionZonesWithHA { public void shutdownCluster() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java index 84e95b3..dcb528c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java @@ -61,6 +61,7 @@ public class TestErasureCodingPolicies { public void shutdownCluster() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java index 515763c..6b10d7e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java @@ -57,6 +57,7 @@ public class TestErasureCodingPolicyWithSnapshot { public void shutdownCluster() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java index cd0daf7..e0a0d3b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java @@ -84,8 +84,10 @@ public class TestFileConcurrentReader { @After public void tearDown() throws Exception { - cluster.shutdown(); - cluster = null; + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } private void init(Configuration conf) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java index 29fb54c..dcb7af9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java @@ -77,8 +77,12 @@ public class TestFileStatus { @AfterClass public static void testTearDown() throws Exception { - fs.close(); - cluster.shutdown(); + if (fs != null) { + fs.close(); + } + if (cluster != null) { + cluster.shutdown(); + } } private void checkFile(FileSystem fileSys, Path name, int repl) http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java index 33bea0f..adb66ca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java @@ -50,6 +50,7 @@ public class TestFileStatusWithECPolicy { public void after() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java index 814261f..cf61e84 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java @@ -52,6 +52,7 @@ public class TestGetFileChecksum { public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java index f19386b..c1bf6f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java @@ -45,8 +45,10 @@ public class TestHDFSFileSystemContract extends FileSystemContractBaseTest { @Override protected void tearDown() throws Exception { super.tearDown(); - cluster.shutdown(); - cluster = null; + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } @Override http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java index 245652a..0f5bdf5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java @@ -47,6 +47,7 @@ public class TestHdfsAdmin { public void shutDownCluster() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java index 4ae130d..d62194c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java @@ -57,6 +57,7 @@ public class TestLeaseRecovery { public void shutdown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java index 8c389ec..13e8644 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java @@ -101,8 +101,10 @@ public class TestLeaseRecovery2 { */ @AfterClass public static void tearDown() throws IOException { - IOUtils.closeStream(dfs); - if (cluster != null) {cluster.shutdown();} + if (cluster != null) { + IOUtils.closeStream(dfs); + cluster.shutdown(); + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java index 5936d84..53b21d0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java @@ -46,8 +46,10 @@ public class TestListFilesInDFS extends TestListFiles { @AfterClass public static void testShutdown() throws Exception { - fs.close(); - cluster.shutdown(); + if (cluster != null) { + fs.close(); + cluster.shutdown(); + } } protected static Path getTestDir() { http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java index 4b0bac9..1e42417 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java @@ -83,7 +83,9 @@ public class TestListFilesInFileContext { @AfterClass public static void testShutdown() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + } } /** Test when input path is a file */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java index c9831b0..5804d35 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java @@ -65,11 +65,14 @@ public class TestPipelines { @After public void shutDownCluster() throws IOException { - if (fs != null) + if (fs != null) { fs.close(); + fs = null; + } if (cluster != null) { cluster.shutdownDataNodes(); cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java index ccd300f..32b0216 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java @@ -77,6 +77,7 @@ public class TestReadStripedFileWithDecoding { public void tearDown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java index b5ffb38..a362de8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java @@ -61,6 +61,7 @@ public class TestReadStripedFileWithMissingBlocks { public void tearDown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java index 5b9245b..7834967 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java @@ -97,6 +97,7 @@ public class TestRecoverStripedFile { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java index 82cef94..84cfd80 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java @@ -91,6 +91,7 @@ public class TestReservedRawPaths { public void teardown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java index c26fc75..4940d45 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java @@ -90,9 +90,11 @@ public class TestSafeMode { public void tearDown() throws IOException { if (fs != null) { fs.close(); + fs = null; } if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java index 6d711d1..acfdddb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java @@ -63,6 +63,7 @@ public class TestSafeModeWithStripedFile { public void tearDown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java index 47a78bc..623daff 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java @@ -86,7 +86,10 @@ public class TestWriteRead { @After public void shutdown() { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } // Equivalence of @Before for cluster mode testing. http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java index 3ea6eea..4e5fbe4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java @@ -76,6 +76,7 @@ public class TestWriteReadStripedFile { public void tearDown() throws IOException { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java index 0cbf266..2d4eb0d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java @@ -67,6 +67,7 @@ public class TestSaslDataTransfer extends SaslDataTransferTestCase { IOUtils.cleanup(null, fs); if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java index 166f18e..197759e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java @@ -154,9 +154,11 @@ public class TestSecureNNWithQJM { IOUtils.cleanup(null, fs); if (cluster != null) { cluster.shutdown(); + cluster = null; } if (mjc != null) { mjc.shutdown(); + mjc = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java index b9a0924..3ba573c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java @@ -114,6 +114,7 @@ public class TestQuorumJournalManager { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java index 498ef71..45b245a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java @@ -61,6 +61,7 @@ public class TestJournalNodeMXBean { public void cleanup() throws IOException { if (jCluster != null) { jCluster.shutdown(); + jCluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java index 35c653d..f4aae8f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java @@ -84,6 +84,7 @@ public class TestDelegationToken { public void tearDown() throws Exception { if(cluster!=null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java index 2fe8768..f5b5641 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java @@ -67,6 +67,7 @@ public class TestBlockStatsMXBean { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java index 5b08f53..07455cf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java @@ -70,6 +70,7 @@ public class TestComputeInvalidateWork { public void teardown() throws Exception { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java index 60e0f7c..a588a73 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java @@ -74,6 +74,7 @@ public class TestPendingInvalidateBlock { public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java index 00b4e3b..648745c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java @@ -93,6 +93,7 @@ public class TestSequentialBlockGroupId { public void teardown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java index 0a57005..4279f96 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java @@ -115,10 +115,12 @@ public abstract class BlockReportTestBase { public void shutDownCluster() throws IOException { if (fs != null) { fs.close(); + fs = null; } if (cluster != null) { cluster.shutdownDataNodes(); cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java index 7a15b85..918ad83 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java @@ -59,8 +59,10 @@ public class TestDataNodeExit { @After public void tearDown() throws Exception { - if (cluster != null) + if (cluster != null) { cluster.shutdown(); + cluster = null; + } } private void stopBPServiceThreads(int numStopThreads, DataNode dn) http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java index 2c4fcc5..90e000b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java @@ -116,12 +116,15 @@ public class TestDataNodeVolumeFailure { public void tearDown() throws Exception { if(data_fail != null) { FileUtil.setWritable(data_fail, true); + data_fail = null; } if(failedDir != null) { FileUtil.setWritable(failedDir, true); + failedDir = null; } if(cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java index 5a58fe4..d25a8a2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java @@ -89,6 +89,7 @@ public class TestDataNodeVolumeFailureReporting { IOUtils.cleanup(LOG, fs); if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java index 32a439d..1eb8bca 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java @@ -78,6 +78,7 @@ public class TestDataNodeVolumeFailureToleration { public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java index 55a668b..000277a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java @@ -71,7 +71,10 @@ public class TestDiskError { @After public void tearDown() throws Exception { - cluster.shutdown(); + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java index cb4022e..77b0c44 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java @@ -149,9 +149,11 @@ public class TestFsDatasetCache { DFSTestUtil.verifyExpectedCacheUsage(0, 0, fsd); if (fs != null) { fs.close(); + fs = null; } if (cluster != null) { cluster.shutdown(); + cluster = null; } // Restore the original CacheManipulator NativeIO.POSIX.setCacheManipulator(prevCacheManipulator); http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java index 0944396..f2570c2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java @@ -101,10 +101,13 @@ public class TestIncrementalBrVariations { @After public void shutDownCluster() throws IOException { - client.close(); - fs.close(); - cluster.shutdownDataNodes(); - cluster.shutdown(); + if (cluster != null) { + client.close(); + fs.close(); + cluster.shutdownDataNodes(); + cluster.shutdown(); + cluster = null; + } } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java index afb7dc5..36539e5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java @@ -58,6 +58,7 @@ public class TestAclConfigFlag { IOUtils.cleanup(null, fs); if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java index 301ee25..9e9890f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java @@ -60,6 +60,7 @@ public class TestAddBlock { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java index c92e79b..a8cd5b9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java @@ -66,6 +66,7 @@ public class TestAddBlockRetry { public void tearDown() throws Exception { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java index abcdbc1..2be9726 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java @@ -75,6 +75,7 @@ public class TestAddOverReplicatedStripedBlocks { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f623fb8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java index 836bff1..7d74012 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java @@ -82,6 +82,7 @@ public class TestAddStripedBlocks { public void tearDown() { if (cluster != null) { cluster.shutdown(); + cluster = null; } }