Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 41BCB200CA3 for ; Thu, 1 Jun 2017 23:19:32 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4052A160BC4; Thu, 1 Jun 2017 21:19:32 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 86D28160BC1 for ; Thu, 1 Jun 2017 23:19:31 +0200 (CEST) Received: (qmail 34414 invoked by uid 500); 1 Jun 2017 21:19:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 34405 invoked by uid 99); 1 Jun 2017 21:19:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2017 21:19:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D771DFB8A; Thu, 1 Jun 2017 21:19:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xiao@apache.org To: common-commits@hadoop.apache.org Message-Id: <6c66ed6d984242adb4776b74d2d8980b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-11904. Reuse iip in unprotectedRemoveXAttrs calls. Date: Thu, 1 Jun 2017 21:19:30 +0000 (UTC) archived-at: Thu, 01 Jun 2017 21:19:32 -0000 Repository: hadoop Updated Branches: refs/heads/trunk 6a3fc685a -> 219f4c199 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/219f4c19 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/219f4c19 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/219f4c19 Branch: refs/heads/trunk Commit: 219f4c199e45f8ce7f41192493bf0dc8f1e5dc30 Parents: 6a3fc68 Author: Xiao Chen Authored: Thu Jun 1 14:13:57 2017 -0700 Committer: Xiao Chen Committed: Thu Jun 1 14:13:57 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/219f4c19/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 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/219f4c19/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 removedXAttrs = unprotectedRemoveXAttrs(fsd, src, xAttrs); + List 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 unprotectedRemoveXAttrs( - FSDirectory fsd, final String src, final List toRemove) + FSDirectory fsd, final INodesInPath iip, final List toRemove) throws IOException { assert fsd.hasWriteLock(); - INodesInPath iip = fsd.getINodesInPath(src, DirOp.WRITE); INode inode = FSDirectory.resolveLastINode(iip); int snapshotId = iip.getLatestSnapshotId(); List existingXAttrs = XAttrStorage.readINodeXAttrs(inode); http://git-wip-us.apache.org/repos/asf/hadoop/blob/219f4c19/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-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org