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 31A87200D1E for ; Tue, 3 Oct 2017 23:23:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 30435160BD5; Tue, 3 Oct 2017 21:23:55 +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 773861609BD for ; Tue, 3 Oct 2017 23:23:54 +0200 (CEST) Received: (qmail 2881 invoked by uid 500); 3 Oct 2017 21:23:22 -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 1180 invoked by uid 99); 3 Oct 2017 21:23:21 -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; Tue, 03 Oct 2017 21:23:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FD3DF5C55; Tue, 3 Oct 2017 21:23:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kkaranasos@apache.org To: common-commits@hadoop.apache.org Date: Tue, 03 Oct 2017 21:23:57 -0000 Message-Id: In-Reply-To: <39eba03e94fd4c5b9ffdcae8c69f6563@git.apache.org> References: <39eba03e94fd4c5b9ffdcae8c69f6563@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [40/50] [abbrv] hadoop git commit: HDFS-12569. Unset EC policy logs empty payload in edit log. (Lei (Eddy) Xu) archived-at: Tue, 03 Oct 2017 21:23:55 -0000 HDFS-12569. Unset EC policy logs empty payload in edit log. (Lei (Eddy) Xu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/27ffd43b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/27ffd43b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/27ffd43b Branch: refs/heads/YARN-6592 Commit: 27ffd43b6419c9ebe697536bcb6abb858ce791d2 Parents: 280080f Author: Lei Xu Authored: Mon Oct 2 15:31:20 2017 -0700 Committer: Lei Xu Committed: Mon Oct 2 15:35:49 2017 -0700 ---------------------------------------------------------------------- .../hdfs/server/namenode/FSDirErasureCodingOp.java | 3 +-- .../hadoop/hdfs/server/namenode/FSDirXAttrOp.java | 4 ++++ .../hdfs/TestUnsetAndChangeDirectoryEcPolicy.java | 13 +++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/27ffd43b/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 181b147..391e392 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 @@ -298,8 +298,7 @@ final class FSDirErasureCodingOp { final List xattrs = Lists.newArrayListWithCapacity(1); xattrs.add(ecXAttr); - FSDirXAttrOp.unprotectedRemoveXAttrs(fsd, srcIIP, xattrs); - return xattrs; + return FSDirXAttrOp.unprotectedRemoveXAttrs(fsd, srcIIP, xattrs); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/27ffd43b/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 acdade7..3223467 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 @@ -184,6 +184,10 @@ class FSDirXAttrOp { return fsd.getAuditFileInfo(iip); } + /** + * Remove xattrs from the inode, and return the removed xattrs. + * @return the removed xattrs. + */ static List unprotectedRemoveXAttrs( FSDirectory fsd, final INodesInPath iip, final List toRemove) throws IOException { http://git-wip-us.apache.org/repos/asf/hadoop/blob/27ffd43b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestUnsetAndChangeDirectoryEcPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestUnsetAndChangeDirectoryEcPolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestUnsetAndChangeDirectoryEcPolicy.java index 529a110..52cf163 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestUnsetAndChangeDirectoryEcPolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestUnsetAndChangeDirectoryEcPolicy.java @@ -362,4 +362,17 @@ public class TestUnsetAndChangeDirectoryEcPolicy { + ecFilePath, e); } } + + /** + * Test unsetEcPolicy is persisted correctly in edit log. + */ + @Test + public void testUnsetEcPolicyInEditLog() throws IOException { + fs.getClient().setErasureCodingPolicy("/", ecPolicy.getName()); + Assert.assertEquals(ecPolicy, fs.getErasureCodingPolicy(new Path("/"))); + fs.getClient().unsetErasureCodingPolicy("/"); + + cluster.restartNameNode(true); + Assert.assertNull(fs.getErasureCodingPolicy(new Path("/"))); + } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org