From 84fe1c04088cee01a4e24cef75a2635d34ac34c9 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Tue, 23 Nov 2021 21:09:14 +0800 Subject: [PATCH 01/15] 'improvecode' --- .../apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 27dcf01ee92c5..caf3d4d4497fb 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -1063,14 +1063,10 @@ static FSNamesystem loadFromDisk(Configuration conf) throws IOException { Preconditions.checkArgument(blockDeletionIncrement > 0, DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY + " must be a positive integer."); - } catch(IOException e) { + } catch(IOException | RuntimeException e) { LOG.error(getClass().getSimpleName() + " initialization failed.", e); close(); throw e; - } catch (RuntimeException re) { - LOG.error(getClass().getSimpleName() + " initialization failed.", re); - close(); - throw re; } } From f634108ecc95809bd5d5e808959fec9d31d2835a Mon Sep 17 00:00:00 2001 From: gf13871 Date: Tue, 23 Nov 2021 21:33:29 +0800 Subject: [PATCH 02/15] 'improvecode1' --- .../apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index caf3d4d4497fb..f603b58358b88 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -1063,10 +1063,14 @@ static FSNamesystem loadFromDisk(Configuration conf) throws IOException { Preconditions.checkArgument(blockDeletionIncrement > 0, DFSConfigKeys.DFS_NAMENODE_BLOCK_DELETION_INCREMENT_KEY + " must be a positive integer."); - } catch(IOException | RuntimeException e) { + } catch(IOException e) { LOG.error(getClass().getSimpleName() + " initialization failed.", e); close(); throw e; + } catch (RuntimeException re) { + LOG.error(getClass().getSimpleName() + " initialization failed.", re); + close(); + throw re; } } @@ -8606,7 +8610,7 @@ void checkAccess(String src, FsAction mode) throws IOException { src = iip.getPath(); INode inode = iip.getLastINode(); if (inode == null) { - throw new FileNotFoundException("Path not found"); + throw new FileNotFoundException("Path not found: " + iip.getPath()); } if (isPermissionEnabled) { dir.checkPathAccess(pc, iip, mode); From e4fb5ce5b18447840e99529bba9e0947082ee5ae Mon Sep 17 00:00:00 2001 From: gf13871 Date: Tue, 23 Nov 2021 21:41:09 +0800 Subject: [PATCH 03/15] 'modifyvariable' --- .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index f603b58358b88..f274d27ac35fc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -8610,7 +8610,7 @@ void checkAccess(String src, FsAction mode) throws IOException { src = iip.getPath(); INode inode = iip.getLastINode(); if (inode == null) { - throw new FileNotFoundException("Path not found: " + iip.getPath()); + throw new FileNotFoundException("Path not found: " + src); } if (isPermissionEnabled) { dir.checkPathAccess(pc, iip, mode); From 84386f92ad9e917f2e30760c436db855eb97226f Mon Sep 17 00:00:00 2001 From: gf13871 Date: Wed, 24 Nov 2021 10:23:04 +0800 Subject: [PATCH 04/15] 'addtestcase' --- .../server/namenode/TestFSNamesystem.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java index f2f42440240cd..0f702656364e9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java @@ -26,6 +26,7 @@ import static org.junit.Assert.*; import java.io.File; +import java.io.FileNotFoundException; import java.io.IOException; import java.net.InetAddress; import java.net.URI; @@ -34,6 +35,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileUtil; +import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.ha.HAServiceProtocol; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSTestUtil; @@ -46,6 +48,7 @@ import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot; import org.apache.hadoop.hdfs.server.namenode.top.TopAuditLogger; import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo; +import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.Whitebox; import org.junit.After; import org.junit.Test; @@ -120,6 +123,23 @@ public void testStartupSafemode() throws IOException { + "isInSafeMode still returned false", fsn.isInSafeMode()); } + @Test + public void testCheckAccess() throws IOException { + Configuration conf = new Configuration(); + FSImage fsImage = Mockito.mock(FSImage.class); + FSEditLog fsEditLog = Mockito.mock(FSEditLog.class); + Mockito.when(fsImage.getEditLog()).thenReturn(fsEditLog); + String src = "/test1"; + FSNamesystem fsn = new FSNamesystem(conf, fsImage); + try { + fsn.checkAccess(src, FsAction.READ); + fail("Failed to get expected FileNotFoundException"); + } catch (FileNotFoundException e) { + GenericTestUtils.assertExceptionContains( + "Path not found: " + src, e); + } + } + @Test public void testReplQueuesActiveAfterStartupSafemode() throws IOException, InterruptedException{ Configuration conf = new Configuration(); From d8aa3b377e0d5218c7745b7fd33972f00ff1ca3a Mon Sep 17 00:00:00 2001 From: gf13871 Date: Wed, 24 Nov 2021 16:04:15 +0800 Subject: [PATCH 05/15] 'triggerbuild' From 912a139c9203e9e24f332541e53a0180a8d12c91 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Wed, 24 Nov 2021 23:51:16 +0800 Subject: [PATCH 06/15] 'addDFSPermission' --- .../apache/hadoop/hdfs/TestDFSPermission.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 15ce06b69fb6f..5f5e60780affd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -30,6 +30,7 @@ import java.util.Map; import java.util.Random; +import org.apache.hadoop.test.GenericTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; @@ -260,6 +261,33 @@ private void createAndCheckPermission(OpType op, Path name, short umask, checkPermission(name, expectedPermission, delete); } + @Test + public void testFSNamesystemCheckAccess() throws Exception { + Path testValidDir = new Path("/test1"); + Path testValidFile = new Path("/test1/file1"); + Path testInvalidPath = new Path("/test2"); + fs = FileSystem.get(conf); + + fs.mkdirs(testValidDir); + fs.create(testValidFile); + + fs.access(testValidDir,FsAction.READ); + fs.access(testValidFile,FsAction.READ); + + assertTrue(fs.exists(testValidDir)); + assertTrue(fs.exists(testValidFile)); + + try { + fs.access(testInvalidPath,FsAction.READ); + fail("Failed to get expected FileNotFoundException"); + } catch (FileNotFoundException e) { + GenericTestUtils.assertExceptionContains( + "Path not found: " + testInvalidPath, e); + } finally { + fs.delete(testValidDir,true); + } + } + /* Check if the permission of a file/directory is the same as the * expected permission; If the delete flag is true, delete the * file/directory afterwards. @@ -289,7 +317,7 @@ public void testImmutableFsPermission() throws IOException { fs.setPermission(new Path("/"), FsPermission.createImmutable((short)0777)); } - + @Test(timeout=30000) public void testTrashPermission() throws Exception { // /BSS user1:group2 777 From d66e0cbf9f17d87802f269e9c0f097a18c3862f7 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Thu, 25 Nov 2021 10:35:08 +0800 Subject: [PATCH 07/15] 'triggerrebuild' From 85c52244442041d3e61815ea4a3160b4fbf03b8a Mon Sep 17 00:00:00 2001 From: gf13871 Date: Fri, 26 Nov 2021 10:13:41 +0800 Subject: [PATCH 08/15] 'fixcheckstyle' --- .../java/org/apache/hadoop/hdfs/TestDFSPermission.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 5f5e60780affd..ad64f84887ae8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -271,20 +271,20 @@ public void testFSNamesystemCheckAccess() throws Exception { fs.mkdirs(testValidDir); fs.create(testValidFile); - fs.access(testValidDir,FsAction.READ); - fs.access(testValidFile,FsAction.READ); + fs.access(testValidDir, FsAction.READ); + fs.access(testValidFile, FsAction.READ); assertTrue(fs.exists(testValidDir)); assertTrue(fs.exists(testValidFile)); try { - fs.access(testInvalidPath,FsAction.READ); + fs.access(testInvalidPath, FsAction.READ); fail("Failed to get expected FileNotFoundException"); } catch (FileNotFoundException e) { GenericTestUtils.assertExceptionContains( "Path not found: " + testInvalidPath, e); } finally { - fs.delete(testValidDir,true); + fs.delete(testValidDir, true); } } From 561b3701ff2b2c64bc2f26fcd4540a4e73b1ba72 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Fri, 26 Nov 2021 19:19:18 +0800 Subject: [PATCH 09/15] 'triggerrebuild' From fef812b66362048492c8bced1dbbbd323704c3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=94=E5=8F=91=E4=B8=AD=E5=BF=83-=E9=83=AD=E9=A3=9E-ph?= =?UTF-8?q?ilipse?= Date: Sat, 4 Dec 2021 16:08:16 +0800 Subject: [PATCH 10/15] fixcomment --- .../ha/TestRequestHedgingProxyProvider.java | 2 +- .../apache/hadoop/hdfs/TestDFSPermission.java | 27 ++++--------------- .../server/namenode/TestFSNamesystem.java | 20 -------------- 3 files changed, 6 insertions(+), 43 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java index 346f79cee9903..dc9b0d637ad1c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java @@ -37,7 +37,7 @@ import org.apache.hadoop.ipc.StandbyException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.test.GenericTestUtils; -import org.apache.hadoop.test.LambdaTestUtils; +`import org.apache.hadoop.test.LambdaTestUtils;` import org.apache.hadoop.util.Lists; import org.apache.hadoop.util.Time; import org.junit.Assert; diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index ad64f84887ae8..0e86fabeb41fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -30,9 +30,9 @@ import java.util.Map; import java.util.Random; -import org.apache.hadoop.test.GenericTestUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.apache.hadoop.test.LambdaTestUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FSDataInputStream; @@ -262,30 +262,13 @@ private void createAndCheckPermission(OpType op, Path name, short umask, } @Test - public void testFSNamesystemCheckAccess() throws Exception { - Path testValidDir = new Path("/test1"); - Path testValidFile = new Path("/test1/file1"); + public void testFSNamesystemCheckAccess(){ Path testInvalidPath = new Path("/test2"); fs = FileSystem.get(conf); - fs.mkdirs(testValidDir); - fs.create(testValidFile); - - fs.access(testValidDir, FsAction.READ); - fs.access(testValidFile, FsAction.READ); - - assertTrue(fs.exists(testValidDir)); - assertTrue(fs.exists(testValidFile)); - - try { - fs.access(testInvalidPath, FsAction.READ); - fail("Failed to get expected FileNotFoundException"); - } catch (FileNotFoundException e) { - GenericTestUtils.assertExceptionContains( - "Path not found: " + testInvalidPath, e); - } finally { - fs.delete(testValidDir, true); - } + LambdaTestUtils.intercept(FileNotFoundException.class, + "Path not found: " + testInvalidPath, + () -> fs.access(testInvalidPath, FsAction.READ)); } /* Check if the permission of a file/directory is the same as the diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java index 0f702656364e9..f2f42440240cd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystem.java @@ -26,7 +26,6 @@ import static org.junit.Assert.*; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.net.InetAddress; import java.net.URI; @@ -35,7 +34,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.ha.HAServiceProtocol; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSTestUtil; @@ -48,7 +46,6 @@ import org.apache.hadoop.hdfs.server.namenode.snapshot.Snapshot; import org.apache.hadoop.hdfs.server.namenode.top.TopAuditLogger; import org.apache.hadoop.hdfs.server.protocol.NamespaceInfo; -import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.test.Whitebox; import org.junit.After; import org.junit.Test; @@ -123,23 +120,6 @@ public void testStartupSafemode() throws IOException { + "isInSafeMode still returned false", fsn.isInSafeMode()); } - @Test - public void testCheckAccess() throws IOException { - Configuration conf = new Configuration(); - FSImage fsImage = Mockito.mock(FSImage.class); - FSEditLog fsEditLog = Mockito.mock(FSEditLog.class); - Mockito.when(fsImage.getEditLog()).thenReturn(fsEditLog); - String src = "/test1"; - FSNamesystem fsn = new FSNamesystem(conf, fsImage); - try { - fsn.checkAccess(src, FsAction.READ); - fail("Failed to get expected FileNotFoundException"); - } catch (FileNotFoundException e) { - GenericTestUtils.assertExceptionContains( - "Path not found: " + src, e); - } - } - @Test public void testReplQueuesActiveAfterStartupSafemode() throws IOException, InterruptedException{ Configuration conf = new Configuration(); From ea3260ee1f7293b524677b5da69911223bc84eea Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 4 Dec 2021 16:13:29 +0800 Subject: [PATCH 11/15] removeuselesscode --- .../hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java index dc9b0d637ad1c..3c5135c42453d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java @@ -37,7 +37,6 @@ import org.apache.hadoop.ipc.StandbyException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.test.GenericTestUtils; -`import org.apache.hadoop.test.LambdaTestUtils;` import org.apache.hadoop.util.Lists; import org.apache.hadoop.util.Time; import org.junit.Assert; From ddcee713fbb497142337f97b1b90d0a8f004c551 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 4 Dec 2021 16:16:00 +0800 Subject: [PATCH 12/15] removeuselesscode1 --- .../hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java index 3c5135c42453d..346f79cee9903 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestRequestHedgingProxyProvider.java @@ -37,6 +37,7 @@ import org.apache.hadoop.ipc.StandbyException; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.test.GenericTestUtils; +import org.apache.hadoop.test.LambdaTestUtils; import org.apache.hadoop.util.Lists; import org.apache.hadoop.util.Time; import org.junit.Assert; From bc99edc3fabdacb06534b817a9b54bcc9e704687 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sat, 4 Dec 2021 17:33:59 +0800 Subject: [PATCH 13/15] fixcomments --- .../test/java/org/apache/hadoop/hdfs/TestDFSPermission.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 0e86fabeb41fd..08cf258e07e67 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -32,7 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.hadoop.test.LambdaTestUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.fs.FSDataInputStream; @@ -45,6 +44,7 @@ import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.test.LambdaTestUtils; import org.apache.hadoop.util.Time; import org.junit.After; import org.junit.Before; @@ -262,7 +262,7 @@ private void createAndCheckPermission(OpType op, Path name, short umask, } @Test - public void testFSNamesystemCheckAccess(){ + public void testFSNamesystemCheckAccess() throws Exception{ Path testInvalidPath = new Path("/test2"); fs = FileSystem.get(conf); @@ -300,7 +300,7 @@ public void testImmutableFsPermission() throws IOException { fs.setPermission(new Path("/"), FsPermission.createImmutable((short)0777)); } - + @Test(timeout=30000) public void testTrashPermission() throws Exception { // /BSS user1:group2 777 From 74ba003ccf45f5e4e7cb98974ea3425585bdcb11 Mon Sep 17 00:00:00 2001 From: guophilipse Date: Sun, 5 Dec 2021 22:33:18 +0800 Subject: [PATCH 14/15] fixcheckstyle --- .../test/java/org/apache/hadoop/hdfs/TestDFSPermission.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 08cf258e07e67..846b9bc0fd27a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -266,8 +266,8 @@ public void testFSNamesystemCheckAccess() throws Exception{ Path testInvalidPath = new Path("/test2"); fs = FileSystem.get(conf); - LambdaTestUtils.intercept(FileNotFoundException.class, - "Path not found: " + testInvalidPath, + LambdaTestUtils.intercept( + FileNotFoundException.class, "Path not found: " + testInvalidPath, () -> fs.access(testInvalidPath, FsAction.READ)); } From d421fcd525d7e753fa863bf35b0443c20377f533 Mon Sep 17 00:00:00 2001 From: guophilipse Date: Mon, 6 Dec 2021 13:41:33 +0800 Subject: [PATCH 15/15] fixstyles --- .../test/java/org/apache/hadoop/hdfs/TestDFSPermission.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java index 846b9bc0fd27a..818f7568e9e1b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSPermission.java @@ -267,8 +267,9 @@ public void testFSNamesystemCheckAccess() throws Exception{ fs = FileSystem.get(conf); LambdaTestUtils.intercept( - FileNotFoundException.class, "Path not found: " + testInvalidPath, - () -> fs.access(testInvalidPath, FsAction.READ)); + FileNotFoundException.class, + "Path not found: " + testInvalidPath, + () -> fs.access(testInvalidPath, FsAction.READ)); } /* Check if the permission of a file/directory is the same as the