Address review comments

Author: S O'Donnell

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeRpcServer.java

@@ -1653,7 +1653,7 @@ public DatanodeCommand blockReport(final DatanodeRegistration nodeReg,
                 blocks, context));
         }
       } else {
-        throw new InvalidBlockReportLeaseException();
+        throw new InvalidBlockReportLeaseException(context.getReportId(), context.getLeaseId());
       }
     } catch (UnregisteredNodeException une) {
       LOG.warn("Datanode {} is attempting to report but not register yet.",

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/InvalidBlockReportLeaseException.java

@@ -34,7 +34,8 @@ public class InvalidBlockReportLeaseException extends IOException {
   /** for java.io.Serializable. */
   private static final long serialVersionUID = 1L;
 
-  public InvalidBlockReportLeaseException() {
-    super("Block report was rejected as the lease is invalid");
+  public InvalidBlockReportLeaseException(long blockReportID, long leaseID) {
+    super("Block report 0x" + Long.toHexString(blockReportID) + " was rejected as lease 0x"
+        + Long.toHexString(leaseID) +  " is invalid");
   }
 }

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java

@@ -1187,7 +1187,7 @@ public Object answer(InvocationOnMock invocation)
                 // just reject and wait until DN request for a new leaseId
                 if(leaseId == 1) {
                   firstLeaseId = leaseId;
-                  InvalidBlockReportLeaseException e = new InvalidBlockReportLeaseException();
+                  InvalidBlockReportLeaseException e = new InvalidBlockReportLeaseException(context.getReportId(), 1);
                   throw new RemoteException(e.getClass().getName(), e.getMessage());
                 } else {
                   secondLeaseId = leaseId;