You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by iv...@apache.org on 2013/10/11 07:55:10 UTC
svn commit: r1531201 - in /hadoop/common/branches/branch-1-win: ./ src/core/org/apache/hadoop/http/ src/mapred/org/apache/hadoop/filecache/ src/mapred/org/apache/hadoop/mapred/ src/test/org/apache/hadoop/mapred/

Author: ivanmi
Date: Fri Oct 11 05:55:09 2013
New Revision: 1531201

URL: http://svn.apache.org/r1531201
Log:
MAPREDUCE-5512. Merging change r1531200 from branch-1.

Added:
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestMiniMRDaemonThreads.java
      - copied unchanged from r1531200, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMiniMRDaemonThreads.java
Modified:
    hadoop/common/branches/branch-1-win/CHANGES.txt
    hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/http/HttpServer.java
    hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java
    hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/MiniMRCluster.java

Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1531201&r1=1531200&r2=1531201&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Fri Oct 11 05:55:09 2013
@@ -74,6 +74,9 @@ Release 1.3.0 - unreleased
     HDFS-5003. TestNNThroughputBenchmark failed caused by existing directories.
     (Xi Fang via cnauroth)
 
+    MAPREDUCE-5512. TaskTracker hung after failed reconnect to the JobTracker.
+    (ivanmi)
+
 Release 1.2.1 - Unreleased 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/http/HttpServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/http/HttpServer.java?rev=1531201&r1=1531200&r2=1531201&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/http/HttpServer.java (original)
+++ hadoop/common/branches/branch-1-win/src/core/org/apache/hadoop/http/HttpServer.java Fri Oct 11 05:55:09 2013
@@ -161,7 +161,9 @@ public class HttpServer implements Filte
     
     webServer.addConnector(listener);
 
-    webServer.setThreadPool(new QueuedThreadPool());
+    QueuedThreadPool threadPool = new QueuedThreadPool();
+    threadPool.setName("httpServerThreadPool");
+    webServer.setThreadPool(threadPool);
 
     final String appDir = getWebAppsPath();
     ContextHandlerCollection contexts = new ContextHandlerCollection();

Modified: hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java?rev=1531201&r1=1531200&r2=1531201&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java (original)
+++ hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/filecache/TrackerDistributedCacheManager.java Fri Oct 11 05:55:09 2013
@@ -126,6 +126,8 @@ public class TrackerDistributedCacheMana
 
     this.taskController = controller;
     this.cleanupThread = new CleanupThread(conf);
+    this.cleanupThread.setName("distCacheManagerCleanupThread");
+    this.cleanupThread.setDaemon(true);
   }
 
   /**

Modified: hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java?rev=1531201&r1=1531200&r2=1531201&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java (original)
+++ hadoop/common/branches/branch-1-win/src/mapred/org/apache/hadoop/mapred/JobEndNotifier.java Fri Oct 11 05:55:09 2013
@@ -83,7 +83,7 @@ public class JobEndNotifier {
               LOG.error("Notification failure [" + notification + "]", ex);
             }
           }
-        });
+        }, "jobEndNotifier");
     thread.start();
   }
 

Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/MiniMRCluster.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/MiniMRCluster.java?rev=1531201&r1=1531200&r2=1531201&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/MiniMRCluster.java (original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/MiniMRCluster.java Fri Oct 11 05:55:09 2013
@@ -617,7 +617,7 @@ public class MiniMRCluster {
   void startJobTracker(boolean wait) {
     //  Create the JobTracker
     jobTracker = new JobTrackerRunner(conf);
-    jobTrackerThread = new Thread(jobTracker);
+    jobTrackerThread = new Thread(jobTracker, "jobTrackerMain");
         
     jobTrackerThread.start();
     
@@ -712,7 +712,7 @@ public class MiniMRCluster {
    * Add a tasktracker to the Mini-MR cluster.
    */
   void addTaskTracker(TaskTrackerRunner taskTracker) {
-    Thread taskTrackerThread = new Thread(taskTracker);
+    Thread taskTrackerThread = new Thread(taskTracker, "taskTrackerMain");
     taskTrackerList.add(taskTracker);
     taskTrackerThreadList.add(taskTrackerThread);
     taskTrackerThread.start();