You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by es...@apache.org on 2011/08/12 02:47:11 UTC

svn commit: r1156885 - /incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java

Author: esammer
Date: Fri Aug 12 00:47:11 2011
New Revision: 1156885

URL: http://svn.apache.org/viewvc?rev=1156885&view=rev
Log:
- No longer interrupt the caller of ChannelDriverThread if it's interrupted. - Upgraded the level of a sink open log event from debug to error on intr.

Modified:
    incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java

Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java?rev=1156885&r1=1156884&r2=1156885&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java Fri Aug 12 00:47:11 2011
@@ -199,7 +199,7 @@ public class ChannelDriver implements Li
    * itself.
    * </p>
    */
-  private static class ChannelDriverThread extends Thread {
+  public static class ChannelDriverThread extends Thread {
 
     private EventSource source;
     private EventSink sink;
@@ -246,7 +246,7 @@ public class ChannelDriver implements Li
       try {
         sink.open(context);
       } catch (InterruptedException e) {
-        logger.debug("Interrupted while opening sink. Exception follows.", e);
+        logger.error("Interrupted while opening sink. Exception follows.", e);
         lastException = e;
         lifecycleState = LifecycleState.ERROR;
         shouldStop = true;
@@ -273,7 +273,6 @@ public class ChannelDriver implements Li
         } catch (InterruptedException e1) {
           logger
               .error("Interrupted while trying to close the sink (because we were interrupted while trying to open the source)");
-          Thread.currentThread().interrupt();
         } catch (LifecycleException e1) {
           logger
               .error(
@@ -293,7 +292,6 @@ public class ChannelDriver implements Li
         } catch (InterruptedException e1) {
           logger
               .error("Interrupted while trying to close the sink (because we were cleaning up from a lifecycle exception from opening the source.)");
-          Thread.currentThread().interrupt();
         } catch (LifecycleException e1) {
           logger
               .error(