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/13 08:50:30 UTC
svn commit: r1157340 -
/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java
Author: esammer
Date: Sat Aug 13 06:50:30 2011
New Revision: 1157340
URL: http://svn.apache.org/viewvc?rev=1157340&view=rev
Log:
- Removed old, dead code in DefaultLogicalNodeManager (now uses LifecycleSupervisor
exclusively).
Modified:
incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java
Modified: incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java
URL: http://svn.apache.org/viewvc/incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java?rev=1157340&r1=1157339&r2=1157340&view=diff
==============================================================================
--- incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java (original)
+++ incubator/flume/branches/flume-728/flume-ng-node/src/main/java/org/apache/flume/node/nodemanager/DefaultLogicalNodeManager.java Sat Aug 13 06:50:30 2011
@@ -1,8 +1,5 @@
package org.apache.flume.node.nodemanager;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ScheduledExecutorService;
-
import org.apache.flume.Context;
import org.apache.flume.EventSink;
import org.apache.flume.EventSource;
@@ -14,7 +11,6 @@ import org.apache.flume.lifecycle.Lifecy
import org.apache.flume.lifecycle.LifecycleSupervisor;
import org.apache.flume.lifecycle.LifecycleSupervisor.SupervisorPolicy;
import org.apache.flume.node.NodeConfiguration;
-import org.apache.flume.node.NodeManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,8 +26,6 @@ public class DefaultLogicalNodeManager e
private SinkFactory sinkFactory;
private LifecycleSupervisor nodeSupervisor;
- private ExecutorService commandProcessorService;
- private ScheduledExecutorService monitorService;
private LifecycleState lifecycleState;
public DefaultLogicalNodeManager() {
@@ -101,8 +95,6 @@ public class DefaultLogicalNodeManager e
"You can not remove nodes from a manager that hasn't been started");
if (super.remove(node)) {
- stopNode(node);
-
nodeSupervisor.setDesiredState(node, LifecycleState.STOP);
nodeSupervisor.unsupervise(node);
@@ -112,48 +104,12 @@ public class DefaultLogicalNodeManager e
return false;
}
- public void startNode(LogicalNode node) {
- NodeStartCommand task = new NodeStartCommand();
-
- task.context = new Context();
- task.node = node;
- task.nodeManager = this;
-
- commandProcessorService.submit(task);
- }
-
- public void stopNode(LogicalNode node) {
- NodeRemoveCommand task = new NodeRemoveCommand();
-
- task.context = new Context();
- task.node = node;
- task.nodeManager = this;
-
- commandProcessorService.submit(task);
- }
-
@Override
public void start(Context context) throws LifecycleException,
InterruptedException {
logger.info("Node manager starting");
- /*
- * NodeStatusMonitor statusMonitor = new NodeStatusMonitor();
- *
- * statusMonitor.setNodeManager(this);
- *
- * commandProcessorService = Executors .newCachedThreadPool(new
- * ThreadFactoryBuilder().setNameFormat(
- * "nodeManager-commandProcessor-%d").build()); monitorService =
- * Executors.newScheduledThreadPool( 1, new
- * ThreadFactoryBuilder().setNameFormat(
- * "nodeManager-monitorService-%d").build());
- *
- * monitorService.scheduleAtFixedRate(statusMonitor, 0, 3,
- * TimeUnit.SECONDS);
- */
-
nodeSupervisor.start(context);
logger.debug("Node manager started");
@@ -167,22 +123,6 @@ public class DefaultLogicalNodeManager e
logger.info("Node manager stopping");
- /*
- * for (LogicalNode node : getNodes()) { stopNode(node); }
- *
- * monitorService.shutdown();
- *
- * while (!monitorService.isTerminated()) {
- * logger.debug("Waiting for node status monitor to shutdown");
- * monitorService.awaitTermination(1, TimeUnit.SECONDS); }
- *
- * commandProcessorService.shutdown();
- *
- * while (!commandProcessorService.isTerminated()) {
- * logger.debug("Waiting for command processor to shutdown");
- * commandProcessorService.awaitTermination(1, TimeUnit.SECONDS); }
- */
-
nodeSupervisor.stop(context);
logger.debug("Node manager stopped");
@@ -195,54 +135,4 @@ public class DefaultLogicalNodeManager e
return lifecycleState;
}
- public static class NodeStartCommand implements Runnable {
-
- public Context context;
- public LogicalNode node;
- public NodeManager nodeManager;
-
- @Override
- public void run() {
- if (node.getLifecycleState().equals(LifecycleState.START)) {
- logger.warn("Ignoring an attempt to start a running node:{}", node);
- return;
- }
-
- try {
- node.start(context);
- } catch (LifecycleException e) {
- logger.error("Failed to start node:" + node + " Exception follows.", e);
- } catch (InterruptedException e) {
- logger.info("Interrupted while starting node:" + node
- + " Almost certainly shutting down (or a serious bug)");
- }
- }
-
- }
-
- public static class NodeRemoveCommand implements Runnable {
-
- public Context context;
- public LogicalNode node;
- public NodeManager nodeManager;
-
- @Override
- public void run() {
- if (!node.getLifecycleState().equals(LifecycleState.START)) {
- logger.warn("Ignoring an attempt to stop a non-running node:{}", node);
- return;
- }
-
- try {
- node.stop(context);
- } catch (LifecycleException e) {
- logger.error("Failed to stop node:" + node + " Exception follows.", e);
- } catch (InterruptedException e) {
- logger.info("Interrupted while starting node:" + node
- + " Almost certainly shutting down (or a serious bug)");
- }
- }
-
- }
-
}