goiri commented on a change in pull request #1954: HDFS-15217 Add more information to longest write/read lock held log URL: https://github.com/apache/hadoop/pull/1954#discussion_r407605437
########## File path: hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSNamesystemLockReport.java ########## @@ -0,0 +1,185 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.hdfs.server.namenode; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FSDataInputStream; +import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.hdfs.DFSTestUtil; +import org.apache.hadoop.hdfs.HdfsConfiguration; +import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.test.GenericTestUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.slf4j.LoggerFactory; + +import java.security.PrivilegedExceptionAction; + +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_LOCK_SUPPRESS_WARNING_INTERVAL_KEY; +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_READ_LOCK_REPORTING_THRESHOLD_MS_KEY; +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_WRITE_LOCK_REPORTING_THRESHOLD_MS_KEY; +import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_PERMISSIONS_SUPERUSERGROUP_KEY; +import static org.junit.Assert.assertTrue; + +public class TestFSNamesystemLockReport { + + @FunctionalInterface + private interface SupplierWithException<T> { + T get() throws Exception; + } + + @FunctionalInterface + private interface Procedure { + void invoke() throws Exception; + } + + private Configuration conf; + private MiniDFSCluster cluster; + private FileSystem fs; + private UserGroupInformation userGroupInfo; + private GenericTestUtils.LogCapturer logs; + + @Before + public void setUp() throws Exception { + conf = new HdfsConfiguration(); + conf.set(DFS_PERMISSIONS_SUPERUSERGROUP_KEY, "hadoop"); + + // Make the lock report always shown + conf.setLong(DFS_NAMENODE_READ_LOCK_REPORTING_THRESHOLD_MS_KEY, 0); + conf.setLong(DFS_NAMENODE_WRITE_LOCK_REPORTING_THRESHOLD_MS_KEY, 0); + conf.setLong(DFS_LOCK_SUPPRESS_WARNING_INTERVAL_KEY, 0); + + cluster = new MiniDFSCluster.Builder(conf).numDataNodes(4).build(); + fs = cluster.getFileSystem(); + + userGroupInfo = UserGroupInformation.createUserForTesting("bob", + new String[] {"hadoop"}); + + logs = GenericTestUtils.LogCapturer.captureLogs(FSNamesystem.LOG); + GenericTestUtils + .setLogLevel(LoggerFactory.getLogger(FSNamesystem.class.getName()), + org.slf4j.event.Level.INFO); + } + + @After + public void cleanUp() throws Exception { + if (fs != null) { + fs.close(); + fs = null; + } + if (cluster != null) { + cluster.shutdown(); + cluster = null; + } + } + + @Test + public void test() throws Exception { + FileSystem userfs = DFSTestUtil.getFileSystemAs(userGroupInfo, conf); + + FSDataOutputStream os = testLockReport(() -> Review comment: I think it would help for each of the lines we check what would be an example line. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
