HDFS-11904. Reuse iip in unprotectedRemoveXAttrs calls.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/36914a72 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/36914a72 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/36914a72 Branch: refs/heads/HDFS-7240 Commit: 36914a729122e39629a0c7c6671b44080498cadb Parents: cb622bc Author: Xiao Chen <x...@apache.org> Authored: Thu Jun 1 14:13:57 2017 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Thu Jun 8 10:44:50 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java | 2 +- .../org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java | 5 ++--- .../org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/36914a72/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java index a875e4b..bedbe7d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirErasureCodingOp.java @@ -242,7 +242,7 @@ final class FSDirErasureCodingOp { final List<XAttr> xattrs = Lists.newArrayListWithCapacity(1); xattrs.add(ecXAttr); - FSDirXAttrOp.unprotectedRemoveXAttrs(fsd, srcIIP.getPath(), xattrs); + FSDirXAttrOp.unprotectedRemoveXAttrs(fsd, srcIIP, xattrs); return xattrs; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/36914a72/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java index e5243ee..ddc088c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirXAttrOp.java @@ -170,7 +170,7 @@ class FSDirXAttrOp { src = iip.getPath(); checkXAttrChangeAccess(fsd, iip, xAttr, pc); - List<XAttr> removedXAttrs = unprotectedRemoveXAttrs(fsd, src, xAttrs); + List<XAttr> removedXAttrs = unprotectedRemoveXAttrs(fsd, iip, xAttrs); if (removedXAttrs != null && !removedXAttrs.isEmpty()) { fsd.getEditLog().logRemoveXAttrs(src, removedXAttrs, logRetryCache); } else { @@ -184,10 +184,9 @@ class FSDirXAttrOp { } static List<XAttr> unprotectedRemoveXAttrs( - FSDirectory fsd, final String src, final List<XAttr> toRemove) + FSDirectory fsd, final INodesInPath iip, final List<XAttr> toRemove) throws IOException { assert fsd.hasWriteLock(); - INodesInPath iip = fsd.getINodesInPath(src, DirOp.WRITE); INode inode = FSDirectory.resolveLastINode(iip); int snapshotId = iip.getLatestSnapshotId(); List<XAttr> existingXAttrs = XAttrStorage.readINodeXAttrs(inode); http://git-wip-us.apache.org/repos/asf/hadoop/blob/36914a72/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java index ae0b304..060bd59 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java @@ -931,7 +931,8 @@ public class FSEditLogLoader { } case OP_REMOVE_XATTR: { RemoveXAttrOp removeXAttrOp = (RemoveXAttrOp) op; - FSDirXAttrOp.unprotectedRemoveXAttrs(fsDir, removeXAttrOp.src, + INodesInPath iip = fsDir.getINodesInPath(removeXAttrOp.src, DirOp.WRITE); + FSDirXAttrOp.unprotectedRemoveXAttrs(fsDir, iip, removeXAttrOp.xAttrs); if (toAddRetryCache) { fsNamesys.addCacheEntry(removeXAttrOp.rpcClientId, --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
