Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9515. NPE when MiniDFSCluster#shutdown is invoked on uninitialized reference. (Contributed by Wei-Chiu Chuang)

This commit is contained in:
Arpit Agarwal 2015-12-17 13:43:27 -08:00
parent db37f02dc7
commit 2f623fb8cc
152 changed files with 336 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -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

1
hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/TestBootstrapStandbyWithBKJM.java
View File

@ -63,6 +63,7 @@ public class TestBootstrapStandbyWithBKJM {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/TestRefreshCallQueue.java
View File

@ -86,6 +86,7 @@ public class TestRefreshCallQueue {
public void tearDown() throws Exception {
if(cluster!=null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestAclCLI.java
View File

@ -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;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCacheAdminCLI.java
View File

@ -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();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestCryptoAdminCLI.java
View File

@ -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();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestDeleteCLI.java
View File

@ -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();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestErasureCodingCLI.java
View File

@ -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();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestHDFSCLI.java
View File

@ -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();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/cli/TestXAttrCLI.java
View File

@ -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();

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java
View File

@ -58,7 +58,9 @@ public class TestFcHdfsCreateMkdir extends
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Override

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsPermission.java
View File

@ -65,7 +65,9 @@ public class TestFcHdfsPermission extends FileContextPermissionBase {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Override

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestFcHdfsSetUMask.java
View File

@ -96,7 +96,9 @@ public class TestFcHdfsSetUMask {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
{

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfs.java
View File

@ -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)

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/contract/hdfs/HDFSContract.java
View File

@ -62,6 +62,7 @@ public class HDFSContract extends AbstractFSContract {
public static void destroyCluster() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/shell/TestHdfsTextCommand.java
View File

@ -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;
}
}

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemHdfs.java
View File

@ -88,7 +88,9 @@ public class TestViewFileSystemHdfs extends ViewFileSystemBaseTest {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Override

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithAcls.java
View File

@ -76,7 +76,9 @@ public class TestViewFileSystemWithAcls {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Before

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFileSystemWithXAttrs.java
View File

@ -71,7 +71,9 @@ public class TestViewFileSystemWithXAttrs {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Before

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsAtHdfsRoot.java
View File

@ -64,7 +64,9 @@ public class TestViewFsAtHdfsRoot extends ViewFsBaseTest {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Override

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsHdfs.java
View File

@ -64,7 +64,9 @@ public class TestViewFsHdfs extends ViewFsBaseTest {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Override

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithAcls.java
View File

@ -76,7 +76,9 @@ public class TestViewFsWithAcls {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Before

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/viewfs/TestViewFsWithXAttrs.java
View File

@ -70,7 +70,9 @@ public class TestViewFsWithXAttrs {
@AfterClass
public static void ClusterShutdownAtEnd() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
@Before

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/FileAppendTest4.java
View File

@ -68,7 +68,9 @@ public class FileAppendTest4 {
@AfterClass
public static void tearDown() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
/**

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestAbandonBlock.java
View File

@ -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

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java
View File

@ -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;
}
}

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientReportBadBlock.java
View File

@ -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;
}
}
/*

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java
View File

@ -54,6 +54,7 @@ public class TestDFSClientExcludedNodes {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientFailover.java
View File

@ -88,6 +88,7 @@ public class TestDFSClientFailover {
public void tearDownCluster() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientSocketSize.java
View File

@ -82,6 +82,7 @@ public class TestDFSClientSocketSize {
if (cluster != null) {
LOG.info("Shutting down MiniDFSCluster.");
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSFinalize.java
View File

@ -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 {

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSOutputStream.java
View File

@ -150,6 +150,8 @@ public class TestDFSOutputStream {
@AfterClass
public static void tearDown() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java
View File

@ -123,6 +123,7 @@ public class TestDFSPermission {
public void tearDown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSRollback.java
View File

@ -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 {

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
View File

@ -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 {

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
View File

@ -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;
}
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedInputStream.java
View File

@ -86,6 +86,7 @@ public class TestDFSStripedInputStream {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStream.java
View File

@ -69,6 +69,7 @@ public class TestDFSStripedOutputStream {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDataTransferKeepalive.java
View File

@ -69,7 +69,10 @@ public class TestDataTransferKeepalive {
@After
public void teardown() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}
/**

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDecommission.java
View File

@ -126,6 +126,7 @@ public class TestDecommission {
cleanupFile(localFileSys, dir);
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java
View File

@ -170,6 +170,7 @@ public class TestEncryptionZones {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
EncryptionFaultInjector.instance = new EncryptionFaultInjector();
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZonesWithHA.java
View File

@ -87,6 +87,7 @@ public class TestEncryptionZonesWithHA {
public void shutdownCluster() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicies.java
View File

@ -61,6 +61,7 @@ public class TestErasureCodingPolicies {
public void shutdownCluster() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestErasureCodingPolicyWithSnapshot.java
View File

@ -57,6 +57,7 @@ public class TestErasureCodingPolicyWithSnapshot {
public void shutdownCluster() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileConcurrentReader.java
View File

@ -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 {

8
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatus.java
View File

@ -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)

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestFileStatusWithECPolicy.java
View File

@ -50,6 +50,7 @@ public class TestFileStatusWithECPolicy {
public void after() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetFileChecksum.java
View File

@ -52,6 +52,7 @@ public class TestGetFileChecksum {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
View File

@ -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

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java
View File

@ -47,6 +47,7 @@ public class TestHdfsAdmin {
public void shutDownCluster() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery.java
View File

@ -57,6 +57,7 @@ public class TestLeaseRecovery {
public void shutdown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
View File

@ -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();
}
}
/**

6
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInDFS.java
View File

@ -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() {

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestListFilesInFileContext.java
View File

@ -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 */

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestPipelines.java
View File

@ -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;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithDecoding.java
View File

@ -77,6 +77,7 @@ public class TestReadStripedFileWithDecoding {
public void tearDown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReadStripedFileWithMissingBlocks.java
View File

@ -61,6 +61,7 @@ public class TestReadStripedFileWithMissingBlocks {
public void tearDown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestRecoverStripedFile.java
View File

@ -97,6 +97,7 @@ public class TestRecoverStripedFile {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestReservedRawPaths.java
View File

@ -91,6 +91,7 @@ public class TestReservedRawPaths {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java
View File

@ -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;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeModeWithStripedFile.java
View File

@ -63,6 +63,7 @@ public class TestSafeModeWithStripedFile {
public void tearDown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteRead.java
View File

@ -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.

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestWriteReadStripedFile.java
View File

@ -76,6 +76,7 @@ public class TestWriteReadStripedFile {
public void tearDown() throws IOException {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/TestSaslDataTransfer.java
View File

@ -67,6 +67,7 @@ public class TestSaslDataTransfer extends SaslDataTransferTestCase {
IOUtils.cleanup(null, fs);
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/TestSecureNNWithQJM.java
View File

@ -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;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java
View File

@ -114,6 +114,7 @@ public class TestQuorumJournalManager {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/qjournal/server/TestJournalNodeMXBean.java
View File

@ -61,6 +61,7 @@ public class TestJournalNodeMXBean {
public void cleanup() throws IOException {
if (jCluster != null) {
jCluster.shutdown();
jCluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java
View File

@ -84,6 +84,7 @@ public class TestDelegationToken {
public void tearDown() throws Exception {
if(cluster!=null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockStatsMXBean.java
View File

@ -67,6 +67,7 @@ public class TestBlockStatsMXBean {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestComputeInvalidateWork.java
View File

@ -70,6 +70,7 @@ public class TestComputeInvalidateWork {
public void teardown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestPendingInvalidateBlock.java
View File

@ -74,6 +74,7 @@ public class TestPendingInvalidateBlock {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestSequentialBlockGroupId.java
View File

@ -93,6 +93,7 @@ public class TestSequentialBlockGroupId {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/BlockReportTestBase.java
View File

@ -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;
}
}

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeExit.java
View File

@ -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)

3
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
View File

@ -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;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureReporting.java
View File

@ -89,6 +89,7 @@ public class TestDataNodeVolumeFailureReporting {
IOUtils.cleanup(LOG, fs);
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailureToleration.java
View File

@ -78,6 +78,7 @@ public class TestDataNodeVolumeFailureToleration {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
View File

@ -71,7 +71,10 @@ public class TestDiskError {
@After
public void tearDown() throws Exception {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}
/**

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestFsDatasetCache.java
View File

@ -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);

11
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestIncrementalBrVariations.java
View File

@ -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;
}
}
/**

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAclConfigFlag.java
View File

@ -58,6 +58,7 @@ public class TestAclConfigFlag {
IOUtils.cleanup(null, fs);
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlock.java
View File

@ -60,6 +60,7 @@ public class TestAddBlock {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddBlockRetry.java
View File

@ -66,6 +66,7 @@ public class TestAddBlockRetry {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddOverReplicatedStripedBlocks.java
View File

@ -75,6 +75,7 @@ public class TestAddOverReplicatedStripedBlocks {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java
View File

@ -82,6 +82,7 @@ public class TestAddStripedBlocks {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAuditLogs.java
View File

@ -137,8 +137,14 @@ public class TestAuditLogs {
@After
public void teardownCluster() throws Exception {
util.cleanup(fs, "/srcdat");
fs.close();
cluster.shutdown();
if (fs != null) {
fs.close();
fs = null;
}
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}
/** test that allowed operation puts proper entry in audit log */

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
View File

@ -494,7 +494,9 @@ public class TestBackupNode {
assertTrue(e.getLocalizedMessage(), false);
} finally {
fileSys.close();
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestBlockPlacementPolicyRackFaultTolerant.java
View File

@ -83,6 +83,7 @@ public class TestBlockPlacementPolicyRackFaultTolerant {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCacheDirectives.java
View File

@ -158,6 +158,7 @@ public class TestCacheDirectives {
waitForCachedBlocks(namenode, 0, 0, "teardown");
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
// Restore the original CacheManipulator
NativeIO.POSIX.setCacheManipulator(prevCacheManipulator);

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockWithInvalidGenStamp.java
View File

@ -58,6 +58,7 @@ public class TestCommitBlockWithInvalidGenStamp {
public void tearDown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDeadDatanode.java
View File

@ -62,7 +62,10 @@ public class TestDeadDatanode {
@After
public void cleanup() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}
/**

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDefaultBlockPlacementPolicy.java
View File

@ -71,6 +71,7 @@ public class TestDefaultBlockPlacementPolicy {
public void teardown() {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestDiskspaceQuotaUpdate.java
View File

@ -71,6 +71,7 @@ public class TestDiskspaceQuotaUpdate {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogAutoroll.java
View File

@ -97,9 +97,11 @@ public class TestEditLogAutoroll {
public void tearDown() throws Exception {
if (fs != null) {
fs.close();
fs = null;
}
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLogJournalFailures.java
View File

@ -70,11 +70,14 @@ public class TestEditLogJournalFailures {
@After
public void shutDownMiniCluster() throws IOException {
if (fs != null)
if (fs != null) {
fs.close();
fs = null;
}
if (cluster != null) {
try {
cluster.shutdown();
cluster = null;
} catch (ExitException ee) {
// Ignore ExitExceptions as the tests may result in the
// NameNode doing an immediate shutdown.

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirectory.java
View File

@ -108,6 +108,7 @@ public class TestFSDirectory {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImageWithAcl.java
View File

@ -55,7 +55,9 @@ public class TestFSImageWithAcl {
@AfterClass
public static void tearDown() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
private void testAcl(boolean persistNamespace) throws IOException {

1
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImageWithSnapshot.java
View File

@ -89,6 +89,7 @@ public class TestFSImageWithSnapshot {
public void tearDown() throws Exception {
if (cluster != null) {
cluster.shutdown();
cluster = null;
}
}

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSImageWithXAttr.java
View File

@ -62,7 +62,9 @@ public class TestFSImageWithXAttr {
@AfterClass
public static void tearDown() {
cluster.shutdown();
if (cluster != null) {
cluster.shutdown();
}
}
private void testXAttr(boolean persistNamespace) throws IOException {

10
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFileTruncate.java
View File

@ -110,8 +110,14 @@ public class TestFileTruncate {
@After
public void tearDown() throws IOException {
if(fs != null) fs.close();
if(cluster != null) cluster.shutdown();
if(fs != null) {
fs.close();
fs = null;
}
if(cluster != null) {
cluster.shutdown();
cluster = null;
}
}
/**

Some files were not shown because too many files have changed in this diff Show More