This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit c4f7b8578b14ec026b10e18b139a669f5982497f
Author: Akira Ajisaka <aajis...@apache.org>
AuthorDate: Tue Aug 11 11:14:58 2020 +0900
HDFS-15506. [JDK 11] Fix javadoc errors in hadoop-hdfs module. Contributed
by Xieming Li.
(cherry picked from commit 7938ebfb9dd12b874ced1798f0c3ad0c160cb465)
---
.../src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java | 2 +-
.../hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java | 2 --
.../hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java | 2 +-
.../hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java | 3 ++-
.../src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java | 1 -
5 files changed, 4 insertions(+), 6 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
index 1cf7cb1..965ea8d 100755
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
@@ -682,7 +682,7 @@ public class DFSConfigKeys extends CommonConfigurationKeys {
600;
/**
* The maximum number of getBlocks RPCs data movement utilities can make to
- * a NameNode per second. Values <= 0 disable throttling. This affects
+ * a NameNode per second. Values <= 0 disable throttling. This affects
* anything that uses a NameNodeConnector, i.e., the Balancer, Mover,
* and StoragePolicySatisfier.
*/
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
index ad61257..efb2a8b 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
@@ -39,7 +39,6 @@ import static
org.apache.hadoop.hdfs.DFSConfigKeys.DFS_SERVER_HTTPS_TRUSTSTORE_P
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintStream;
import java.net.InetAddress;
@@ -1777,7 +1776,6 @@ public class DFSUtil {
* was found.
* @throws ParentNotDirectoryException
* @throws UnresolvedLinkException
- * @throws FileNotFoundException
*/
public static void checkProtectedDescendants(
FSDirectory fsd, INodesInPath iip)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
index b372e73..dfa7bf4 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeAdminDefaultMonitor.java
@@ -40,7 +40,7 @@ import java.util.Iterator;
/**
* Checks to see if datanodes have finished DECOMMISSION_INPROGRESS or
* ENTERING_MAINTENANCE state.
- * <p/>
+ * <p>
* Since this is done while holding the namesystem lock,
* the amount of work per monitor tick is limited.
*/
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
index 85e5ae4..234f7b9 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DirectorySnapshottableFeature.java
@@ -173,7 +173,8 @@ public class DirectorySnapshottableFeature extends
DirectoryWithSnapshotFeature
* Add a snapshot.
* @param snapshotRoot Root of the snapshot.
* @param name Name of the snapshot.
- * @param mtime The snapshot creation time set by Time.now().
+ * @param leaseManager
+ * @param captureOpenFiles
* @throws SnapshotException Throw SnapshotException when there is a snapshot
* with the same name already exists or snapshot quota exceeds
*/
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
index 5344d14..b57637d 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
@@ -2184,7 +2184,6 @@ public class DFSAdmin extends FsShell {
/**
* @param argv The parameters passed to this program.
- * @exception Exception if the filesystem does not exist.
* @return 0 on success, non zero on error.
*/
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
