You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by br...@apache.org on 2013/07/03 20:31:31 UTC
svn commit: r1499509 - in
/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project: ./
hadoop-hdfs-nfs/ hadoop-hdfs-nfs/dev-support/ hadoop-hdfs-nfs/src/
hadoop-hdfs-nfs/src/main/ hadoop-hdfs-nfs/src/main/java/
hadoop-hdfs-nfs/src/main/java/org/ h...
Author: brandonli
Date: Wed Jul 3 18:31:30 2013
New Revision: 1499509
URL: http://svn.apache.org/r1499509
Log:
HDFS-4762,HDFS-4948,HDFS-4954. Merging change r1499190,r1499321 from branch-2
Added:
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/README.txt
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/README.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/dev-support/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/dev-support/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/dev-support/findbugsExcludeFile.xml
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/dev-support/findbugsExcludeFile.xml
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
- copied, changed from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/Mountd.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/Mountd.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/mount/RpcProgramMountd.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/AsyncDataService.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/AsyncDataService.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/DFSClientCache.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/LruCache.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/LruCache.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Utils.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3Utils.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
- copied, changed from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/WriteManager.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestMountd.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestMountd.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestOutOfOrderWrite.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestOutOfOrderWrite.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestPortmapRegister.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestPortmapRegister.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestUdpServer.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/TestUdpServer.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/
- copied from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestDFSClientCache.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestOffsetRange.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestOffsetRange.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
- copied unchanged from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/pom.xml
Copied: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml (from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml?p2=hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml&p1=hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml&r1=1499190&r2=1499509&rev=1499509&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml Wed Jul 3 18:31:30 2013
@@ -20,12 +20,12 @@ http://maven.apache.org/xsd/maven-4.0.0.
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project-dist</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-beta</version>
<relativePath>../../hadoop-project-dist</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs-nfs</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-beta</version>
<description>Apache Hadoop HDFS-NFS</description>
<name>Apache Hadoop HDFS-NFS</name>
<packaging>jar</packaging>
Copied: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java (from r1499190, hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java?p2=hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java&p1=hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java&r1=1499190&r2=1499509&rev=1499509&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs-nfs/src/main/java/org/apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java Wed Jul 3 18:31:30 2013
@@ -178,7 +178,7 @@ class OpenFileCtx {
}
// Get flushed offset. Note that flushed data may not be persisted.
- private long getFlushedOffset() {
+ private long getFlushedOffset() throws IOException {
return fos.getPos();
}
@@ -515,7 +515,13 @@ class OpenFileCtx {
commitOffset = getNextOffsetUnprotected();
}
- long flushed = getFlushedOffset();
+ long flushed = 0;
+ try {
+ flushed = getFlushedOffset();
+ } catch (IOException e) {
+ LOG.error("Can't get flushed offset, error:" + e);
+ return COMMIT_ERROR;
+ }
LOG.info("getFlushedOffset=" + flushed + " commitOffset=" + commitOffset);
if (flushed < commitOffset) {
// Keep stream active
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1499509&r1=1499508&r2=1499509&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Wed Jul 3 18:31:30 2013
@@ -65,6 +65,8 @@ Release 2.1.0-beta - 2013-07-02
HDFS-4659 Support setting execution bit for regular files (Brandon Li via sanjay)
+ HDFS-4762 Provide HDFS based NFSv3 and Mountd implementation (brandonli)
+
IMPROVEMENTS
HDFS-4461. DirectoryScanner: volume path prefix takes up memory for every
@@ -396,6 +398,11 @@ Release 2.1.0-beta - 2013-07-02
HDFS-4927. CreateEditsLog creates inodes with an invalid inode ID, which then
cannot be loaded by a namenode. (cnauroth)
+ HDFS-4948. mvn site for hadoop-hdfs-nfs fails. (brandonli)
+
+ HDFS-4954. In nfs, OpenFileCtx.getFlushedOffset() should handle IOException.
+ (Brandon Li via szetszwo)
+
BREAKDOWN OF HDFS-347 SUBTASKS AND RELATED JIRAS
HDFS-4353. Encapsulate connections to peers in Peer and PeerServer classes.
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/pom.xml?rev=1499509&r1=1499508&r2=1499509&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-hdfs-project/pom.xml Wed Jul 3 18:31:30 2013
@@ -34,6 +34,7 @@ http://maven.apache.org/xsd/maven-4.0.0.
<module>hadoop-hdfs</module>
<module>hadoop-hdfs-httpfs</module>
<module>hadoop-hdfs/src/contrib/bkjournal</module>
+ <module>hadoop-hdfs-nfs</module>
</modules>
<build>