HDFS-8431. hdfs crypto class not found in Windows. Contributed by Anu Engineer.
(cherry picked from commit 50eeea13000f0c82e0567410f0f8b611248f8c1b) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd (cherry picked from commit 25db34127811fbadb9a698fa3a76e24d426fb0f6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/188096f1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/188096f1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/188096f1 Branch: refs/heads/branch-2.7 Commit: 188096f1fe3cf88123b3494c2bd05a8b84bc0d4c Parents: e48bffd Author: cnauroth <cnaur...@apache.org> Authored: Wed May 27 22:54:00 2015 -0700 Committer: Vinod Kumar Vavilapalli (I am also known as @tshooter.) <vino...@apache.org> Committed: Thu Sep 10 11:56:27 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/188096f1/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 268ebb0..cd5a5ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -50,6 +50,9 @@ Release 2.7.2 - UNRELEASED HDFS-8219. setStoragePolicy with folder behavior is different after cluster restart. (surendra singh lilhore via Xiaoyu Yao) + HDFS-8431. hdfs crypto class not found in Windows. + (Anu Engineer via cnauroth) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/188096f1/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd index d52f52e..8115349 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd @@ -58,7 +58,8 @@ if "%1" == "--loglevel" ( exit /b ) ) - set hdfscommands=dfs namenode secondarynamenode journalnode zkfc datanode dfsadmin haadmin fsck balancer jmxget oiv oev fetchdt getconf groups snapshotDiff lsSnapshottableDir cacheadmin mover storagepolicies classpath + + set hdfscommands=dfs namenode secondarynamenode journalnode zkfc datanode dfsadmin haadmin fsck balancer jmxget oiv oev fetchdt getconf groups snapshotDiff lsSnapshottableDir cacheadmin mover storagepolicies classpath crypto for %%i in ( %hdfscommands% ) do ( if %hdfs-command% == %%i set hdfscommand=true ) @@ -174,6 +175,10 @@ goto :eof set CLASS=org.apache.hadoop.hdfs.tools.StoragePolicyAdmin goto :eof +:crypto + set CLASS=org.apache.hadoop.hdfs.tools.CryptoAdmin + goto :eof + @rem This changes %1, %2 etc. Hence those cannot be used after calling this. :make_command_arguments if "%1" == "--config" ( @@ -226,6 +231,7 @@ goto :eof @echo lsSnapshottableDir list all snapshottable dirs owned by the current user @echo Use -help to see options @echo cacheadmin configure the HDFS cache + @echo crypto configure HDFS encryption zones @echo mover run a utility to move block replicas across storage types @echo storagepolicies list/get/set block storage policies @echo.