You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/02/01 20:14:58 UTC
svn commit: r1441587 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent:
./ deploy/ deploy/uima/ launcher/ metrics/collectors/ monitor/ processors/
Author: cwiklik
Date: Fri Feb 1 19:14:57 2013
New Revision: 1441587
URL: http://svn.apache.org/viewvc?rev=1441587&view=rev
Log:
UIMA--2631 - Clean up code to get rid of warnings
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeMetricsGenerator.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/RogueProcessReaper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ProcessEventListener.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessCpuUsageCollector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/AgentMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/RogueProcessDetector.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultProcessMetricsProcessor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/ProcessLifecycleProcessor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java Fri Feb 1 19:14:57 2013
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import java.util.Timer;
import java.util.TreeMap;
import java.util.concurrent.Future;
import java.util.concurrent.Semaphore;
@@ -112,12 +111,7 @@ public class NodeAgent extends AbstractD
boolean runWithDuccLing = false;
- private ProcessReaperTask reaperTask=null;
-
- private long or_state_update_timeout=0;
-
- private Timer reaperTimer;
-
+
private List<DuccUserReservation> reservations =
new ArrayList<DuccUserReservation>();
@@ -174,6 +168,7 @@ public class NodeAgent extends AbstractD
}
}
+ /*
int nodeStability=0;
long node_metrics_publish_rate=0;
@@ -183,6 +178,7 @@ public class NodeAgent extends AbstractD
if ( System.getProperty("ducc.agent.node.metrics.publish.rate") != null ) {
node_metrics_publish_rate = Long.parseLong(System.getProperty("ducc.agent.node.metrics.publish.rate"));
}
+ */
// nodeMonitor = new AgentMonitor(this, logger,nodeStability, (int)node_metrics_publish_rate);
// nodeMonitor.start();
@@ -248,12 +244,7 @@ public class NodeAgent extends AbstractD
return (process.getProcessState().equals(ProcessState.Undefined) && process.isDeallocated());
}
- private void markAsStopped(IDuccProcess process) {
- // check if the process state is either Running, Initializing, or Starting
- if (isAlive(process)) {
- process.setProcessState(ProcessState.Stopped);
- }
- }
+
/**
* Stops any process that is in agent's inventory but not in provided job list sent by the PM.
*
@@ -614,6 +605,8 @@ public class NodeAgent extends AbstractD
case Initializing:
case Running:
return true;
+ default:
+ break;
}
return false;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeMetricsGenerator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeMetricsGenerator.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeMetricsGenerator.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeMetricsGenerator.java Fri Feb 1 19:14:57 2013
@@ -25,15 +25,12 @@ import org.apache.uima.ducc.agent.proces
public class NodeMetricsGenerator {
- private int refreshRate;
- private int timeToLive;
+
public NodeMetricsGenerator( int refreshRate, int timeToLive) {
- this.refreshRate = refreshRate;
- this.timeToLive = timeToLive;
+
}
protected LinuxNodeMetricsProcessor configure( CamelContext context, String brokerUrl, final String ducc_node_metrics_endpoint) throws Exception {
-// final LinuxNodeMetricsProcessor nodeMetricsProcessor =
-// new LinuxNodeMetricsProcessor("/proc/meminfo", "/proc/loadavg");
+
context.addRoutes(new RouteBuilder() {
public void configure() {
// from("timer:nodeMetricsTimer?fixedRate=true&period=" + refreshRate).startupOrder(3)
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/RogueProcessReaper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/RogueProcessReaper.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/RogueProcessReaper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/RogueProcessReaper.java Fri Feb 1 19:14:57 2013
@@ -290,9 +290,9 @@ public class RogueProcessReaper {
Process killedProcess = pb.start();
InputStream is = killedProcess.getInputStream();
BufferedReader reader = new BufferedReader(new InputStreamReader(is));
- String line = null;
+ //String line = null;
// read the next line from kill command
- while ((line = reader.readLine()) != null) {
+ while (reader.readLine() != null) {
// dont care about the output, just drain the buffers
}
is.close();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/ServiceAdapter.java Fri Feb 1 19:14:57 2013
@@ -60,11 +60,9 @@ public class ServiceAdapter implements S
this.duccProcessId = duccProcessId;
this.endpoint = endpoint;
}
- @Override
public void notifyAgentWithStatus(ProcessState state) {
notifyAgentWithStatus(state, null);
}
- @Override
public void notifyAgentWithStatus(ProcessState state, String processJmxUrl) {
synchronized( stateLock ) {
this.state = state;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ManagedUimaService.java Fri Feb 1 19:14:57 2013
@@ -345,10 +345,10 @@ public class ManagedUimaService extends
continue;
}
StringBuffer sb = new StringBuffer();
- int partCount = 0;
+ //int partCount = 0;
// compose component name from jmx ObjectName
for (String part : aeObjectNameParts) {
- partCount++;
+ //partCount++;
if (part.startsWith("org.apache.uima:type")
|| part.startsWith("s=")) {
continue; // skip service name part of the name
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ProcessEventListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ProcessEventListener.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ProcessEventListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/ProcessEventListener.java Fri Feb 1 19:14:57 2013
@@ -27,14 +27,14 @@ import org.apache.uima.ducc.transport.ev
public class ProcessEventListener implements DuccEventDelegateListener{
- private DuccEventDispatcher eventDispatcher;
+ //private DuccEventDispatcher eventDispatcher;
private ManagedService service;
public ProcessEventListener(ManagedService service) {
this.service = service;
}
public void setDuccEventDispatcher(DuccEventDispatcher eventDispatcher) {
- this.eventDispatcher = eventDispatcher;
+ //this.eventDispatcher = eventDispatcher;
}
public void onProcessStop(@Body ProcessStopDuccEvent event) {
service.killService();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/deploy/uima/UimaAsServiceConfiguration.java Fri Feb 1 19:14:57 2013
@@ -167,7 +167,7 @@ public class UimaAsServiceConfiguration
this.thisNodeIP = thisNodeIP;
}
public synchronized boolean matches(Exchange exchange) {
- String methodName="DuccProcessFilter.matches";
+ //String methodName="DuccProcessFilter.matches";
boolean result = false;
try {
String pid = (String)exchange.getIn().getHeader(DuccExchange.ProcessPID);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java Fri Feb 1 19:14:57 2013
@@ -94,11 +94,7 @@ public class DuccCommandExecutor extends
throw e;
}
}
- private boolean isProcessTerminated( IDuccProcess process ) {
- return process.getProcessState().equals(ProcessState.Stopped) ||
- process.getProcessState().equals(ProcessState.Failed) ||
- process.getProcessState().equals(ProcessState.FailedInitialization);
- }
+
private void stopProcess(ICommandLine cmdLine, String[] cmd ) throws Exception {
String methodName = "stopProcess";
Future<?> future = ((ManagedProcess) managedProcess).getFuture();
@@ -276,7 +272,7 @@ public class DuccCommandExecutor extends
}
private String[] getDeployableCommandLine(ICommandLine cmdLine, Map<String, String> processEnv) throws Exception {
- String methodName = "getDeployableCommandLine";
+ //String methodName = "getDeployableCommandLine";
String[] cmd = new String[0];
try {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ManagedProcess.java Fri Feb 1 19:14:57 2013
@@ -48,7 +48,7 @@ public class ManagedProcess implements P
*/
private static final long serialVersionUID = 1L;
- private static final String JMXPortProperty = "com.sun.management.jmxremote.port";
+ //private static final String JMXPortProperty = "com.sun.management.jmxremote.port";
/*
* Process States
* +------- STARTING
@@ -80,7 +80,7 @@ public class ManagedProcess implements P
private IDuccProcess duccProcess;
// Used to kill a process after it reports its PID.
private volatile boolean killAfterLaunch=false;
- private String pid;
+ //private String pid;
private String processCorrelationId;
// JMX Port
private String port = null;
@@ -88,7 +88,7 @@ public class ManagedProcess implements P
private String socketEndpoint = null;
private int tgCounter=1;
- private String owner;
+ //private String owner;
// log path for http access
private String logPath;
// absolute path to the process log
@@ -113,7 +113,7 @@ public class ManagedProcess implements P
protected transient ProcessStreamConsumer stdOutReader;
protected transient ProcessStreamConsumer stdErrReader;
- private transient OutputStream processLogStream = null;
+ //private transient OutputStream processLogStream = null;
private transient CountDownLatch pidReadyCount = new CountDownLatch(1);
private ICommandLine commandLine;
@@ -235,7 +235,7 @@ public class ManagedProcess implements P
this.processType = processType;
}
public void setLogStream(OutputStream os ) {
- processLogStream = os;
+ //processLogStream = os;
}
public boolean isAgentProcess() {
return agentProcess;
@@ -395,7 +395,7 @@ public class ManagedProcess implements P
* @param pid the pid to set
*/
public void setPid(String pid) {
- this.pid = pid;
+ //this.pid = pid;
duccProcess.setPID(pid);
pidReadyCount.countDown();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/DefaultNodeMemoryCollector.java Fri Feb 1 19:14:57 2013
@@ -31,7 +31,7 @@ import org.apache.uima.ducc.common.agent
public class DefaultNodeMemoryCollector implements CallableMemoryCollector{
- private static final String TOTAL_MEMORY_SIZE="getTotalPhysicalMemorySize";
+ //private static final String TOTAL_MEMORY_SIZE="getTotalPhysicalMemorySize";
private static final String FREE_PHYSICAL_MEMORY_SIZE="getFreePhysicalMemorySize";
private static final String FREE_SWAP_MEMORY_SIZE="getFreeSwapSpaceSize";
private static final String TOTAL_SWAP_SPACE_SIZE="getTotalSwapSpaceSize";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java Fri Feb 1 19:14:57 2013
@@ -78,6 +78,8 @@ public class NodeMemInfoCollector implem
} catch (Exception e) {
e.printStackTrace();
throw e;
+ } finally {
+ fileReader.close();
}
return new NodeMemoryInfo(memInfoValues, fakeMemorySize);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java Fri Feb 1 19:14:57 2013
@@ -374,6 +374,7 @@ public class NodeUsersCollector implemen
}
}
+ /*
private void dump(Set<NodeUsersCollector.ProcessInfo> processList) {
for( NodeUsersCollector.ProcessInfo pi: processList ) {
if ( logger == null ) {
@@ -404,6 +405,7 @@ public class NodeUsersCollector implemen
}
}
}
+ */
public static void main(String[] args) {
/*
try {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessCpuUsageCollector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessCpuUsageCollector.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessCpuUsageCollector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/ProcessCpuUsageCollector.java Fri Feb 1 19:14:57 2013
@@ -18,12 +18,7 @@
*/
package org.apache.uima.ducc.agent.metrics.collectors;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.Callable;
import org.apache.uima.ducc.common.agent.metrics.cpu.DuccProcessCpuUsage;
@@ -32,14 +27,14 @@ import org.apache.uima.ducc.common.utils
public class ProcessCpuUsageCollector extends AbstractMetricCollector implements
Callable<ProcessCpuUsage> {
- private DuccLogger logger;
- private String pid;
+ //private DuccLogger logger;
+ //private String pid;
public ProcessCpuUsageCollector(DuccLogger logger, String pid,
RandomAccessFile fileHandle, int howMany, int offset) {
super(fileHandle, howMany, offset);
- this.logger = logger;
- this.pid = pid;
+ //this.logger = logger;
+ //this.pid = pid;
}
public ProcessCpuUsage call() throws Exception {
@@ -52,7 +47,7 @@ public class ProcessCpuUsageCollector ex
throw e;
}
}
-
+/*
private String execTopShell() throws Exception {
List<String> command = new ArrayList<String>();
command.add("top");
@@ -88,4 +83,5 @@ public class ProcessCpuUsageCollector ex
process.waitFor();
return cpu;
}
+ */
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/AgentMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/AgentMonitor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/AgentMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/AgentMonitor.java Fri Feb 1 19:14:57 2013
@@ -28,12 +28,12 @@ import org.apache.uima.ducc.common.utils
public class AgentMonitor extends ANodeStability{
- private NodeAgent agent;
+ //private NodeAgent agent;
private ProcessReaperTask reaperTask;
DuccLogger logger;
public AgentMonitor(NodeAgent agent, DuccLogger logger, int nodeStability, int agentMetricsRate) {
super(nodeStability, agentMetricsRate);
- this.agent = agent;
+ //this.agent = agent;
this.logger = logger;
reaperTask = new ProcessReaperTask(agent,logger);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/RogueProcessDetector.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/RogueProcessDetector.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/RogueProcessDetector.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/RogueProcessDetector.java Fri Feb 1 19:14:57 2013
@@ -123,8 +123,8 @@ public class RogueProcessDetector extend
executor.scheduleAtFixedRate(new Runnable() {
public void run() {
try {
- TreeMap<String,NodeUsersInfo> userInfo =
- nodeUsersCollector.call();
+ //TreeMap<String,NodeUsersInfo> userInfo =
+ nodeUsersCollector.call();
} catch (Exception e) {
throw new RuntimeException(e);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultProcessMetricsProcessor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultProcessMetricsProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultProcessMetricsProcessor.java Fri Feb 1 19:14:57 2013
@@ -24,12 +24,12 @@ import org.apache.uima.ducc.transport.ev
public class DefaultProcessMetricsProcessor implements ProcessMetricsProcessor {
- private NodeAgent agent;
- private IDuccProcess process;
+ // private NodeAgent agent;
+ // private IDuccProcess process;
public DefaultProcessMetricsProcessor( IDuccProcess process, NodeAgent agent) {
- this.agent = agent;
- this.process = process;
+ // this.agent = agent;
+ // this.process = process;
}
public void process(Exchange arg0) throws Exception {
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java Fri Feb 1 19:14:57 2013
@@ -53,7 +53,7 @@ public class LinuxNodeMetricsProcessor e
private final ExecutorService pool;
private RandomAccessFile memInfoFile;
private RandomAccessFile loadAvgFile;
- private Node node;
+ //private Node node;
private int swapThreshold = 0;
public LinuxNodeMetricsProcessor(NodeAgent agent, String memInfoFilePath,
String loadAvgFilePath) throws FileNotFoundException {
@@ -63,7 +63,7 @@ public class LinuxNodeMetricsProcessor e
// open files and keep them open until stop() is called
memInfoFile = new RandomAccessFile(memInfoFilePath, "r");
loadAvgFile = new RandomAccessFile(loadAvgFilePath, "r");
- node = new DuccNode(agent.getIdentity(), null);
+ //node = new DuccNode(agent.getIdentity(), null);
if ( System.getProperty("ducc.node.min.swap.threshold") != null ) {
try {
swapThreshold = Integer.valueOf(System.getProperty("ducc.node.min.swap.threshold"));
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java Fri Feb 1 19:14:57 2013
@@ -42,7 +42,7 @@ import org.apache.uima.ducc.transport.ev
public class LinuxProcessMetricsProcessor extends BaseProcessor
implements ProcessMetricsProcessor {
private RandomAccessFile statmFile;
- private RandomAccessFile nodeStatFile;
+ //private RandomAccessFile nodeStatFile;
private RandomAccessFile processStatFile;
private final ExecutorService pool;
private IDuccProcess process;
@@ -56,7 +56,7 @@ implements ProcessMetricsProcessor {
public LinuxProcessMetricsProcessor(DuccLogger logger, IDuccProcess process, NodeAgent agent,String statmFilePath, String nodeStatFilePath, String processStatFilePath, ManagedProcess managedProcess) throws FileNotFoundException{
this.logger = logger;
statmFile = new RandomAccessFile(statmFilePath, "r");
- nodeStatFile = new RandomAccessFile(nodeStatFilePath, "r");
+ //nodeStatFile = new RandomAccessFile(nodeStatFilePath, "r");
processStatFile = new RandomAccessFile(processStatFilePath, "r");
this.managedProcess = managedProcess;
this.agent = agent;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/ProcessLifecycleProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/ProcessLifecycleProcessor.java?rev=1441587&r1=1441586&r2=1441587&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/ProcessLifecycleProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/ProcessLifecycleProcessor.java Fri Feb 1 19:14:57 2013
@@ -22,8 +22,8 @@ import org.apache.camel.Exchange;
public class ProcessLifecycleProcessor extends BaseProcessor {
- private static final String windowsCommandSeparator = "&";
- private static final String nixCommandSeparator = " ; ";
+ //private static final String windowsCommandSeparator = "&";
+ //private static final String nixCommandSeparator = " ; ";
public ProcessLifecycleProcessor() {
super();
}