[26/44] hadoop git commit: Revert "HDFS-13386. RBF: Wrong date information in list file(-ls) result. Contributed by Dibyendu Karmakar."
Revert "HDFS-13386. RBF: Wrong date information in list file(-ls) result. Contributed by Dibyendu Karmakar." This reverts commit 18de6f2042b70f9f0d7a2620c60de022768a7b13. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d272056f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d272056f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d272056f Branch: refs/heads/HDFS-7240 Commit: d272056fcb23f6a9252b19d349acd718d7837079 Parents: 7ed8511 Author: Inigo Goiri Authored: Thu Apr 12 08:42:19 2018 -0700 Committer: Inigo Goiri Committed: Thu Apr 12 08:42:19 2018 -0700 -- .../federation/router/RouterRpcServer.java | 19 +- .../federation/router/TestRouterMountTable.java | 62 +--- 2 files changed, 2 insertions(+), 79 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d272056f/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 0dc2a69..e6d2f5e 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 @@ -2328,24 +2328,7 @@ public class RouterRpcServer extends AbstractService */ private Map getMountPointDates(String path) { Map ret = new TreeMap<>(); -if (subclusterResolver instanceof MountTableResolver) { - MountTableResolver mountTable = (MountTableResolver)subclusterResolver; - String srcPath; - try { -final List children = subclusterResolver.getMountPoints(path); -for (String child : children) { - if (path.equals(Path.SEPARATOR)) { -srcPath = Path.SEPARATOR + child; - } else { -srcPath = path + Path.SEPARATOR + child; - } - MountTable entry = mountTable.getMountPoint(srcPath); - ret.put(child, entry.getDateModified()); -} - } catch (IOException e) { -LOG.error("Cannot get mount point: {}", e.getMessage()); - } -} +// TODO add when we have a Mount Table return ret; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/d272056f/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java index b33b998..c9e28b1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java @@ -17,33 +17,25 @@ */ package org.apache.hadoop.hdfs.server.federation.router; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.protocol.ClientProtocol; -import org.apache.hadoop.hdfs.protocol.DirectoryListing; -import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; +import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder; import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.NamenodeContext; import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.RouterContext; -import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder; import org.apache.hadoop.hdfs.server.federation.StateStoreDFSCluster; import org.apache.hadoop.hdfs.server.federation.resolver.MountTableManager; import org.apache.hadoop.hdfs.server.federation.resolver.MountTableResolver; import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryRequest; import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryResponse; import org.apache.hadoop.hdfs.server.federatio
hadoop git commit: Revert "HDFS-13386. RBF: Wrong date information in list file(-ls) result. Contributed by Dibyendu Karmakar."
Repository: hadoop Updated Branches: refs/heads/trunk 7ed8511ad -> d272056fc Revert "HDFS-13386. RBF: Wrong date information in list file(-ls) result. Contributed by Dibyendu Karmakar." This reverts commit 18de6f2042b70f9f0d7a2620c60de022768a7b13. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d272056f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d272056f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d272056f Branch: refs/heads/trunk Commit: d272056fcb23f6a9252b19d349acd718d7837079 Parents: 7ed8511 Author: Inigo Goiri Authored: Thu Apr 12 08:42:19 2018 -0700 Committer: Inigo Goiri Committed: Thu Apr 12 08:42:19 2018 -0700 -- .../federation/router/RouterRpcServer.java | 19 +- .../federation/router/TestRouterMountTable.java | 62 +--- 2 files changed, 2 insertions(+), 79 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d272056f/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 0dc2a69..e6d2f5e 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 @@ -2328,24 +2328,7 @@ public class RouterRpcServer extends AbstractService */ private Map getMountPointDates(String path) { Map ret = new TreeMap<>(); -if (subclusterResolver instanceof MountTableResolver) { - MountTableResolver mountTable = (MountTableResolver)subclusterResolver; - String srcPath; - try { -final List children = subclusterResolver.getMountPoints(path); -for (String child : children) { - if (path.equals(Path.SEPARATOR)) { -srcPath = Path.SEPARATOR + child; - } else { -srcPath = path + Path.SEPARATOR + child; - } - MountTable entry = mountTable.getMountPoint(srcPath); - ret.put(child, entry.getDateModified()); -} - } catch (IOException e) { -LOG.error("Cannot get mount point: {}", e.getMessage()); - } -} +// TODO add when we have a Mount Table return ret; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/d272056f/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java index b33b998..c9e28b1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java +++ b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterMountTable.java @@ -17,33 +17,25 @@ */ package org.apache.hadoop.hdfs.server.federation.router; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.TreeMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hdfs.protocol.ClientProtocol; -import org.apache.hadoop.hdfs.protocol.DirectoryListing; -import org.apache.hadoop.hdfs.protocol.HdfsFileStatus; +import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder; import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.NamenodeContext; import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster.RouterContext; -import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder; import org.apache.hadoop.hdfs.server.federation.StateStoreDFSCluster; import org.apache.hadoop.hdfs.server.federation.resolver.MountTableManager; import org.apache.hadoop.hdfs.server.federation.resolver.MountTableResolver; import org.apache.hadoop.hdfs.server.federation.store.protocol.AddMountTableEntryRequest; import org.apache.hadoop.hdfs.server.federation.store.protoco