From 91310102d7582eff705097ff2aacceffaf1994e7 Mon Sep 17 00:00:00 2001 From: Ahmed Hussein <50450311+amahussein@users.noreply.github.com> Date: Wed, 2 Dec 2020 15:38:20 -0600 Subject: [PATCH] HDFS-15703. Don't generate edits for set operations that are no-op (#2508). Contributed by Daryn Sharp and Ahmed Hussein (cherry picked from commit 60201cbf69044a0770390f674d93f57e4bab3880) --- .../hdfs/server/namenode/FSDirAttrOp.java | 22 +++++--- .../hdfs/server/namenode/TestFSDirAttrOp.java | 52 ++++++++++++++++++- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java index c3643e09d90..363f8898f51 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirAttrOp.java @@ -57,15 +57,18 @@ public class FSDirAttrOp { throw new InvalidPathException(src); } INodesInPath iip; + boolean changed; fsd.writeLock(); try { iip = fsd.resolvePath(pc, src, DirOp.WRITE); fsd.checkOwner(pc, iip); - unprotectedSetPermission(fsd, iip, permission); + changed = unprotectedSetPermission(fsd, iip, permission); } finally { fsd.writeUnlock(); } - fsd.getEditLog().logSetPermissions(iip.getPath(), permission); + if (changed) { + fsd.getEditLog().logSetPermissions(iip.getPath(), permission); + } return fsd.getAuditFileInfo(iip); } @@ -76,6 +79,7 @@ public class FSDirAttrOp { throw new InvalidPathException(src); } INodesInPath iip; + boolean changed; fsd.writeLock(); try { iip = fsd.resolvePath(pc, src, DirOp.WRITE); @@ -90,11 +94,13 @@ public class FSDirAttrOp { "User " + pc.getUser() + " does not belong to " + group); } } - unprotectedSetOwner(fsd, iip, username, group); + changed = unprotectedSetOwner(fsd, iip, username, group); } finally { fsd.writeUnlock(); } - fsd.getEditLog().logSetOwner(iip.getPath(), username, group); + if (changed) { + fsd.getEditLog().logSetOwner(iip.getPath(), username, group); + } return fsd.getAuditFileInfo(iip); } @@ -256,28 +262,32 @@ public class FSDirAttrOp { } } - static void unprotectedSetPermission( + static boolean unprotectedSetPermission( FSDirectory fsd, INodesInPath iip, FsPermission permissions) throws FileNotFoundException, UnresolvedLinkException, QuotaExceededException, SnapshotAccessControlException { assert fsd.hasWriteLock(); final INode inode = FSDirectory.resolveLastINode(iip); int snapshotId = iip.getLatestSnapshotId(); + long oldPerm = inode.getPermissionLong(); inode.setPermission(permissions, snapshotId); + return oldPerm != inode.getPermissionLong(); } - static void unprotectedSetOwner( + static boolean unprotectedSetOwner( FSDirectory fsd, INodesInPath iip, String username, String groupname) throws FileNotFoundException, UnresolvedLinkException, QuotaExceededException, SnapshotAccessControlException { assert fsd.hasWriteLock(); final INode inode = FSDirectory.resolveLastINode(iip); + long oldPerm = inode.getPermissionLong(); if (username != null) { inode.setUser(username, iip.getLatestSnapshotId()); } if (groupname != null) { inode.setGroup(groupname, iip.getLatestSnapshotId()); } + return oldPerm != inode.getPermissionLong(); } static boolean setTimes( diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java index 45a785be75e..3d391b04687 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSDirAttrOp.java @@ -20,8 +20,10 @@ package org.apache.hadoop.hdfs.server.namenode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.fs.permission.PermissionStatus; +import org.apache.hadoop.hdfs.DFSUtil; import org.apache.hadoop.hdfs.protocol.QuotaExceededException; -import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.snapshot.SnapshotManager; import org.junit.Test; import org.mockito.Mockito; @@ -57,6 +59,54 @@ public class TestFSDirAttrOp { return FSDirAttrOp.unprotectedSetTimes(fsd, iip, mtime, atime, force); } + private boolean unprotectedSetAttributes(short currPerm, short newPerm) + throws Exception { + return unprotectedSetAttributes(currPerm, newPerm, "user1", "user1", + false); + } + + private boolean unprotectedSetAttributes(short currPerm, short newPerm, + String currUser, String newUser, boolean testChangeOwner) + throws Exception { + String groupName = "testGroup"; + FsPermission originalPerm = new FsPermission(currPerm); + FsPermission updatedPerm = new FsPermission(newPerm); + FSNamesystem fsn = Mockito.mock(FSNamesystem.class); + SnapshotManager ssMgr = Mockito.mock(SnapshotManager.class); + FSDirectory fsd = Mockito.mock(FSDirectory.class); + INodesInPath iip = Mockito.mock(INodesInPath.class); + when(fsd.getFSNamesystem()).thenReturn(fsn); + when(fsn.getSnapshotManager()).thenReturn(ssMgr); + when(ssMgr.getSkipCaptureAccessTimeOnlyChange()).thenReturn(false); + when(fsd.getAccessTimePrecision()).thenReturn(1000L); + when(fsd.hasWriteLock()).thenReturn(Boolean.TRUE); + when(iip.getLatestSnapshotId()).thenReturn(0); + INode inode = new INodeDirectory(1000, DFSUtil.string2Bytes(""), + new PermissionStatus(currUser, "testGroup", originalPerm), 0L); + when(iip.getLastINode()).thenReturn(inode); + return testChangeOwner ? FSDirAttrOp.unprotectedSetOwner(fsd, iip, newUser, + groupName) : FSDirAttrOp.unprotectedSetPermission(fsd, iip, + updatedPerm); + } + + @Test + public void testUnprotectedSetPermissions() throws Exception { + assertTrue("setPermissions return true for updated permissions", + unprotectedSetAttributes((short) 0777, (short) 0)); + assertFalse("setPermissions should return false for same permissions", + unprotectedSetAttributes((short) 0777, (short) 0777)); + } + + @Test + public void testUnprotectedSetOwner() throws Exception { + assertTrue("SetOwner should return true for a new user", + unprotectedSetAttributes((short) 0777, (short) 0777, "user1", + "user2", true)); + assertFalse("SetOwner should return false for same user", + unprotectedSetAttributes((short) 0777, (short) 0777, "user1", + "user1", true)); + } + @Test public void testUnprotectedSetTimes() throws Exception { // atime < access time + precision