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 2017/10/18 16:32:25 UTC
svn commit: r1812547 - in
/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent:
./ launcher/ processors/
Author: cwiklik
Date: Wed Oct 18 16:32:25 2017
New Revision: 1812547
URL: http://svn.apache.org/viewvc?rev=1812547&view=rev
Log:
UIMA-5622 changed log level to reduce logging in production
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DefunctProcessDetector.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java Wed Oct 18 16:32:25 2017
@@ -878,7 +878,7 @@ public class NodeAgent extends AbstractD
}
- private boolean isAlive(IDuccProcess invProcess) {
+ public boolean isAlive(IDuccProcess invProcess) {
return invProcess.getProcessState().equals(ProcessState.Initializing)
|| invProcess.getProcessState().equals(ProcessState.Running)
|| invProcess.getProcessState().equals(ProcessState.Stopping)
@@ -1490,7 +1490,7 @@ public class NodeAgent extends AbstractD
processFound = true;
if (deployedProcess.isStopping()) {
if ( isProcessRunning(deployedProcess.getDuccProcess())) {
- logger.info(methodName, null, "....Checking if Proces with PID:" + process.getPID()+" is Defunct");
+ logger.debug(methodName, null, "....Checking if Proces with PID:" + process.getPID()+" is Defunct");
// spin a thread where we check if the process is defunct. If true,
// the process state is changed to Stopped and reason set to 'defunct'.
@@ -1498,7 +1498,7 @@ public class NodeAgent extends AbstractD
// can terminate a job.
defunctDetectorExecutor.execute(new DefunctProcessDetector(deployedProcess, logger));
}
- logger.info(methodName, null, "....Process Already Stopping PID:" + process.getPID()+" Returning");
+ logger.debug(methodName, null, "....Process Already Stopping PID:" + process.getPID()+" Returning");
break; // this process is already in stopping state
}
@@ -1619,7 +1619,7 @@ public class NodeAgent extends AbstractD
try {
synchronized (monitor) {
- logger.info(methodName, null, "----------------- Deployed Process List Size:"
+ logger.debug(methodName, null, "----------------- Deployed Process List Size:"
+ deployedProcesses.size());
// reference to an object we need to remove from the list
@@ -1635,10 +1635,10 @@ public class NodeAgent extends AbstractD
}
}
if (deployedProcessRef != null) {
- logger.info(methodName, null,
+ logger.debug(methodName, null,
"----------------- Removing Stopped Process from Deployed List");
deployedProcesses.remove(deployedProcessRef);
- logger.info(methodName, null,
+ logger.debug(methodName, null,
"----------------- Deployed Process List Size After Remove:"
+ deployedProcesses.size());
} else {
@@ -1947,7 +1947,7 @@ public class NodeAgent extends AbstractD
}
// this.reservations = reservations;
- logger.info("setReservations", null, "+++++++++++ Copied User Reservations - List Size:"
+ logger.debug("setReservations", null, "+++++++++++ Copied User Reservations - List Size:"
+ reservations.size());
} catch (InterruptedException e) {
} finally {
@@ -1980,7 +1980,7 @@ public class NodeAgent extends AbstractD
try {
reservationsSemaphore.acquire();
if (reservations != null) {
- logger.info("copyAllUserReservations", null,
+ logger.debug("copyAllUserReservations", null,
"+++++++++++ Copying User Reservations - List Size:" + reservations.size());
for (DuccUserReservation r : reservations) {
if ("System".equals(r.getUserId())) {
@@ -1996,7 +1996,7 @@ public class NodeAgent extends AbstractD
nui.addReservation(r.getReserveID());
}
} else {
- logger.info("copyAllUserReservations", null, " *********** No Reservations");
+ logger.debug("copyAllUserReservations", null, " *********** No Reservations");
}
} catch (InterruptedException e) {
} finally {
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java Wed Oct 18 16:32:25 2017
@@ -321,7 +321,7 @@ public class CGroupsManager {
String cpuLinkDir = "";
String cpuacctLinkDir = "";
- agentLogger.info("symbolicLinksForCpu", null, "Consuming Process Streams");
+ agentLogger.debug("symbolicLinksForCpu", null, "Consuming Process Streams");
while ((line = reader.readLine()) != null) {
agentLogger.info("symbolicLinksForCpu", null, ">>>>" + line);
//groupName = line.trim();
@@ -339,7 +339,7 @@ public class CGroupsManager {
}
}
- agentLogger.info("symbolicLinksForCpu", null, "Waiting for Process to Exit");
+ agentLogger.debug("symbolicLinksForCpu", null, "Waiting for Process to Exit");
int retCode = process.waitFor();
agentLogger.info("symbolicLinksForCpu", null, "Pocess Exit Code="+retCode);
if ( cpuLinkDir.length() > 0 && cpuacctLinkDir.length() > 0) {
@@ -688,7 +688,7 @@ public class CGroupsManager {
containerId = containerId + System.getProperty("file.separator");
}
String file = composeCpuAccountingFileName(containerId.trim());
- agentLogger.info("getCpuUsage", null, "CPUACCT.USAGE file:"+file);
+ agentLogger.debug("getCpuUsage", null, "CPUACCT.USAGE file:"+file);
File f = new File(file);
if ( f.exists() ) {
InputStreamReader isr = new InputStreamReader(new FileInputStream(f));
@@ -741,7 +741,7 @@ public class CGroupsManager {
containerId = containerId + System.getProperty("file.separator");
}
String file = composeMemoryStatFileName(containerId.trim());
- agentLogger.info("getUsageForMemoryStat", null, "MEMORY.STAT file:"+file);
+ agentLogger.debug("getUsageForMemoryStat", null, "MEMORY.STAT file:"+file);
File f = new File(file);
if ( f.exists() ) {
InputStreamReader isr = new InputStreamReader(new FileInputStream(f));
@@ -749,7 +749,7 @@ public class CGroupsManager {
String line;
try {
while ((line = br.readLine()) != null) {
- agentLogger.trace("getUsageForMemoryStat", null, "MEMORY.STAT Line:"+line);
+ agentLogger.debug("getUsageForMemoryStat", null, "MEMORY.STAT Line:"+line);
if ( line.startsWith(stat.getKey())) {
usage = Long.parseLong(line.trim().split(" ")[1]);
break;
@@ -762,10 +762,10 @@ public class CGroupsManager {
if (isr != null) {
isr.close();
}
- agentLogger.trace("getUsageForMemoryStat", null, "Done Reading memory.stat file:"+file);
+ agentLogger.debug("getUsageForMemoryStat", null, "Done Reading memory.stat file:"+file);
}
} else {
- agentLogger.info("getUsageForMemoryStat", null, "MEMORY.STAT file:"+file+" Not Found - Process RSS Usage is Unavailable");
+ agentLogger.debug("getUsageForMemoryStat", null, "MEMORY.STAT file:"+file+" Not Found - Process RSS Usage is Unavailable");
usage = -1; // cgroups accounting not configured
}
@@ -799,7 +799,7 @@ public class CGroupsManager {
SYSTEM+"/" + containerId };
int retCode = launchCommand(command);
if (retCode == 0) {
- agentLogger.info("setContainerMaxMemoryLimit", null, ">>>>"
+ agentLogger.debug("setContainerMaxMemoryLimit", null, ">>>>"
+ "SUCCESS - Created CGroup Limit on Container:"
+ containerId);
return true;
@@ -842,7 +842,7 @@ public class CGroupsManager {
SYSTEM+"/" + containerId };
int retCode = launchCommand(command);
if (retCode == 0) {
- agentLogger.info("setContainerCpuShares", null, ">>>>"
+ agentLogger.debug("setContainerCpuShares", null, ">>>>"
+ "SUCCESS - Created CGroup with CPU Shares="+containerCpuShares+" on Container:"
+ containerId);
return true;
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DefunctProcessDetector.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DefunctProcessDetector.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DefunctProcessDetector.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DefunctProcessDetector.java Wed Oct 18 16:32:25 2017
@@ -81,7 +81,7 @@ public class DefunctProcessDetector impl
childProcess.getDuccProcess().setProcessState(ProcessState.Stopped);
childProcess.getDuccProcess().setReasonForStoppingProcess(ReasonForStoppingProcess.Defunct.name());
} else {
- logger.info("DefunctProcessDetector.run()", childProcess.getDuccProcess().getDuccId(), "Process with PID:"+childProcess.getPid()+" Not Defunct");
+ logger.debug("DefunctProcessDetector.run()", childProcess.getDuccProcess().getDuccId(), "Process with PID:"+childProcess.getPid()+" Not Defunct");
}
} catch( Exception e) {
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java Wed Oct 18 16:32:25 2017
@@ -134,7 +134,7 @@ public class DuccCommandExecutor extends
try {
String[] cmd = getDeployableCommandLine(cmdLine, processEnv);
if (isKillCommand(cmdLine)) {
- logger.info(methodName, null, "Killing process");
+ logger.debug(methodName, null, "Killing process");
stopProcess(cmdLine, cmd);
} else {
IDuccProcess duccProcess = ((ManagedProcess) managedProcess)
@@ -335,7 +335,7 @@ public class DuccCommandExecutor extends
}
try {
// NEW Code
- logger.info(methodName,
+ logger.debug(methodName,
((ManagedProcess) super.managedProcess).getDuccId(),
">>>>>>>>>>>>>>> Stopping Process:"
+ ((ManagedProcess) managedProcess).getPid());
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/ProcessStreamConsumer.java Wed Oct 18 16:32:25 2017
@@ -87,7 +87,7 @@ public class ProcessStreamConsumer exten
if (is != null) {
is.close();
}
- logger.info("ProcessStreamConsumer.run()", workDuccId, "Stream Consumer Thread Terminated - Process Streams Redirected to a Log");
+ logger.debug("ProcessStreamConsumer.run()", workDuccId, "Stream Consumer Thread Terminated - Process Streams Redirected to a Log");
} catch (IOException e) {
// ignore
}
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java Wed Oct 18 16:32:25 2017
@@ -142,7 +142,7 @@ public class LinuxNodeMetricsProcessor e
if ( agent.receivedDuccState ) {
NodeUsersCollector nodeUsersCollector = new NodeUsersCollector(agent, logger);
- logger.info(methodName, null, "... Agent Collecting User Processes");
+ logger.debug(methodName, null, "... Agent Collecting User Processes");
Future<TreeMap<String,NodeUsersInfo>> nuiFuture =
pool.submit(nodeUsersCollector);
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1812547&r1=1812546&r2=1812547&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java Wed Oct 18 16:32:25 2017
@@ -138,12 +138,12 @@ public class LinuxProcessMetricsProcesso
ProcessSwapUsageCollector processSwapCollector = new ProcessSwapUsageCollector(
logger, agent.cgroupsManager, containerId);
- logger.info("LinuxProcessMetricsProcessor.getSwapUsage", null,
+ logger.debug("LinuxProcessMetricsProcessor.getSwapUsage", null,
"Fetching Swap Usage PID:" + process.getPID());
Future<ProcessSwapSpaceUsage> processFaults = pool
.submit(processSwapCollector);
swapUsage = processFaults.get().getSwapUsage();
- logger.info("LinuxProcessMetricsProcessor.getSwapUsage", null,
+ logger.debug("LinuxProcessMetricsProcessor.getSwapUsage", null,
" Process Swap Usage:" + swapUsage);
}
return swapUsage;
@@ -156,10 +156,10 @@ public class LinuxProcessMetricsProcesso
ProcessMajorFaultCollector processFaultsCollector =
new ProcessMajorFaultCollector(logger, agent.cgroupsManager, containerId);
- logger.info("LinuxProcessMetricsProcessor.getFaults",null,"Fetching Page Faults PID:"+process.getPID());
+ logger.debug("LinuxProcessMetricsProcessor.getFaults",null,"Fetching Page Faults PID:"+process.getPID());
Future<ProcessMemoryPageLoadUsage> processFaults = pool.submit(processFaultsCollector);
faults = processFaults.get().getMajorFaults();
- logger.info(
+ logger.debug(
"LinuxProcessMetricsProcessor.getFaults",null," Process Faults (pgpgin):"+faults);
}
return faults;
@@ -171,10 +171,10 @@ public class LinuxProcessMetricsProcesso
ProcessResidentMemoryCollector processRSSCollector =
new ProcessResidentMemoryCollector(logger, agent.cgroupsManager, containerId);
- logger.info("LinuxProcessMetricsProcessor.getRss",null,"Fetching RSS Usage for PID:"+process.getPID());
+ logger.debug("LinuxProcessMetricsProcessor.getRss",null,"Fetching RSS Usage for PID:"+process.getPID());
Future<ProcessResidentMemory> processRss = pool.submit(processRSSCollector);
rss = processRss.get().get();
- logger.info(
+ logger.debug(
"LinuxProcessMetricsProcessor.getRss",null," Process RSS:"+rss);
}
return rss;
@@ -188,7 +188,7 @@ public class LinuxProcessMetricsProcesso
Future<ProcessCpuUsage> processCpuUsage = null;
ProcessCpuUsageCollector processCpuUsageCollector =
new ProcessCpuUsageCollector(logger, agent.cgroupsManager, containerId);
- logger.info("LinuxProcessMetricsProcessor.getCpuUsage",null,"Fetching CPU Usage for PID:"+process.getPID());
+ logger.debug("LinuxProcessMetricsProcessor.getCpuUsage",null,"Fetching CPU Usage for PID:"+process.getPID());
processCpuUsage = pool
.submit(processCpuUsageCollector);
long cpuUsageInNanos = processCpuUsage.get().getCpuUsage();
@@ -196,7 +196,7 @@ public class LinuxProcessMetricsProcesso
// cpuUsage comes from cpuacct.usage and is in nanos
cpuUsage = Math.round( cpuUsageInNanos / 1000000 ); // normalize into millis
}
- logger.info(
+ logger.debug(
"LinuxProcessMetricsProcessor.getCpuUsage",null,
"CPU USAGE:"+cpuUsageInNanos+ " CLOCK RATE:"+agent.cpuClockRate+" Total CPU USAGE:"+cpuUsage);
}
@@ -261,7 +261,7 @@ public class LinuxProcessMetricsProcesso
String[] cgroupPids = agent.cgroupsManager
.getPidsInCgroup(containerId);
- logger.info("LinuxProcessMetricsProcessor.process",null,"Container ID:"+containerId+" cgroup pids "+cgroupPids.length);
+ logger.debug("LinuxProcessMetricsProcessor.process",null,"Container ID:"+containerId+" cgroup pids "+cgroupPids.length);
// Use Memory Guard only if cgroups are disabled and fudge
// factor > -1
@@ -333,7 +333,7 @@ public class LinuxProcessMetricsProcesso
// if (!process.getProcessType().equals(ProcessType.Pop)) {
if ( process.getProcessJmxUrl() != null
&& process.getProcessJmxUrl().trim().length() > 0 ) {
- logger.info("LinuxProcessMetricsProcessor.getGCStats", null, "Collecting GC Stats");
+ logger.debug("LinuxProcessMetricsProcessor.getGCStats", null, "Collecting GC Stats");
ProcessGarbageCollectionStats gcStats = gcStatsCollector
.collect();
return gcStats;