hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1132868 - in /hadoop/mapreduce/branches/MR-279: ./ yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/ yarn/yarn-server/yarn-server-nodemanager/src/test/java/org...
Date Tue, 07 Jun 2011 06:01:02 GMT
Author: vinodkv
Date: Tue Jun  7 06:01:01 2011
New Revision: 1132868

URL: http://svn.apache.org/viewvc?rev=1132868&view=rev
Log:
Disable aggregation of logs onto DFS till JobHistoryServer starts serving logs. (vinodkv)


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/logaggregation/LogAggregationService.java
    hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java

Modified: hadoop/mapreduce/branches/MR-279/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/CHANGES.txt?rev=1132868&r1=1132867&r2=1132868&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/MR-279/CHANGES.txt Tue Jun  7 06:01:01 2011
@@ -5,6 +5,9 @@ Trunk (unreleased changes)
 
     MAPREDUCE-279
 
+    Disable aggregation of logs onto DFS till JobHistoryServer starts
+    serving logs. (vinodkv)
+
     Add deletion of distributed cache resources. (cdouglas)
 
     Fix class cast exception in Task abort for old mapreduce apis. (sharad)

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.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/logaggregation/LogAggregationService.java?rev=1132868&r1=1132867&r2=1132868&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/LogAggregationService.java
Tue Jun  7 06:01:01 2011
@@ -207,27 +207,27 @@ public class LogAggregationService exten
 
   @Override
   public void handle(LogAggregatorEvent event) {
-    switch (event.getType()) {
-    case APPLICATION_STARTED:
-      LogAggregatorAppStartedEvent appStartEvent =
-          (LogAggregatorAppStartedEvent) event;
-      initApp(appStartEvent.getApplicationId(), appStartEvent.getUser(),
-          appStartEvent.getCredentials(),
-          appStartEvent.getLogRetentionPolicy());
-      break;
-    case CONTAINER_FINISHED:
-      LogAggregatorContainerFinishedEvent containerFinishEvent =
-          (LogAggregatorContainerFinishedEvent) event;
-      stopContainer(containerFinishEvent.getContainerId(),
-          containerFinishEvent.getExitCode());
-      break;
-    case APPLICATION_FINISHED:
-      LogAggregatorAppFinishedEvent appFinishedEvent =
-          (LogAggregatorAppFinishedEvent) event;
-      stopApp(appFinishedEvent.getApplicationId());
-      break;
-    default:
-      ; // Ignore
-    }
+//    switch (event.getType()) {
+//    case APPLICATION_STARTED:
+//      LogAggregatorAppStartedEvent appStartEvent =
+//          (LogAggregatorAppStartedEvent) event;
+//      initApp(appStartEvent.getApplicationId(), appStartEvent.getUser(),
+//          appStartEvent.getCredentials(),
+//          appStartEvent.getLogRetentionPolicy());
+//      break;
+//    case CONTAINER_FINISHED:
+//      LogAggregatorContainerFinishedEvent containerFinishEvent =
+//          (LogAggregatorContainerFinishedEvent) event;
+//      stopContainer(containerFinishEvent.getContainerId(),
+//          containerFinishEvent.getExitCode());
+//      break;
+//    case APPLICATION_FINISHED:
+//      LogAggregatorAppFinishedEvent appFinishedEvent =
+//          (LogAggregatorAppFinishedEvent) event;
+//      stopApp(appFinishedEvent.getApplicationId());
+//      break;
+//    default:
+//      ; // Ignore
+//    }
   }
 }

Modified: hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java?rev=1132868&r1=1132867&r2=1132868&view=diff
==============================================================================
--- hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
(original)
+++ hadoop/mapreduce/branches/MR-279/yarn/yarn-server/yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
Tue Jun  7 06:01:01 2011
@@ -59,8 +59,10 @@ import org.apache.hadoop.yarn.server.nod
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.logaggregation.event.LogAggregatorContainerFinishedEvent;
 import org.apache.hadoop.yarn.util.BuilderUtils;
 import org.apache.hadoop.yarn.util.ConverterUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class TestLogAggregationService extends BaseContainerManagerTest {
 
   static {



Mime
View raw message