hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1074777 - in /hadoop/hdfs/branches/HDFS-1052: CHANGES.txt src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
Date Sat, 26 Feb 2011 01:58:20 GMT
Author: suresh
Date: Sat Feb 26 01:58:20 2011
New Revision: 1074777

URL: http://svn.apache.org/viewvc?rev=1074777&view=rev
Log:
HDFS-1651. Tests fail due to null pointer exception in Datnode#shutdown() method. Contributed
by Tanping Wang.


Modified:
    hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
    hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

Modified: hadoop/hdfs/branches/HDFS-1052/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/CHANGES.txt?rev=1074777&r1=1074776&r2=1074777&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/CHANGES.txt (original)
+++ hadoop/hdfs/branches/HDFS-1052/CHANGES.txt Sat Feb 26 01:58:20 2011
@@ -63,6 +63,9 @@ Trunk (unreleased changes)
 
     HDFS-1650. TestReplication fails. (Tanping via suresh)
 
+    HDFS-1651. Tests fail due to null pointer exception in 
+    Datnode#shutdown() method. (Tanping via suresh)
+
   IMPROVEMENTS
 
     HDFS-1510. Added test-patch.properties required by test-patch.sh (nigel)

Modified: hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java?rev=1074777&r1=1074776&r2=1074777&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
(original)
+++ hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
Sat Feb 26 01:58:20 2011
@@ -255,21 +255,6 @@ public class DataNode extends Configured
   }
   
   /**
-   * Start a Datanode with specified server sockets for secure environments
-   * where they are run with privileged ports and injected from a higher
-   * level of capability
-   */
-  /*
-  DataNode(final Configuration conf,
-           final AbstractList<File> dataDirs, final SecureResources resources) throws
IOException {  
-    this(conf, dataDirs, (DatanodeProtocol)RPC.waitForProxy(DatanodeProtocol.class,
-                       DatanodeProtocol.versionID,
-                       NameNode.getServiceAddress(conf, true), 
-                       conf), resources);
-  }
-  */
-  
-  /**
    * Create the DataNode given a configuration, an array of dataDirs,
    * and a namenode proxy
    */
@@ -1362,6 +1347,7 @@ public class DataNode extends Configured
     for(BPOfferService bpos : nameNodeThreads) {
       if(bpos != null && bpos.bpThread!=null) {
         bpos.bpThread.interrupt();
+        RPC.stopProxy(bpos.bpNamenode); // stop the RPC threads 
       }
     } 
 
@@ -1374,12 +1360,6 @@ public class DataNode extends Configured
       }
     }
 
-    // stop all the proxy threads
-    for(BPOfferService bpos: nameNodeThreads) {
-      if(bpos!=null && bpos.bpNamenode!=null)
-        RPC.stopProxy(bpos.bpNamenode); // stop the RPC threads 
-    }
-  
     if(upgradeManager != null)
       upgradeManager.shutdownUpgrade();
     if (blockScannerThread != null) { 



Mime
View raw message