From 503849477a7c1655fbfc922593c20c3d8a9891ba Mon Sep 17 00:00:00 2001 From: Inigo Goiri Date: Wed, 16 Aug 2017 17:31:37 -0700 Subject: [PATCH] HDFS-12312. Rebasing HDFS-10467 (2). Contributed by Inigo Goiri. (cherry picked from commit 90ba6843fb3ac5dc7576535e66a75a5e3433247b) --- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 1 - .../hadoop/hdfs/server/federation/router/RouterRpcServer.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index d51a8e2e3db..d122ff7b5c2 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs @@ -31,7 +31,6 @@ function hadoop_usage hadoop_add_option "--hosts filename" "list of hosts to use in worker mode" hadoop_add_option "--workers" "turn on worker mode" -<<<<<<< HEAD hadoop_add_subcommand "balancer" daemon "run a cluster balancing utility" 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" diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java index eaaab39043a..c77d255dab0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java @@ -1946,6 +1946,7 @@ private HdfsFileStatus getMountPointStatus( } long inodeId = 0; return new HdfsFileStatus(0, true, 0, 0, modTime, accessTime, permission, + EnumSet.noneOf(HdfsFileStatus.Flags.class), owner, group, new byte[0], DFSUtil.string2Bytes(name), inodeId, childrenNum, null, (byte) 0, null); }