Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 93B43200BAC for ; Wed, 26 Oct 2016 20:30:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 923BE160B02; Wed, 26 Oct 2016 18:30:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8FCAB160AFD for ; Wed, 26 Oct 2016 20:30:32 +0200 (CEST) Received: (qmail 23424 invoked by uid 500); 26 Oct 2016 18:30:28 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 22462 invoked by uid 99); 26 Oct 2016 18:30:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Oct 2016 18:30:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6FE43F12ED; Wed, 26 Oct 2016 18:30:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kasha@apache.org To: common-commits@hadoop.apache.org Date: Wed, 26 Oct 2016 18:30:40 -0000 Message-Id: <80befc560d7343d1bbe8dd590d0ee723@git.apache.org> In-Reply-To: <78db06c39b8241a28a5d7156109f6a7a@git.apache.org> References: <78db06c39b8241a28a5d7156109f6a7a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] hadoop git commit: HDFS-11042. Add missing cleanupSSLConfig() call for tests that use setupSSLConfig(). Contributed by Kuhu Shukla. archived-at: Wed, 26 Oct 2016 18:30:33 -0000 HDFS-11042. Add missing cleanupSSLConfig() call for tests that use setupSSLConfig(). Contributed by Kuhu Shukla. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b18f35f0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b18f35f0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b18f35f0 Branch: refs/heads/YARN-4752 Commit: b18f35f097a3ee33f449e506676961f9b9456bbd Parents: d0a3479 Author: Kihwal Lee Authored: Mon Oct 24 08:28:44 2016 -0500 Committer: Kihwal Lee Committed: Mon Oct 24 08:28:44 2016 -0500 ---------------------------------------------------------------------- .../client/TestHttpFSFWithSWebhdfsFileSystem.java | 6 ++++-- .../hdfs/TestSecureEncryptionZoneWithKMS.java | 9 ++++++--- .../datatransfer/sasl/SaslDataTransferTestCase.java | 9 ++++++--- .../hadoop/hdfs/qjournal/TestSecureNNWithQJM.java | 11 ++++++++--- .../hadoop/hdfs/server/balancer/TestBalancer.java | 16 ++++++++++++++-- .../namenode/TestNameNodeRespectsBindHostKeys.java | 10 ++++++++-- .../apache/hadoop/hdfs/web/TestWebHdfsTokens.java | 5 +++-- 7 files changed, 49 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java index d8f860a..d53bb50 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java @@ -40,6 +40,7 @@ public class TestHttpFSFWithSWebhdfsFileSystem private static String classpathDir; private static final String BASEDIR = GenericTestUtils.getTempPath(UUID.randomUUID().toString()); + private static String keyStoreDir; private static Configuration sslConf; @@ -57,7 +58,7 @@ public class TestHttpFSFWithSWebhdfsFileSystem File base = new File(BASEDIR); FileUtil.fullyDelete(base); base.mkdirs(); - String keyStoreDir = new File(BASEDIR).getAbsolutePath(); + keyStoreDir = new File(BASEDIR).getAbsolutePath(); try { sslConf = new Configuration(); KeyStoreTestUtil.setupSSLConfig(keyStoreDir, classpathDir, sslConf, false); @@ -69,9 +70,10 @@ public class TestHttpFSFWithSWebhdfsFileSystem } @AfterClass - public static void cleanUp() { + public static void cleanUp() throws Exception { new File(classpathDir, "ssl-client.xml").delete(); new File(classpathDir, "ssl-server.xml").delete(); + KeyStoreTestUtil.cleanupSSLConfig(keyStoreDir, classpathDir); } public TestHttpFSFWithSWebhdfsFileSystem(Operation operation) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSecureEncryptionZoneWithKMS.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSecureEncryptionZoneWithKMS.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSecureEncryptionZoneWithKMS.java index 96e39ba..7c4763c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSecureEncryptionZoneWithKMS.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSecureEncryptionZoneWithKMS.java @@ -86,6 +86,8 @@ public class TestSecureEncryptionZoneWithKMS { private static final Path TEST_PATH = new Path("/test-dir"); private static HdfsConfiguration baseConf; private static File baseDir; + private static String keystoresDir; + private static String sslConfDir; private static final EnumSet< CreateEncryptionZoneFlag > NO_TRASH = EnumSet.of(CreateEncryptionZoneFlag.NO_TRASH); @@ -189,8 +191,8 @@ public class TestSecureEncryptionZoneWithKMS { baseConf.set(KMS_CLIENT_ENC_KEY_CACHE_SIZE, "4"); baseConf.set(KMS_CLIENT_ENC_KEY_CACHE_LOW_WATERMARK, "0.5"); - String keystoresDir = baseDir.getAbsolutePath(); - String sslConfDir = KeyStoreTestUtil.getClasspathDir( + keystoresDir = baseDir.getAbsolutePath(); + sslConfDir = KeyStoreTestUtil.getClasspathDir( TestSecureEncryptionZoneWithKMS.class); KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, baseConf, false); baseConf.set(DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY, @@ -225,7 +227,7 @@ public class TestSecureEncryptionZoneWithKMS { } @AfterClass - public static void destroy() { + public static void destroy() throws Exception { if (kdc != null) { kdc.stop(); } @@ -233,6 +235,7 @@ public class TestSecureEncryptionZoneWithKMS { miniKMS.stop(); } FileUtil.fullyDelete(baseDir); + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java index 4eade6a..d03d095 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferTestCase.java @@ -50,6 +50,8 @@ import org.junit.BeforeClass; public abstract class SaslDataTransferTestCase { private static File baseDir; + private static String keystoresDir; + private static String sslConfDir; private static String hdfsPrincipal; private static String userPrincipal; private static MiniKdc kdc; @@ -99,11 +101,12 @@ public abstract class SaslDataTransferTestCase { } @AfterClass - public static void shutdownKdc() { + public static void shutdownKdc() throws Exception { if (kdc != null) { kdc.stop(); } FileUtil.fullyDelete(baseDir); + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); } /** @@ -129,8 +132,8 @@ public abstract class SaslDataTransferTestCase { conf.set(DFS_DATANODE_HTTPS_ADDRESS_KEY, "localhost:0"); conf.setInt(IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SASL_KEY, 10); - String keystoresDir = baseDir.getAbsolutePath(); - String sslConfDir = KeyStoreTestUtil.getClasspathDir(this.getClass()); + keystoresDir = baseDir.getAbsolutePath(); + sslConfDir = KeyStoreTestUtil.getClasspathDir(this.getClass()); KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false); conf.set(DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY, KeyStoreTestUtil.getClientSSLConfigFileName()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/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 46b016f..18adc4e 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 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.hdfs.qjournal; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import static org.junit.Assert.*; import static org.apache.hadoop.fs.CommonConfigurationKeys.IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SASL_KEY; @@ -71,6 +73,8 @@ public class TestSecureNNWithQJM { private static HdfsConfiguration baseConf; private static File baseDir; + private static String keystoresDir; + private static String sslConfDir; private static MiniKdc kdc; private MiniDFSCluster cluster; @@ -127,8 +131,8 @@ public class TestSecureNNWithQJM { baseConf.set(DFS_JOURNALNODE_HTTPS_ADDRESS_KEY, "localhost:0"); baseConf.setInt(IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SASL_KEY, 10); - String keystoresDir = baseDir.getAbsolutePath(); - String sslConfDir = KeyStoreTestUtil.getClasspathDir( + keystoresDir = baseDir.getAbsolutePath(); + sslConfDir = KeyStoreTestUtil.getClasspathDir( TestSecureNNWithQJM.class); KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, baseConf, false); baseConf.set(DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY, @@ -138,11 +142,12 @@ public class TestSecureNNWithQJM { } @AfterClass - public static void destroy() { + public static void destroy() throws Exception { if (kdc != null) { kdc.stop(); } FileUtil.fullyDelete(baseDir); + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); } @Before http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java index f58a3ad..d0997f1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java @@ -44,6 +44,7 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_KEYTAB_FILE_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_LAZY_PERSIST_FILE_SCRUB_INTERVAL_SEC; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_WEB_AUTHENTICATION_KERBEROS_PRINCIPAL_KEY; import static org.apache.hadoop.test.PlatformAssumptions.assumeNotWindows; +import org.junit.AfterClass; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -138,6 +139,8 @@ public class TestBalancer { final static private String username = "balancer"; private static String principal; private static File baseDir; + private static String keystoresDir; + private static String sslConfDir; private static MiniKdc kdc; private static File keytabFile; private MiniDFSCluster cluster; @@ -252,8 +255,8 @@ public class TestBalancer { conf.set(DFS_BALANCER_KEYTAB_FILE_KEY, keytab); conf.set(DFS_BALANCER_KERBEROS_PRINCIPAL_KEY, principal); - String keystoresDir = baseDir.getAbsolutePath(); - String sslConfDir = KeyStoreTestUtil.getClasspathDir(TestBalancer.class); + keystoresDir = baseDir.getAbsolutePath(); + sslConfDir = KeyStoreTestUtil.getClasspathDir(TestBalancer.class); KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false); conf.set(DFS_CLIENT_HTTPS_KEYSTORE_RESOURCE_KEY, @@ -263,6 +266,15 @@ public class TestBalancer { initConf(conf); } + @AfterClass + public static void destroy() throws Exception { + if (kdc != null) { + kdc.stop(); + } + FileUtil.fullyDelete(baseDir); + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); + } + /* create a file with a length of fileLen */ public static void createFile(MiniDFSCluster cluster, Path filePath, long fileLen, http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeRespectsBindHostKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeRespectsBindHostKeys.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeRespectsBindHostKeys.java index 21d99a3..8085646 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeRespectsBindHostKeys.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeRespectsBindHostKeys.java @@ -55,6 +55,8 @@ public class TestNameNodeRespectsBindHostKeys { public static final Log LOG = LogFactory.getLog(TestNameNodeRespectsBindHostKeys.class); private static final String WILDCARD_ADDRESS = "0.0.0.0"; private static final String LOCALHOST_SERVER_ADDRESS = "127.0.0.1:0"; + private static String keystoresDir; + private static String sslConfDir; private static String getRpcServerAddress(MiniDFSCluster cluster) { NameNodeRpcServer rpcServer = (NameNodeRpcServer) cluster.getNameNodeRpc(); @@ -250,8 +252,8 @@ public class TestNameNodeRespectsBindHostKeys { File base = new File(BASEDIR); FileUtil.fullyDelete(base); assertTrue(base.mkdirs()); - final String keystoresDir = new File(BASEDIR).getAbsolutePath(); - final String sslConfDir = KeyStoreTestUtil.getClasspathDir(TestNameNodeRespectsBindHostKeys.class); + keystoresDir = new File(BASEDIR).getAbsolutePath(); + sslConfDir = KeyStoreTestUtil.getClasspathDir(TestNameNodeRespectsBindHostKeys.class); KeyStoreTestUtil.setupSSLConfig(keystoresDir, sslConfDir, conf, false); } @@ -309,6 +311,10 @@ public class TestNameNodeRespectsBindHostKeys { if (cluster != null) { cluster.shutdown(); } + if (keystoresDir != null && !keystoresDir.isEmpty() + && sslConfDir != null && !sslConfDir.isEmpty()) { + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); + } } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/b18f35f0/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java index 058f63f..24de8ac 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java @@ -193,6 +193,8 @@ public class TestWebHdfsTokens { public void testLazyTokenFetchForSWebhdfs() throws Exception { MiniDFSCluster cluster = null; SWebHdfsFileSystem fs = null; + String keystoresDir; + String sslConfDir; try { final Configuration clusterConf = new HdfsConfiguration(conf); SecurityUtil.setAuthenticationMethod(SIMPLE, clusterConf); @@ -200,8 +202,6 @@ public class TestWebHdfsTokens { .DFS_NAMENODE_DELEGATION_TOKEN_ALWAYS_USE_KEY, true); String baseDir = GenericTestUtils.getTempPath(TestWebHdfsTokens.class.getSimpleName()); - String keystoresDir; - String sslConfDir; clusterConf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTPS_ONLY.name()); clusterConf.set(DFSConfigKeys.DFS_NAMENODE_HTTPS_ADDRESS_KEY, "localhost:0"); @@ -238,6 +238,7 @@ public class TestWebHdfsTokens { cluster.shutdown(); } } + KeyStoreTestUtil.cleanupSSLConfig(keystoresDir, sslConfDir); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org