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)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/77a10e76
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/77a10e76
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/77a10e76
Branch: refs/heads/sjlee/hdfs-merge
Commit: 77a10e76e99c14cd26ebb3664304f6ed9cc7bf65
Parents: 2d5e60f
Author: cnauroth <cnaur...@apache.org>
Authored: Wed May 27 22:54:00 2015 -0700
Committer: Sangjin Lee <sj...@apache.org>
Committed: Thu Aug 13 18:41:50 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/77a10e76/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 69424ed..453a023 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd
@@ -47,7 +47,7 @@ if "%1" == "--config" (
goto print_usage
)
- set hdfscommands=dfs namenode secondarynamenode journalnode zkfc datanode
dfsadmin haadmin fsck balancer jmxget oiv oev fetchdt getconf groups
snapshotDiff lsSnapshottableDir cacheadmin mover storagepolicies
+ set hdfscommands=dfs namenode secondarynamenode journalnode zkfc datanode
dfsadmin haadmin fsck balancer jmxget oiv oev fetchdt getconf groups
snapshotDiff lsSnapshottableDir cacheadmin mover storagepolicies crypto
for %%i in ( %hdfscommands% ) do (
if %hdfs-command% == %%i set hdfscommand=true
)
@@ -159,6 +159,10 @@ goto :eof
set CLASS=org.apache.hadoop.hdfs.tools.GetStoragePolicies
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" (
@@ -207,6 +211,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 get all the existing block storage policies
@echo.
