You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@chukwa.apache.org by as...@apache.org on 2012/12/18 03:26:08 UTC

svn commit: r1423254 - in /incubator/chukwa/trunk: CHANGES.txt src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java

Author: asrabkin
Date: Tue Dec 18 02:26:02 2012
New Revision: 1423254

URL: http://svn.apache.org/viewvc?rev=1423254&view=rev
Log:
CHUKWA-675. Bad sleeping condition in FileTailer.java. Contributed by Sourygna Luangsay.

Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1423254&r1=1423253&r2=1423254&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Tue Dec 18 02:26:02 2012
@@ -26,6 +26,8 @@ Trunk (unreleased changes)
 
   BUGS
 
+    CHUKWA-675. Bad sleeping condition in FileTailer.java (Sourygna Luangsay via asrabkin)
+
     CHUKWA-668. Fix infinite loop in FileTailingAdaptor. (Sourygna Luangsay via Eric Yang)
 
     CHUKWA-653. Added pre-compile JSP code profile for build process. (Jie Huang via Eric Yang)

Modified: incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java?rev=1423254&r1=1423253&r2=1423254&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java (original)
+++ incubator/chukwa/trunk/src/main/java/org/apache/hadoop/chukwa/datacollection/adaptor/filetailer/FileTailer.java Tue Dec 18 02:26:02 2012
@@ -84,7 +84,7 @@ class FileTailer extends Thread {
         long timeToReadFiles = System.currentTimeMillis() - startTime;
         if(timeToReadFiles > MAX_SAMPLE_PERIOD)
           log.warn("took " + timeToReadFiles + " ms to check all files being tailed");
-        if (timeToReadFiles < SAMPLE_PERIOD_MS || shouldISleep) {
+        if (timeToReadFiles < SAMPLE_PERIOD_MS && shouldISleep) {
           Thread.sleep(SAMPLE_PERIOD_MS);
         }
       } catch (Throwable e) {