HDFS-676. Fix NPE in FSDataset.updateReplicaUnderRecovery(). Contributed by Konstantin Shvachko.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@823732 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -390,6 +390,8 @@ Release 0.21.0 - Unreleased
 
     HDFS-665. TestFileAppend2 sometimes hangs. (hairong)
 
+    HDFS-676. Fix NPE in FSDataset.updateReplicaUnderRecovery() (shv)
+
 Release 0.20.1 - 2009-09-01
 
   IMPROVEMENTS

src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java

@@ -1982,19 +1982,21 @@ public class FSDataset implements FSConstants, FSDatasetInterface {
     return rur.createInfo();
   }
 
-  /** Update a replica of a block. */
-  synchronized void updateReplica(final Block block, final long recoveryId,
-      final long newlength) throws IOException {
+  @Override // FSDatasetInterface
+  public synchronized ReplicaInfo updateReplicaUnderRecovery(
+                                    final Block oldBlock,
+                                    final long recoveryId,
+                                    final long newlength) throws IOException {
     //get replica
-    final ReplicaInfo replica = volumeMap.get(block.getBlockId());
-    DataNode.LOG.info("updateReplica: block=" + block
+    final ReplicaInfo replica = volumeMap.get(oldBlock.getBlockId());
+    DataNode.LOG.info("updateReplica: block=" + oldBlock
         + ", recoveryId=" + recoveryId
         + ", length=" + newlength
         + ", replica=" + replica);
 
     //check replica
     if (replica == null) {
-      throw new ReplicaNotFoundException(block);
+      throw new ReplicaNotFoundException(oldBlock);
     }
 
     //check replica state
@@ -2007,26 +2009,18 @@ public class FSDataset implements FSConstants, FSDatasetInterface {
     checkReplicaFiles(replica);
 
     //update replica
-    final ReplicaInfo finalized = (ReplicaInfo)updateReplicaUnderRecovery(
-                                    replica, recoveryId, newlength);
+    final FinalizedReplica finalized = updateReplicaUnderRecovery(
+        (ReplicaUnderRecovery)replica, recoveryId, newlength);
 
     //check replica files after update
     checkReplicaFiles(finalized);
+    return finalized;
   }
 
-  @Override // FSDatasetInterface
-  public synchronized FinalizedReplica updateReplicaUnderRecovery(
-                                          Block oldBlock,
+  private FinalizedReplica updateReplicaUnderRecovery(
+                                          ReplicaUnderRecovery rur,
                                           long recoveryId,
                                           long newlength) throws IOException {
-    Replica r = getReplica(oldBlock.getBlockId());
-    if(r.getState() != ReplicaState.RUR)
-      throw new IOException("Replica " + r + " must be under recovery.");
-    ReplicaUnderRecovery rur = (ReplicaUnderRecovery)r;
-    DataNode.LOG.info("updateReplicaUnderRecovery: recoveryId=" + recoveryId
-        + ", newlength=" + newlength
-        + ", rur=" + rur);
-
     //check recovery id
     if (rur.getRecoveryID() != recoveryId) {
       throw new IOException("rur.getRecoveryID() != recoveryId = " + recoveryId

src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java

@@ -350,7 +350,8 @@ public interface FSDatasetInterface extends FSDatasetMBean {
   /**
    * Update replica's generation stamp and length and finalize it.
    */
-  public FinalizedReplica updateReplicaUnderRecovery(Block oldBlock,
+  public ReplicaInfo updateReplicaUnderRecovery(
+                                          Block oldBlock,
                                           long recoveryId,
                                           long newLength) throws IOException;
 }

src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java

@@ -804,10 +804,10 @@ public class SimulatedFSDataset  implements FSConstants, FSDatasetInterface, Con
     return new ReplicaRecoveryInfo(rBlock.getBlock(), ReplicaState.FINALIZED);
   }
 
-  @Override
+  @Override // FSDatasetInterface
   public FinalizedReplica updateReplicaUnderRecovery(Block oldBlock,
-                                          long recoveryId,
-                                          long newlength) throws IOException {
+                                        long recoveryId,
+                                        long newlength) throws IOException {
     return new FinalizedReplica(
         oldBlock.getBlockId(), newlength, recoveryId, null, null);
   }

src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestInterDatanodeProtocol.java

@@ -234,9 +234,8 @@ public class TestInterDatanodeProtocol extends junit.framework.TestCase {
       FSDataset.checkReplicaFiles(rur);
 
       //update
-      final ReplicaInfo finalized = 
-        (ReplicaInfo)fsdataset.updateReplicaUnderRecovery(
-            rur, recoveryid, newlength);
+      final ReplicaInfo finalized = fsdataset.updateReplicaUnderRecovery(
+                                                rur, recoveryid, newlength);
 
       //check meta data after update
       FSDataset.checkReplicaFiles(finalized);