You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2013/09/27 13:12:45 UTC
svn commit: r1526848 - in
/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:
dev-support/ src/main/java/org/apache/hadoop/fs/ src/main/resources/
src/test/java/org/apache/hadoop/fs/
Author: stevel
Date: Fri Sep 27 11:12:42 2013
New Revision: 1526848
URL: http://svn.apache.org/r1526848
Log:
HADOOP-8545. Filesystem Implementation for OpenStack Swift
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml?rev=1526848&r1=1526847&r2=1526848&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/dev-support/findbugsExcludeFile.xml Fri Sep 27 11:12:42 2013
@@ -348,4 +348,20 @@
<Method name="waitForServiceToStop" />
<Bug code="JLM" />
</Match>
- </FindBugsFilter>
+
+ <!--
+ OpenStack Swift FS module -closes streams in a different method
+ from where they are opened.
+ -->
+ <Match>
+ <Class name="org.apache.hadoop.fs.swift.snative.SwiftNativeOutputStream"/>
+ <Method name="uploadFileAttempt"/>
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.hadoop.fs.swift.snative.SwiftNativeOutputStream"/>
+ <Method name="uploadFilePartAttempt"/>
+ <Bug pattern="OBL_UNSATISFIED_OBLIGATION"/>
+ </Match>
+
+</FindBugsFilter>
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java?rev=1526848&r1=1526847&r2=1526848&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Seekable.java Fri Sep 27 11:12:42 2013
@@ -22,7 +22,9 @@ import java.io.*;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-/** Stream that permits seeking. */
+/**
+ * Stream that permits seeking.
+ */
@InterfaceAudience.Public
@InterfaceStability.Evolving
public interface Seekable {
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml?rev=1526848&r1=1526847&r2=1526848&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml Fri Sep 27 11:12:42 2013
@@ -492,6 +492,11 @@
</description>
</property>
+<property>
+ <name>fs.swift.impl</name>
+ <value>org.apache.hadoop.fs.swift.snative.SwiftNativeFileSystem</value>
+ <description>The implementation class of the OpenStack Swift Filesystem</description>
+</property>
<property>
<name>fs.automatic.close</name>
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java?rev=1526848&r1=1526847&r2=1526848&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FSMainOperationsBaseTest.java Fri Sep 27 11:12:42 2013
@@ -944,14 +944,20 @@ public abstract class FSMainOperationsBa
rename(src, dst, false, true, false, Rename.NONE);
Assert.fail("Expected exception was not thrown");
} catch (IOException e) {
- Assert.assertTrue(unwrapException(e) instanceof FileNotFoundException);
+ IOException ioException = unwrapException(e);
+ if (!(ioException instanceof FileNotFoundException)) {
+ throw ioException;
+ }
}
try {
rename(src, dst, false, true, false, Rename.OVERWRITE);
Assert.fail("Expected exception was not thrown");
} catch (IOException e) {
- Assert.assertTrue(unwrapException(e) instanceof FileNotFoundException);
+ IOException ioException = unwrapException(e);
+ if (!(ioException instanceof FileNotFoundException)) {
+ throw ioException;
+ }
}
}
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java?rev=1526848&r1=1526847&r2=1526848&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java Fri Sep 27 11:12:42 2013
@@ -270,7 +270,7 @@ public abstract class FileSystemContract
public void testWriteInNonExistentDirectory() throws IOException {
Path path = path("/test/hadoop/file");
- assertFalse("Parent doesn't exist", fs.exists(path.getParent()));
+ assertFalse("Parent exists", fs.exists(path.getParent()));
createFile(path);
assertTrue("Exists", fs.exists(path));
@@ -280,7 +280,7 @@ public abstract class FileSystemContract
public void testDeleteNonExistentFile() throws IOException {
Path path = path("/test/hadoop/file");
- assertFalse("Doesn't exist", fs.exists(path));
+ assertFalse("Path exists: " + path, fs.exists(path));
assertFalse("No deletion", fs.delete(path, true));
}