diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9778ad25ed..a56f86516a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -385,6 +385,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 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index 21e98dc524..d339e017bf 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -213,8 +213,9 @@ void waitForReady() { /** * 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 @@ INodeFileUnderConstruction addFile(String path, return newNode; } - /** - */ INode unprotectedAddFile( String path, PermissionStatus permissions, short replication, @@ -275,8 +274,7 @@ INode unprotectedAddFile( String path, long preferredBlockSize, boolean underConstruction, String clientName, - String clientMachine) - throws UnresolvedLinkException { + String clientMachine) { INode newNode; assert hasWriteLock(); if (underConstruction) {