You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/03/21 18:39:05 UTC
[1/2] hadoop git commit: HDFS-13250. Addendum to fix branch-2
compilation. RBF: Router to manage requests across multiple subclusters.
Contributed by Inigo Goiri.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 0b6d5a073 -> 8bbd56080
refs/heads/branch-2.9 7432debf4 -> 17596fba2
HDFS-13250. Addendum to fix branch-2 compilation. RBF: Router to manage requests across multiple subclusters. Contributed by Inigo Goiri.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8bbd5608
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8bbd5608
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8bbd5608
Branch: refs/heads/branch-2
Commit: 8bbd560805e658767b82e2f557717e4935c31f9d
Parents: 0b6d5a0
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Mar 21 11:38:17 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Mar 21 11:38:17 2018 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/federation/router/RouterRpcServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8bbd5608/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
index 0504ca2..65f8b74 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
@@ -1163,7 +1163,7 @@ public class RouterRpcServer extends AbstractService implements ClientProtocol {
for (RemoteLocation loc : locations) {
HdfsFileStatus fileStatus = results.get(loc);
if (fileStatus != null) {
- if (!fileStatus.isDirectory()) {
+ if (fileStatus.isDir()) {
return fileStatus;
} else if (dirStatus == null) {
dirStatus = fileStatus;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/2] hadoop git commit: HDFS-13250. Addendum to fix branch-2
compilation. RBF: Router to manage requests across multiple subclusters.
Contributed by Inigo Goiri.
Posted by in...@apache.org.
HDFS-13250. Addendum to fix branch-2 compilation. RBF: Router to manage requests across multiple subclusters. Contributed by Inigo Goiri.
(cherry picked from commit 8bbd560805e658767b82e2f557717e4935c31f9d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/17596fba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/17596fba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/17596fba
Branch: refs/heads/branch-2.9
Commit: 17596fba2d5b673900d7ccd2f1b4f64fdaee88e7
Parents: 7432deb
Author: Inigo Goiri <in...@apache.org>
Authored: Wed Mar 21 11:38:17 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed Mar 21 11:38:43 2018 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/server/federation/router/RouterRpcServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/17596fba/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
index 757042e..12ff2d8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/router/RouterRpcServer.java
@@ -1158,7 +1158,7 @@ public class RouterRpcServer extends AbstractService implements ClientProtocol {
for (RemoteLocation loc : locations) {
HdfsFileStatus fileStatus = results.get(loc);
if (fileStatus != null) {
- if (!fileStatus.isDirectory()) {
+ if (fileStatus.isDir()) {
return fileStatus;
} else if (dirStatus == null) {
dirStatus = fileStatus;
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org