Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12312. Rebasing HDFS-10467 (2). Contributed by Inigo Goiri. 

(cherry picked from commit 90ba6843fb)
This commit is contained in:
Inigo Goiri 2017-08-16 17:31:37 -07:00
parent 67d10087af
commit 346c9fce43
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
View File

@ -31,7 +31,6 @@ function hadoop_usage
hadoop_add_option "--hosts filename" "list of hosts to use in worker mode" hadoop_add_option "--hosts filename" "list of hosts to use in worker mode"
hadoop_add_option "--workers" "turn on worker mode" hadoop_add_option "--workers" "turn on worker mode"
<<<<<<< HEAD
hadoop_add_subcommand "balancer" daemon "run a cluster balancing utility" hadoop_add_subcommand "balancer" daemon "run a cluster balancing utility"
hadoop_add_subcommand "cacheadmin" admin "configure the HDFS cache" hadoop_add_subcommand "cacheadmin" admin "configure the HDFS cache"
hadoop_add_subcommand "classpath" client "prints the class path needed to get the hadoop jar and the required libraries" hadoop_add_subcommand "classpath" client "prints the class path needed to get the hadoop jar and the required libraries"

1
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
View File

@ -1946,6 +1946,7 @@ public class RouterRpcServer extends AbstractService implements ClientProtocol {
} }
long inodeId = 0; long inodeId = 0;
return new HdfsFileStatus(0, true, 0, 0, modTime, accessTime, permission, return new HdfsFileStatus(0, true, 0, 0, modTime, accessTime, permission,
EnumSet.noneOf(HdfsFileStatus.Flags.class),
owner, group, new byte[0], DFSUtil.string2Bytes(name), inodeId, owner, group, new byte[0], DFSUtil.string2Bytes(name), inodeId,
childrenNum, null, (byte) 0, null); childrenNum, null, (byte) 0, null);
} }