HDFS-8584. NPE in distcp when ssl configuration file does not exist in class path. Contributed by Surendra Singh Lilhore.
(cherry picked from commit c2e2e13455
)
This commit is contained in:
parent
8172921f6d
commit
a9cbfd717c
|
@ -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
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue