chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r1423256 - in /incubator/chukwa/trunk: CHANGES.txt src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
Date Tue, 18 Dec 2012 02:33:31 GMT
Author: asrabkin
Date: Tue Dec 18 02:33:27 2012
New Revision: 1423256

URL: http://svn.apache.org/viewvc?rev=1423256&view=rev
Log:
CHUKWA-672. Fix adaptor not found in checkpoint after shutdown. Contributed by shreyas subramanya.

Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1423256&r1=1423255&r2=1423256&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Tue Dec 18 02:33:27 2012
@@ -26,6 +26,8 @@ Trunk (unreleased changes)
 
   BUGS
 
+    CHUKWA-672. Fix adaptor not found in checkpoint after shutdown. (shreyas subramanya via
asrabkin)
+
     CHUKWA-675. Bad sleeping condition in FileTailer.java (Sourygna Luangsay via asrabkin)
 
     CHUKWA-668. Fix infinite loop in FileTailingAdaptor. (Sourygna Luangsay via Eric Yang)

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java?rev=1423256&r1=1423255&r2=1423256&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
(original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/agent/ChukwaAgent.java
Tue Dec 18 02:33:27 2012
@@ -778,15 +778,6 @@ public class ChukwaAgent implements Adap
       log.error("Couldn't stop jetty server.", e);
     }
 
-    if (checkpointer != null) {
-      checkpointer.cancel();
-      try {
-        if (needNewCheckpoint)
-          writeCheckpoint(); // write a last checkpoint here, before stopping
-      } catch (IOException e) {
-        log.debug(ExceptionUtil.getStackTrace(e));
-      }
-    }
     // adaptors
 
     synchronized (adaptorsByName) {
@@ -799,6 +790,15 @@ public class ChukwaAgent implements Adap
         }
       }
     }
+    if (checkpointer != null) {
+      checkpointer.cancel();
+      try {
+        if (needNewCheckpoint)
+          writeCheckpoint(); // write a last checkpoint here, before stopping
+      } catch (IOException e) {
+        log.debug(ExceptionUtil.getStackTrace(e));
+      }
+    }
     adaptorsByName.clear();
     adaptorPositions.clear();
     adaptorStatsManager.clear();



Mime
View raw message