You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2016/01/12 05:32:19 UTC
[20/23] hadoop git commit: HDFS-8584. NPE in distcp when ssl
configuration file does not exist in class path. Contributed by Surendra
Singh Lilhore.
HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c2e2e134
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c2e2e134
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c2e2e134
Branch: refs/heads/HDFS-1312
Commit: c2e2e134555010ec28da296bcfef4ba2613a5c6c
Parents: 5fab4ec
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Mon Jan 11 16:59:46 2016 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Mon Jan 11 17:08:26 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/c2e2e134/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 b03cd96..f9a7dcb 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -2584,6 +2584,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/c2e2e134/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());