Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC00E1824A for ; Tue, 12 Jan 2016 01:19:17 +0000 (UTC) Received: (qmail 23467 invoked by uid 500); 12 Jan 2016 01:19:12 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 23402 invoked by uid 500); 12 Jan 2016 01:19:12 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 23393 invoked by uid 99); 12 Jan 2016 01:19:12 -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; Tue, 12 Jan 2016 01:19:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50AD5E0B19; Tue, 12 Jan 2016 01:19:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xyao@apache.org To: common-commits@hadoop.apache.org Message-Id: <92104b7ab15242d388b25e8ec84a4bbe@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore. Date: Tue, 12 Jan 2016 01:19:12 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2.8 8172921f6 -> a9cbfd717 HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore. (cherry picked from commit c2e2e134555010ec28da296bcfef4ba2613a5c6c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a9cbfd71 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a9cbfd71 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a9cbfd71 Branch: refs/heads/branch-2.8 Commit: a9cbfd717c3d0cc4e353eff4281df10b5ac3756d Parents: 8172921 Author: Xiaoyu Yao Authored: Mon Jan 11 16:59:46 2016 -0800 Committer: Xiaoyu Yao Committed: Mon Jan 11 17:16:43 2016 -0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/tools/DistCp.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9cbfd71/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 0328998..1ee3379 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1648,6 +1648,9 @@ Release 2.8.0 - UNRELEASED HDFS-9639. Inconsistent Logging in BootstrapStandby. (Xiaobing Zhou via Arpit Agarwal) + HDFS-8584. NPE in distcp when ssl configuration file does not exist in + class path. (Surendra Singh Lilhore via Xiaoyu Yao) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a9cbfd71/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java index f919d21..9db2b1b 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/DistCp.java @@ -19,6 +19,7 @@ package org.apache.hadoop.tools; import java.io.IOException; +import java.net.URL; import java.util.Random; import org.apache.commons.logging.Log; @@ -270,8 +271,14 @@ public class DistCp extends Configured implements Tool { */ private void setupSSLConfig(Job job) throws IOException { Configuration configuration = job.getConfiguration(); - Path sslConfigPath = new Path(configuration. - getResource(inputOptions.getSslConfigurationFile()).toString()); + URL sslFileUrl = configuration.getResource(inputOptions + .getSslConfigurationFile()); + if (sslFileUrl == null) { + throw new IOException( + "Given ssl configuration file doesn't exist in class path : " + + inputOptions.getSslConfigurationFile()); + } + Path sslConfigPath = new Path(sslFileUrl.toString()); addSSLFilesToDistCache(job, sslConfigPath); configuration.set(DistCpConstants.CONF_LABEL_SSL_CONF, sslConfigPath.getName());