This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new eb77e60 HDFS-14228. Incorrect getSnapshottableDirListing() javadoc.
Contributed by Dinesh Chitlangia.
eb77e60 is described below
commit eb77e60163e318ca42548e134fe79dba7289fdc6
Author: Dinesh Chitlangia <[email protected]>
AuthorDate: Fri Jan 25 07:34:48 2019 -0800
HDFS-14228. Incorrect getSnapshottableDirListing() javadoc. Contributed by
Dinesh Chitlangia.
Signed-off-by: Wei-Chiu Chuang <[email protected]>
(cherry picked from commit 45caeee6cfcf1ae3355cd880402159cf31e94a8a)
---
.../main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java | 7 +++++--
.../java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java | 9 +++++----
.../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 6 +++---
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
index 7dd02bd..1302219 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
@@ -1972,8 +1972,11 @@ public class DistributedFileSystem extends FileSystem
}
/**
- * @return All the snapshottable directories
- * @throws IOException
+ * Get the list of snapshottable directories that are owned
+ * by the current user. Return all the snapshottable directories if the
+ * current user is a super user.
+ * @return The list of all the current snapshottable directories.
+ * @throws IOException If an I/O error occurred.
*/
public SnapshottableDirectoryStatus[] getSnapshottableDirListing()
throws IOException {
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
index a55a0f7..d791cdb 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
@@ -689,10 +689,11 @@ public interface ClientProtocol {
boolean needLocation) throws IOException;
/**
- * Get listing of all the snapshottable directories.
- *
- * @return Information about all the current snapshottable directory
- * @throws IOException If an I/O error occurred
+ * Get the list of snapshottable directories that are owned
+ * by the current user. Return all the snapshottable directories if the
+ * current user is a super user.
+ * @return The list of all the current snapshottable directories.
+ * @throws IOException If an I/O error occurred.
*/
@Idempotent
SnapshottableDirectoryStatus[] getSnapshottableDirListing()
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 137dfb9..14e90d1 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
@@ -6561,13 +6561,13 @@ public class FSNamesystem implements Namesystem,
FSNamesystemMBean,
logAuditEvent(success, operationName, oldSnapshotRoot,
newSnapshotRoot, null);
}
-
+
/**
* Get the list of snapshottable directories that are owned
* by the current user. Return all the snapshottable directories if the
* current user is a super user.
- * @return The list of all the current snapshottable directories
- * @throws IOException
+ * @return The list of all the current snapshottable directories.
+ * @throws IOException If an I/O error occurred.
*/
public SnapshottableDirectoryStatus[] getSnapshottableDirListing()
throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
