hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maha...@apache.org
Subject svn commit: r1133597 - in /hadoop/mapreduce/branches/MR-279: CHANGES.txt yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
Date Wed, 08 Jun 2011 23:30:13 GMT
Author: mahadev
Date: Wed Jun  8 23:30:12 2011
New Revision: 1133597

URL: http://svn.apache.org/viewvc?rev=1133597&view=rev
Log:
Remove retries in dist cache so that NM's do not shutdown (mahadev)

Modified:
    hadoop/mapreduce/branches/MR-279/CHANGES.txt
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1133597&r1=1133596&r2=1133597&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Wed Jun  8 23:30:12 2011
@@ -5,6 +5,8 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
+    Remove retries in dist cache so that NM's do not shutdown (mahadev)
+
     Solving NPEs during ContainerManager#StopContainer. Also removing
     the unused ContainerManager#CleanupContainer api. (vinodkv)
 

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java?rev=1133597&r1=1133596&r2=1133597&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java
Wed Jun  8 23:30:12 2011
@@ -575,12 +575,15 @@ public class ResourceLocalizationService
                 if (reqs.isEmpty()) {
                   attempts.remove(req);
                 }
-                LocalizerResourceRequestEvent request = reqs.remove(0);
+                /* 
+                 * Do not retry for now. Once failed is failed!
+                 *  LocalizerResourceRequestEvent request = reqs.remove(0);
+
                 pending.put(queue.submit(new FSDownload(
-                        lfs, null, conf, publicDirs,
-                        request.getResource().getRequest(), new Random())),
+                    lfs, null, conf, publicDirs,
+                    request.getResource().getRequest(), new Random())),
                     request);
-              }
+                 */              }
             } catch (CancellationException e) {
               // ignore; shutting down
             }
@@ -588,6 +591,8 @@ public class ResourceLocalizationService
             return;
           }
         }
+      } catch(Throwable t) {
+        LOG.fatal("Error: Shutting down", t);
       } finally {
         LOG.info("Public cache exiting");
         threadPool.shutdownNow();



Mime
View raw message