You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by ey...@apache.org on 2012/06/25 03:10:25 UTC
svn commit: r1353372 - in /incubator/chukwa/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
Author: eyang
Date: Mon Jun 25 01:10:24 2012
New Revision: 1353372
URL: http://svn.apache.org/viewvc?rev=1353372&view=rev
Log:
CHUKWA-640. Revert changes to async adaptor registration.
Modified:
incubator/chukwa/trunk/CHANGES.txt
incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1353372&r1=1353371&r2=1353372&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Mon Jun 25 01:10:24 2012
@@ -16,8 +16,6 @@ Trunk (unreleased changes)
CHUKWA-641. Fix stack trace for dumpChunk command when invalid regular expression is specified. (Eric Spishak via Eric Yang)
- CHUKWA-640. Use timer thread to schedule adaptor registration. (Abhijit Dhar via Eric Yang)
-
CHUKWA-636. Updated dependency to HBase 0.92.0. (Eric Yang)
CHUKWA-638. Fixed timezone offset in test case. (Eric Yang)
Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java?rev=1353372&r1=1353371&r2=1353372&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/controller/ChukwaAgentController.java Mon Jun 25 01:10:24 2012
@@ -273,10 +273,9 @@ public class ChukwaAgentController {
+ numRetries
+ " retries remaining");
- AddAdaptorTask task = new AddAdaptorTask(adaptorName, type, params,
- offset, numRetries - 1, retryInterval);
- Timer timerThread = new Timer(true); // set as daemon thread
- timerThread.schedule(task, retryInterval);
+ Timer addFileTimer = new Timer();
+ addFileTimer.schedule(new AddAdaptorTask(adaptorName, type, params,
+ offset, numRetries - 1, retryInterval), retryInterval);
}
} else {
System.err.println("Giving up on connecting to the local agent");