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 ki...@apache.org on 2013/08/29 23:34:18 UTC
svn commit: r1518834 - in
/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
CHANGES.txt
src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
Author: kihwal
Date: Thu Aug 29 21:34:18 2013
New Revision: 1518834
URL: http://svn.apache.org/r1518834
Log:
HDFS-4482. ReplicationMonitor thread can exit with NPE due to the race between delete and replication of same file. Contributed by Uma Maheswara Rao G.
Modified:
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1518834&r1=1518833&r2=1518834&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Aug 29 21:34:18 2013
@@ -41,6 +41,9 @@ Release 0.23.10 - UNRELEASED
HDFS-4993. Fsck can fail if a file is renamed or deleted. (Robert Parker
via kihwal)
+ HDFS-4482. ReplicationMonitor thread can exit with NPE due to the race
+ between delete and replication of same file. (umamahesh)
+
Release 0.23.9 - 2013-07-08
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-0.23/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-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=1518834&r1=1518833&r2=1518834&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java Thu Aug 29 21:34:18 2013
@@ -1567,6 +1567,11 @@ public class FSDirectory implements Clos
// fill up the inodes in the path from this inode to root
for (int i = 0; i < depth; i++) {
+ if (inode == null) {
+ NameNode.stateChangeLog.warn("Could not get full path."
+ + " Corresponding file might have deleted already.");
+ return null;
+ }
inodes[depth-i-1] = inode;
inode = inode.parent;
}
Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java?rev=1518834&r1=1518833&r2=1518834&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java Thu Aug 29 21:34:18 2013
@@ -236,7 +236,11 @@ public abstract class INode implements C
String getLocalParentDir() {
INode inode = isRoot() ? this : getParent();
- return (inode != null) ? inode.getFullPathName() : "";
+ String parentDir = "";
+ if (inode != null) {
+ parentDir = inode.getFullPathName();
+ }
+ return (parentDir != null) ? parentDir : "";
}
/**