chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r1030842 - in /incubator/chukwa/trunk: CHANGES.txt src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
Date Thu, 04 Nov 2010 06:16:38 GMT
Author: asrabkin
Date: Thu Nov  4 06:16:38 2010
New Revision: 1030842

URL: http://svn.apache.org/viewvc?rev=1030842&view=rev
Log:
CHUKWA-523. Fix reload collectors. Contributed by Eric Yang.

Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
    incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1030842&r1=1030841&r2=1030842&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Thu Nov  4 06:16:38 2010
@@ -24,6 +24,8 @@ Trunk (unreleased changes)
 
   IMPROVEMENTS
 
+    CHUKWA-525. Extensible DirTailingAdaptor. (Jaydeep Ayachit via asrabkin).
+
     CHUKWA-531. Bundle HBase 0.20.6 in library path, and comment out test case for HBaseWriter
for now. (Eric Yang)
 
     CHUKWA-524. Use TODO-HBASE-HOME and TODO-HBASE-CONF-DIR to control hbase location. (Eric
Yang)
@@ -150,6 +152,8 @@ Chukwa 0.4 
 
   BUG FIXES
 
+    CHUKWA-523. Fix reload collectors. (Eric Yang via asrabkin)
+
     CHUKWA-508. Include contrib directory build files.  (Bill Graham via Eric Yang)
 
     CHUKWA-465. Setup default value for Post Demux Data Loader.  (Ahmed Fathalla via Eric
Yang)

Modified: incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java?rev=1030842&r1=1030841&r2=1030842&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
(original)
+++ incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/connector/http/HttpConnector.java
Thu Nov  4 06:16:38 2010
@@ -72,7 +72,6 @@ public class HttpConnector implements Co
   String argDestination = null;
 
   private volatile boolean stopMe = false;
-  private boolean reloadConfiguration = false;
   private Iterator<String> collectors = null;
   protected ChukwaSender connectorClient = null;
 
@@ -176,12 +175,6 @@ public class HttpConnector implements Co
           chunkCount++;
         }
 
-        if (reloadConfiguration) {
-          connectorClient.setCollectors(collectors);
-          log.info("Resetting colectors");
-          reloadConfiguration = false;
-        }
-
         long now = System.currentTimeMillis();
         if (now - lastPost < MIN_POST_INTERVAL)
           Thread.sleep(now - lastPost); // wait for stuff to accumulate
@@ -203,7 +196,6 @@ public class HttpConnector implements Co
 
   @Override
   public void reloadConfiguration() {
-    reloadConfiguration = true;
     Iterator<String> destinations = null;
 
     // build a list of our destinations from collectors
@@ -214,6 +206,8 @@ public class HttpConnector implements Co
     }
     if (destinations != null && destinations.hasNext()) {
       collectors = destinations;
+      connectorClient.setCollectors(collectors);
+      log.info("Resetting collectors");
     }
   }
   

Modified: incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java?rev=1030842&r1=1030841&r2=1030842&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
(original)
+++ incubator/chukwa/trunk/src/java/org/apache/hadoop/chukwa/datacollection/sender/ChukwaHttpSender.java
Thu Nov  4 06:16:38 2010
@@ -259,7 +259,7 @@ public class ChukwaHttpSender implements
           if (retries > 0) {
             log.warn("No more collectors to try rolling over to; waiting "
                 + WAIT_FOR_COLLECTOR_REBOOT + " ms (" + retries
-                + "retries left)");
+                + " retries left)");
             Thread.sleep(WAIT_FOR_COLLECTOR_REBOOT);
             retries--;
           } else {



Mime
View raw message