remote rename failure: NullPointerException (#269)

umd-dslam · Jun 10, 2020 · 0e49c6d · 0e49c6d
1 parent e4dd3f9
commit 0e49c6d
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/...s-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java b/...s-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
@@ -865,7 +865,8 @@ public void remoteLogOpenFile(INodeFile newNode, String nameNodeAddress) {
       INodeSection.INode r = INodeSection.INode.newBuilder()
           .setId(newNode.getId())
           .setName(ByteString.copyFrom(newNode.getLocalNameBytes()))
-          .setType(INodeSection.INode.Type.FILE).setFile(b).build();
+          .setType(INodeSection.INode.Type.FILE).setFile(b)
+          .setParent(newNode.getParentId()).build();
 
       byte[] data = r.toByteArray();
       FSEditLogProtocol proxy = (FSEditLogProtocol) RPC.getProxy(
@@ -972,7 +973,8 @@ public void remoteLogMkDir(INodeDirectory newNode, String nameNodeAddress) {
       INodeSection.INode r = INodeSection.INode.newBuilder()
         .setId(newNode.getId())
         .setName(ByteString.copyFrom(newNode.getLocalNameBytes()))
-        .setType(INodeSection.INode.Type.DIRECTORY).setDirectory(b).build();
+        .setType(INodeSection.INode.Type.DIRECTORY).setDirectory(b)
+        .setParent(newNode.getParentId()).build();
 
       byte[] data = r.toByteArray();
 

diff --git a/...doop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogProtocolImpl.java b/...doop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogProtocolImpl.java
@@ -133,6 +133,9 @@ public INodeFile loadINodeFile(INodeSection.INode n) {
                 file.setBlock(file.numBlocks() - 1, ucBlk);
             }
         }
+
+        // set parent
+        file.setParent(f.getParent());
         return file;
     }
 
@@ -153,6 +156,9 @@ public INodeDirectory loadINodeDirectory(INodeSection.INode n) {
       if (d.hasXAttrs()) {
         dir.addXAttrFeature(new XAttrFeature(dir.getId(), loadXAttrs(d.getXAttrs(), null)));
       }
+
+      // set parent
+      dir.setParent(d.getParent());
       return dir;
     }
 

diff --git a/...-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java b/...-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INode.java
@@ -704,6 +704,19 @@ public final INodeDirectory getParent() {
       INode dir = INodeKeyedObjects.getCache().getIfPresent(Long.class, id); 
       if (dir == null) {
         dir = new INodeDirectory(id);
+        DatabaseINode.LoadINode node = new DatabaseINode().loadINode(id);
+        byte[] name = (node.name != null && node.name.length() > 0) ? DFSUtil.string2Bytes(node.name) : null;
+        dir
+          .asDirectory()
+          .InitINodeDirectory(
+              node.parent,
+              node.id,
+              name,
+              node.permission,
+              node.modificationTime,
+              node.accessTime,
+              node.header);
+
         INodeKeyedObjects.getCache().put(
           new CompositeKey((Long)id,
           new ImmutablePair<>(dir.getParentId(), dir.getLocalName())), dir.asDirectory());

diff --git a/...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java b/...ject/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectory.java
@@ -683,7 +683,7 @@ public void localRename(INode node) {
   }
 
   public void remoteRename(INode node, String address) {
-    String name = DFSUtil.bytes2String(node.getLocalNameBytes());
+    // String name = DFSUtil.bytes2String(node.getLocalNameBytes());
     if (node.isDirectory()) {
       INodeDirectory inode = node.asDirectory().copyINodeDirectory();
       inode.setId(node.getId() + NameNode.getId());