Author: szetszwo
Date: Mon Oct 15 14:08:25 2012
New Revision: 1398294
URL: http://svn.apache.org/viewvc?rev=1398294&view=rev
Log:
svn merge -c 1398293 from trunk for HDFS-4036. Remove "throw
UnresolvedLinkException" from FSDirectory.unprotectedAddFile(..).
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1398293
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1398294&r1=1398293&r2=1398294&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Mon Oct 15 14:08:25 2012
@@ -54,6 +54,9 @@ Release 2.0.3-alpha - Unreleased
HDFS-4037. Rename the getReplication() method in BlockCollection to
getBlockReplication(). (szetszwo)
+ HDFS-4036. Remove "throw UnresolvedLinkException" from
+ FSDirectory.unprotectedAddFile(..). (Jing Zhao via szetszwo)
+
OPTIMIZATIONS
BUG FIXES
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1398293
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=1398294&r1=1398293&r2=1398294&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
Mon Oct 15 14:08:25 2012
@@ -213,8 +213,9 @@ public class FSDirectory implements Clos
/**
* Add the given filename to the fs.
- * @throws QuotaExceededException
- * @throws FileAlreadyExistsException
+ * @throws FileAlreadyExistsException
+ * @throws QuotaExceededException
+ * @throws UnresolvedLinkException
*/
INodeFileUnderConstruction addFile(String path,
PermissionStatus permissions,
@@ -265,8 +266,6 @@ public class FSDirectory implements Clos
return newNode;
}
- /**
- */
INode unprotectedAddFile( String path,
PermissionStatus permissions,
short replication,
@@ -275,8 +274,7 @@ public class FSDirectory implements Clos
long preferredBlockSize,
boolean underConstruction,
String clientName,
- String clientMachine)
- throws UnresolvedLinkException {
+ String clientMachine) {
INode newNode;
assert hasWriteLock();
if (underConstruction) {
