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:46:52 UTC
svn commit: r1156878 - in /incubator/flume/branches/flume-728:
flume-ng-core/src/main/java/org/apache/flume/core/
flume-ng-core/src/main/java/org/apache/flume/lifecycle/
flume-ng-core/src/test/java/org/apache/flume/lifecycle/
flume-ng-node/src/main/jav...
Author: esammer
Date: Fri Aug 12 00:46:52 2011
New Revision: 1156878
URL: http://svn.apache.org/viewvc?rev=1156878&view=rev
Log:
- Removed LifecycleAware#transitionTo().
Modified:
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/ChannelDriver.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java
incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FileBasedLogicalNodeManager.java
incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.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=1156878&r1=1156877&r2=1156878&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:46:52 2011
@@ -109,10 +109,6 @@ public class ChannelDriver implements Li
}
@Override
- public void transitionTo(LifecycleState state) {
- }
-
- @Override
public String toString() {
return "{ source:" + source + " sink:" + sink + " }";
}
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/core/LogicalNode.java Fri Aug 12 00:46:52 2011
@@ -80,10 +80,6 @@ public class LogicalNode implements Life
}
@Override
- public void transitionTo(LifecycleState state) {
- }
-
- @Override
public String toString() {
return "{ name:" + name + " source:" + source + " sink:" + sink
+ " lifecycleState:" + lifecycleState + " }";
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/main/java/org/apache/flume/lifecycle/LifecycleAware.java Fri Aug 12 00:46:52 2011
@@ -12,6 +12,4 @@ public interface LifecycleAware {
public LifecycleState getLifecycleState();
- public void transitionTo(LifecycleState state);
-
}
Modified: incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-core/src/test/java/org/apache/flume/lifecycle/TestLifecycleController.java Fri Aug 12 00:46:52 2011
@@ -98,10 +98,6 @@ public class TestLifecycleController {
return state;
}
- @Override
- public void transitionTo(LifecycleState state) {
- }
-
public long getSleepTime() {
return sleepTime;
}
Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FileBasedLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FileBasedLogicalNodeManager.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FileBasedLogicalNodeManager.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FileBasedLogicalNodeManager.java Fri Aug 12 00:46:52 2011
@@ -29,9 +29,4 @@ public class FileBasedLogicalNodeManager
return lifecycleState;
}
- @Override
- public void transitionTo(LifecycleState state) {
- // Not sure if this make sense.
- }
-
}
Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/FlumeNode.java Fri Aug 12 00:46:52 2011
@@ -19,7 +19,9 @@ public class FlumeNode implements Lifecy
private NodeConfigurationClient configurationClient;
@Override
- public void start(Context context) throws LifecycleException {
+ public void start(Context context) throws LifecycleException,
+ InterruptedException {
+
Preconditions.checkState(name != null, "Node name can not be null");
Preconditions.checkState(nodeManager != null,
"Node manager can not be null");
@@ -32,7 +34,9 @@ public class FlumeNode implements Lifecy
}
@Override
- public void stop(Context context) throws LifecycleException {
+ public void stop(Context context) throws LifecycleException,
+ InterruptedException {
+
logger.info("Flume node stopping - {}", name);
nodeManager.stop(context);
@@ -66,23 +70,4 @@ public class FlumeNode implements Lifecy
return lifecycleState;
}
- @Override
- public void transitionTo(LifecycleState state) {
- switch (state) {
- case START:
- Preconditions.checkState(lifecycleState.equals(LifecycleState.IDLE),
- "Unable to transition from " + lifecycleState + " to " + state);
- break;
- case STOP:
- Preconditions.checkState(lifecycleState.equals(LifecycleState.START),
- "Unable to transition from " + lifecycleState + " to " + state);
- break;
- case ERROR:
- break;
- default:
- throw new IllegalStateException("Unable to transition from "
- + lifecycleState + " to " + state);
- }
- }
-
}
Modified: incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java?rev=1156878&r1=1156877&r2=1156878&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/test/java/org/apache/flume/node/TestFlumeNode.java Fri Aug 12 00:46:52 2011
@@ -85,10 +85,6 @@ public class TestFlumeNode {
return lifecycleState;
}
- @Override
- public void transitionTo(LifecycleState state) {
- }
-
}
}