Author: szetszwo
Date: Thu May 9 23:55:49 2013
New Revision: 1480838
URL: http://svn.apache.org/r1480838
Log:
svn merge --reintegrate
https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802 for merging
HDFS Snapshot feature branch.
Added:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
- copied unchanged from r1480829,
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/SnapshotCommands.java
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
Propchange: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt:r1360400-1480829
Propchange:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs:r1360400-1480829
Propchange:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java:r1360400-1480829
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java?rev=1480838&r1=1480837&r2=1480838&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
Thu May 9 23:55:49 2013
@@ -2265,6 +2265,51 @@ public abstract class FileSystem extends
) throws IOException {
}
+ /**
+ * Create a snapshot with a default name.
+ * @param path The directory where snapshots will be taken.
+ * @return the snapshot path.
+ */
+ public final Path createSnapshot(Path path) throws IOException {
+ return createSnapshot(path, null);
+ }
+
+ /**
+ * Create a snapshot
+ * @param path The directory where snapshots will be taken.
+ * @param snapshotName The name of the snapshot
+ * @return the snapshot path.
+ */
+ public Path createSnapshot(Path path, String snapshotName)
+ throws IOException {
+ throw new UnsupportedOperationException(getClass().getSimpleName()
+ + " doesn't support createSnapshot");
+ }
+
+ /**
+ * Rename a snapshot
+ * @param path The directory path where the snapshot was taken
+ * @param snapshotOldName Old name of the snapshot
+ * @param snapshotNewName New name of the snapshot
+ * @throws IOException
+ */
+ public void renameSnapshot(Path path, String snapshotOldName,
+ String snapshotNewName) throws IOException {
+ throw new UnsupportedOperationException(getClass().getSimpleName()
+ + " doesn't support renameSnapshot");
+ }
+
+ /**
+ * Delete a snapshot of a directory
+ * @param path The directory that the to-be-deleted snapshot belongs to
+ * @param snapshotName The name of the snapshot
+ */
+ public void deleteSnapshot(Path path, String snapshotName)
+ throws IOException {
+ throw new UnsupportedOperationException(getClass().getSimpleName()
+ + " doesn't support deleteSnapshot");
+ }
+
// making it volatile to be able to do a double checked locking
private volatile static boolean FILE_SYSTEMS_LOADED = false;
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java?rev=1480838&r1=1480837&r2=1480838&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
Thu May 9 23:55:49 2013
@@ -462,4 +462,22 @@ public class FilterFileSystem extends Fi
public FileSystem[] getChildFileSystems() {
return new FileSystem[]{fs};
}
+
+ @Override // FileSystem
+ public Path createSnapshot(Path path, String snapshotName)
+ throws IOException {
+ return fs.createSnapshot(path, snapshotName);
+ }
+
+ @Override // FileSystem
+ public void renameSnapshot(Path path, String snapshotOldName,
+ String snapshotNewName) throws IOException {
+ fs.renameSnapshot(path, snapshotOldName, snapshotNewName);
+ }
+
+ @Override // FileSystem
+ public void deleteSnapshot(Path path, String snapshotName)
+ throws IOException {
+ fs.deleteSnapshot(path, snapshotName);
+ }
}
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java?rev=1480838&r1=1480837&r2=1480838&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
Thu May 9 23:55:49 2013
@@ -57,6 +57,7 @@ abstract public class FsCommand extends
factory.registerCommands(Tail.class);
factory.registerCommands(Test.class);
factory.registerCommands(Touch.class);
+ factory.registerCommands(SnapshotCommands.class);
}
protected FsCommand() {}
Propchange:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core:r1360400-1480829
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java?rev=1480838&r1=1480837&r2=1480838&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
(original)
+++
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFilterFileSystem.java
Thu May 9 23:55:49 2013
@@ -218,6 +218,8 @@ public class TestFilterFileSystem {
continue;
if (Modifier.isPrivate(m.getModifiers()))
continue;
+ if (Modifier.isFinal(m.getModifiers()))
+ continue;
try {
DontCheck.class.getMethod(m.getName(), m.getParameterTypes());
