[2/2] hadoop git commit: HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp.
HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp. (cherry picked from commit 7c1a1834e49cf88c64837d92b78bbc07ea9e9efc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db6dfeca Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db6dfeca Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db6dfeca Branch: refs/heads/branch-2.8 Commit: db6dfeca1a7d0ea863646384e31ca4f864f96b3f Parents: 689bbad Author: Kihwal LeeAuthored: Tue Nov 1 08:26:25 2016 -0500 Committer: Kihwal Lee Committed: Tue Nov 1 08:26:25 2016 -0500 -- .../CacheReplicationMonitor.java| 14 +- .../hdfs/server/namenode/CacheManager.java | 8 +- .../server/namenode/EncryptionZoneManager.java | 3 +- .../hadoop/hdfs/server/namenode/FSDirAclOp.java | 28 ++- .../hdfs/server/namenode/FSDirAppendOp.java | 3 +- .../hdfs/server/namenode/FSDirAttrOp.java | 20 +- .../hdfs/server/namenode/FSDirConcatOp.java | 8 +- .../hdfs/server/namenode/FSDirDeleteOp.java | 15 +- .../server/namenode/FSDirEncryptionZoneOp.java | 5 +- .../hdfs/server/namenode/FSDirMkdirOp.java | 18 +- .../hdfs/server/namenode/FSDirRenameOp.java | 24 +-- .../hdfs/server/namenode/FSDirSnapshotOp.java | 17 +- .../server/namenode/FSDirStatAndListingOp.java | 49 ++--- .../hdfs/server/namenode/FSDirSymlinkOp.java| 3 +- .../hdfs/server/namenode/FSDirTruncateOp.java | 9 +- .../hdfs/server/namenode/FSDirWriteFileOp.java | 3 +- .../hdfs/server/namenode/FSDirXAttrOp.java | 12 +- .../hdfs/server/namenode/FSDirectory.java | 191 +++ .../hdfs/server/namenode/FSEditLogLoader.java | 52 ++--- .../hdfs/server/namenode/FSImageFormat.java | 17 +- .../hdfs/server/namenode/FSNamesystem.java | 21 +- .../server/namenode/FSPermissionChecker.java| 165 .../hdfs/server/namenode/INodesInPath.java | 90 +++-- .../namenode/snapshot/SnapshotManager.java | 5 +- .../org/apache/hadoop/hdfs/TestFileStatus.java | 4 +- .../hadoop/hdfs/TestReservedRawPaths.java | 5 +- .../hdfs/server/namenode/FSAclBaseTest.java | 7 +- .../hdfs/server/namenode/NameNodeAdapter.java | 5 +- .../hdfs/server/namenode/TestFSDirectory.java | 37 ++-- .../namenode/TestFSPermissionChecker.java | 5 +- .../hdfs/server/namenode/TestFileTruncate.java | 5 +- .../hadoop/hdfs/server/namenode/TestFsck.java | 7 +- .../server/namenode/TestGetBlockLocations.java | 5 +- .../server/namenode/TestSnapshotPathINodes.java | 8 + .../namenode/snapshot/SnapshotTestHelper.java | 10 +- .../snapshot/TestSnapshotReplication.java | 3 +- .../hadoop/security/TestPermissionSymlinks.java | 7 +- 37 files changed, 505 insertions(+), 383 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/db6dfeca/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java index ca8d72a..3d13be0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java @@ -35,7 +35,6 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.fs.UnresolvedLinkException; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.CacheDirective; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor.CachedBlocksList.Type; @@ -44,6 +43,7 @@ import org.apache.hadoop.hdfs.server.namenode.CacheManager; import org.apache.hadoop.hdfs.server.namenode.CachePool; import org.apache.hadoop.hdfs.server.namenode.CachedBlock; import org.apache.hadoop.hdfs.server.namenode.FSDirectory; +import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.INode; import org.apache.hadoop.hdfs.server.namenode.INodeDirectory; @@ -56,7 +56,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -; /** * Scans the namesystem, scheduling blocks to be cached as
[2/2] hadoop git commit: HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp.
HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c1a1834 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c1a1834 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c1a1834 Branch: refs/heads/branch-2 Commit: 7c1a1834e49cf88c64837d92b78bbc07ea9e9efc Parents: f0d4d7a Author: Kihwal LeeAuthored: Tue Nov 1 08:04:54 2016 -0500 Committer: Kihwal Lee Committed: Tue Nov 1 08:04:54 2016 -0500 -- .../CacheReplicationMonitor.java| 14 +- .../hdfs/server/namenode/CacheManager.java | 8 +- .../server/namenode/EncryptionZoneManager.java | 3 +- .../hadoop/hdfs/server/namenode/FSDirAclOp.java | 28 ++- .../hdfs/server/namenode/FSDirAppendOp.java | 3 +- .../hdfs/server/namenode/FSDirAttrOp.java | 20 +- .../hdfs/server/namenode/FSDirConcatOp.java | 8 +- .../hdfs/server/namenode/FSDirDeleteOp.java | 15 +- .../server/namenode/FSDirEncryptionZoneOp.java | 5 +- .../hdfs/server/namenode/FSDirMkdirOp.java | 18 +- .../hdfs/server/namenode/FSDirRenameOp.java | 24 +-- .../hdfs/server/namenode/FSDirSnapshotOp.java | 17 +- .../server/namenode/FSDirStatAndListingOp.java | 49 ++--- .../hdfs/server/namenode/FSDirSymlinkOp.java| 3 +- .../hdfs/server/namenode/FSDirTruncateOp.java | 9 +- .../hdfs/server/namenode/FSDirWriteFileOp.java | 3 +- .../hdfs/server/namenode/FSDirXAttrOp.java | 12 +- .../hdfs/server/namenode/FSDirectory.java | 191 +++ .../hdfs/server/namenode/FSEditLogLoader.java | 52 ++--- .../hdfs/server/namenode/FSImageFormat.java | 17 +- .../hdfs/server/namenode/FSNamesystem.java | 21 +- .../server/namenode/FSPermissionChecker.java| 165 .../hdfs/server/namenode/INodesInPath.java | 90 +++-- .../namenode/snapshot/SnapshotManager.java | 5 +- .../org/apache/hadoop/hdfs/TestFileStatus.java | 4 +- .../hadoop/hdfs/TestReservedRawPaths.java | 5 +- .../hdfs/server/namenode/FSAclBaseTest.java | 7 +- .../hdfs/server/namenode/NameNodeAdapter.java | 5 +- .../hdfs/server/namenode/TestFSDirectory.java | 37 ++-- .../namenode/TestFSPermissionChecker.java | 5 +- .../hdfs/server/namenode/TestFileTruncate.java | 5 +- .../hadoop/hdfs/server/namenode/TestFsck.java | 7 +- .../server/namenode/TestGetBlockLocations.java | 5 +- .../server/namenode/TestSnapshotPathINodes.java | 8 + .../namenode/snapshot/SnapshotTestHelper.java | 10 +- .../snapshot/TestSnapshotReplication.java | 3 +- .../hadoop/security/TestPermissionSymlinks.java | 7 +- 37 files changed, 505 insertions(+), 383 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c1a1834/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java index 8563cf3..35e4a2e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java @@ -35,7 +35,6 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.fs.UnresolvedLinkException; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.CacheDirective; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor.CachedBlocksList.Type; @@ -44,6 +43,7 @@ import org.apache.hadoop.hdfs.server.namenode.CacheManager; import org.apache.hadoop.hdfs.server.namenode.CachePool; import org.apache.hadoop.hdfs.server.namenode.CachedBlock; import org.apache.hadoop.hdfs.server.namenode.FSDirectory; +import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.INode; import org.apache.hadoop.hdfs.server.namenode.INodeDirectory; @@ -56,7 +56,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -; /** * Scans the namesystem, scheduling blocks to be cached as appropriate. @@ -334,12 +333,11 @@ public class CacheReplicationMonitor extends
[2/2] hadoop git commit: HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp.
HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9d175853 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9d175853 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9d175853 Branch: refs/heads/trunk Commit: 9d175853b0170683ad5f21d9bcdeaac49fe89e04 Parents: a1a0281 Author: Kihwal LeeAuthored: Mon Oct 24 17:14:51 2016 -0500 Committer: Kihwal Lee Committed: Mon Oct 24 17:14:51 2016 -0500 -- .../CacheReplicationMonitor.java| 14 +- .../hdfs/server/namenode/CacheManager.java | 8 +- .../server/namenode/EncryptionZoneManager.java | 3 +- .../hadoop/hdfs/server/namenode/FSDirAclOp.java | 28 ++- .../hdfs/server/namenode/FSDirAppendOp.java | 3 +- .../hdfs/server/namenode/FSDirAttrOp.java | 20 +- .../hdfs/server/namenode/FSDirConcatOp.java | 8 +- .../hdfs/server/namenode/FSDirDeleteOp.java | 15 +- .../server/namenode/FSDirEncryptionZoneOp.java | 5 +- .../server/namenode/FSDirErasureCodingOp.java | 5 +- .../hdfs/server/namenode/FSDirMkdirOp.java | 18 +- .../hdfs/server/namenode/FSDirRenameOp.java | 24 +-- .../hdfs/server/namenode/FSDirSnapshotOp.java | 17 +- .../server/namenode/FSDirStatAndListingOp.java | 49 ++--- .../hdfs/server/namenode/FSDirSymlinkOp.java| 3 +- .../hdfs/server/namenode/FSDirTruncateOp.java | 9 +- .../hdfs/server/namenode/FSDirWriteFileOp.java | 3 +- .../hdfs/server/namenode/FSDirXAttrOp.java | 12 +- .../hdfs/server/namenode/FSDirectory.java | 191 +++ .../hdfs/server/namenode/FSEditLogLoader.java | 54 +++--- .../hdfs/server/namenode/FSImageFormat.java | 17 +- .../hdfs/server/namenode/FSNamesystem.java | 21 +- .../server/namenode/FSPermissionChecker.java| 165 .../hdfs/server/namenode/INodesInPath.java | 90 +++-- .../namenode/snapshot/SnapshotManager.java | 5 +- .../org/apache/hadoop/hdfs/TestFileStatus.java | 4 +- .../hadoop/hdfs/TestReservedRawPaths.java | 5 +- .../hdfs/server/namenode/FSAclBaseTest.java | 7 +- .../hdfs/server/namenode/NameNodeAdapter.java | 5 +- .../hdfs/server/namenode/TestFSDirectory.java | 37 ++-- .../namenode/TestFSPermissionChecker.java | 5 +- .../hdfs/server/namenode/TestFileTruncate.java | 5 +- .../hadoop/hdfs/server/namenode/TestFsck.java | 6 +- .../server/namenode/TestGetBlockLocations.java | 5 +- .../server/namenode/TestSnapshotPathINodes.java | 8 + .../namenode/snapshot/SnapshotTestHelper.java | 10 +- .../snapshot/TestSnapshotReplication.java | 3 +- .../hadoop/security/TestPermissionSymlinks.java | 7 +- 38 files changed, 509 insertions(+), 385 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9d175853/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java -- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java index 8563cf3..35e4a2e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java @@ -35,7 +35,6 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.fs.UnresolvedLinkException; import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.hdfs.protocol.CacheDirective; import org.apache.hadoop.hdfs.server.blockmanagement.DatanodeDescriptor.CachedBlocksList.Type; @@ -44,6 +43,7 @@ import org.apache.hadoop.hdfs.server.namenode.CacheManager; import org.apache.hadoop.hdfs.server.namenode.CachePool; import org.apache.hadoop.hdfs.server.namenode.CachedBlock; import org.apache.hadoop.hdfs.server.namenode.FSDirectory; +import org.apache.hadoop.hdfs.server.namenode.FSDirectory.DirOp; import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.INode; import org.apache.hadoop.hdfs.server.namenode.INodeDirectory; @@ -56,7 +56,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -; /** * Scans the namesystem, scheduling blocks to be cached as appropriate. @@ -334,12