svn commit: r1708160 - /uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py

[challngr]

Author: challngr
Date: Mon Oct 12 16:47:16 2015
New Revision: 1708160

URL: http://svn.apache.org/viewvc?rev=1708160=rev
Log:
UIMA-4577 Remove some debugging lines.

Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1708160=1708159=1708160=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Mon Oct 12 
16:47:16 2015
@@ -241,6 +241,7 @@ class DuccUtil(DuccBase):
 
 # bypass all of this for the initial delivery
 if ( self.db_parms == self.db_disabled ):
+print '   (Bypass database start because ducc.database.host =', 
self.db_disabled + ')'
 return True
 
 print 'Starting database'
@@ -404,7 +405,7 @@ class DuccUtil(DuccBase):
 
 def nohup(self, cmd, showpid=True):
 cmd = ' '.join(cmd)
-print ' nohup', cmd, ''
+# print ' nohup', cmd, ''
 devnw = open(os.devnull, 'w')
 devnr = open(os.devnull, 'r')
 ducc = subprocess.Popen(cmd, shell=True, stdin=devnr, stdout=devnw, 
stderr=devnw)
@@ -417,7 +418,7 @@ class DuccUtil(DuccBase):
 def ssh(self, host, do_wait, *CMD):
 
 cmd = ' '.join(CMD)
-print 'ssh -o BatchMode=yes -o ConnectTimeout=10', host, cmd
+# print 'ssh -o BatchMode=yes -o ConnectTimeout=10', host, cmd
 if ( do_wait ):
 return self.popen('ssh -q -o BatchMode=yes -o ConnectTimeout=10', 
host, cmd)
 else:

svn commit: r1708155 - /uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java

[challngr]

Author: challngr
Date: Mon Oct 12 16:24:25 2015
New Revision: 1708155

URL: http://svn.apache.org/viewvc?rev=1708155=rev
Log:
UIMA-4577 RM node state persistence.  Loader updates.  Service reg updates.

Modified:

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java?rev=1708155=1708154=1708155=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
 Mon Oct 12 16:24:25 2015
@@ -530,7 +530,7 @@ public class DbLoader
 try {
 
 OGlobalConfiguration.USE_WAL.setValue(false);
-OGlobalConfiguration.USE_LOG.setValue(false);
+// OGlobalConfiguration.USE_LOG.setValue(false);
 
 OGlobalConfiguration.dumpConfiguration(System.out);
 

svn commit: r1708149 [1/2] - in /uima/sandbox/uima-ducc/trunk: src/main/admin/ src/main/resources/ uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/ uima-ducc-common/src/main/java/org/

[challngr]

Author: challngr
Date: Mon Oct 12 16:10:55 2015
New Revision: 1708149

URL: http://svn.apache.org/viewvc?rev=1708149=rev
Log:
UIMA-4577 RM node state persistence.  Loader updates.  Service reg updates.

Added:

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/rm/

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/rm/IRmPersistence.java

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/rm/NullRmStatePersistence.java

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/rm/RmPersistenceFactory.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbListLoader.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/RmStatePersistence.java
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties

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-common/src/main/java/org/apache/uima/ducc/common/ANodeStability.java

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/IStateServices.java

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/NullStateServices.java

uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/persistence/services/StateServices.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbConstants.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbCreate.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbHandle.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbManager.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/StateServicesDb.java

uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/misc/SmLoader.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ISchedulerMain.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java

uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java

uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java

uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java

uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/event/ServiceManagerEventListener.java

uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java

Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py?rev=1708149=1708148=1708149=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc.py Mon Oct 12 16:10:55 2015
@@ -66,6 +66,10 @@ class Ducc(DuccUtil):
 else:
 jp = jp + k + '=' + v + ' '
 
+
+if ( self.db_jvm_args != None ):
+jp = jp + ' ' + self.db_jvm_args
+
 cmd = ' '.join(['nohup', self.java(), jp, '-cp', classpath, main, '&'])
 print cmd
 
@@ -177,6 +181,7 @@ class Ducc(DuccUtil):
 jvm_opts.append("-Dducc.rm.override.dram=" + rmoverride)
 if ( self.rm_jvm_args != None ):
 jvm_opts.append(self.rm_jvm_args)
+self.add_to_classpath(ducc_home + '/lib/orientdb/*')   
 
 if ( c == 'ws' ):
 

svn commit: r1708149 [2/2] - in /uima/sandbox/uima-ducc/trunk: src/main/admin/ src/main/resources/ uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/monitor/ uima-ducc-common/src/main/java/org/

[challngr]

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java?rev=1708149=1708148=1708149=diff
==
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java
 Mon Oct 12 16:10:55 2015
@@ -79,9 +79,14 @@ public class DbLoader
 String archive_key  = IStateServices.archive_key;
 String archive_flag = IStateServices.archive_flag;
 
-int nthreads = 40;
+int nthreads = 20;
 AtomicInteger counter = new AtomicInteger(0);
 
+//int joblimit = 1;
+//int reservationlimit = 1;
+//int servicelimit = 1;
+//int registrylimit= 1;
+
 int joblimit = Integer.MAX_VALUE;
 int reservationlimit = Integer.MAX_VALUE;
 int servicelimit = Integer.MAX_VALUE;
@@ -111,6 +116,13 @@ public class DbLoader
 System.exit(1);
 }
 
+jobHistory = from + jobHistory;
+reservationHistory = from + reservationHistory;
+serviceHistory = from + serviceHistory;
+serviceRegistryHistory = from + serviceRegistryHistory;
+serviceRegistry= from + serviceRegistry;
+checkpointFile = from + checkpointFile;
+
 f = new File(to);
 if ( ! f.isDirectory() ) {
 System.out.println("'to' must be a directory");
@@ -120,39 +132,26 @@ public class DbLoader
 String databasedir =  to + "/database/databases";
 String databasename = databasedir + "/DuccState";
 // We always use a non-networked version for loading
-state_url = "plocal:" + databasedir + "/DuccState";
+//state_url = "plocal:" + databasedir + "/DuccState";
+state_url = "remote:bluej538/DuccState";
 System.setProperty("ducc.state.database.url", state_url);
 
-f = new File(databasedir);
-if ( f.exists() ) {
-f = new File(databasename);
-if ( f.exists() ) {
-logger.info(methodName, null, "Dropping existing database.");
-DbManager dbm = new DbManager(state_url, logger);
-dbm.init();
-dbm.drop();
-dbm.shutdown();
-}
-} else {
-try {
-if ( ! f.mkdirs() ) {
-System.out.println("Cannot create database directory: " + 
databasedir);
+if ( state_url.startsWith("plocal") ) {
+f = new File(databasedir);
+if ( !f.exists() ) {
+try {
+if ( ! f.mkdirs() ) {
+System.out.println("Cannot create database directory: 
" + databasedir);
+System.exit(1);
+}
+System.out.println("Created database directory " + 
databasedir);
+} catch ( Exception e ) {
+System.out.println("Cannot create database directory: " + 
databasedir + ":" + e.toString());
 System.exit(1);
 }
-System.out.println("Created database directory " + 
databasedir);
-} catch ( Exception e ) {
-System.out.println("Cannot create database directory: " + 
databasedir + ":" + e.toString());
-System.exit(1);
 }
 }
 
-
-jobHistory = from + jobHistory;
-reservationHistory = from + reservationHistory;
-serviceHistory = from + serviceHistory;
-serviceRegistryHistory = from + serviceRegistryHistory;
-serviceRegistry= from + serviceRegistry;
-checkpointFile = from + checkpointFile;
 }
 
 void closeStream(InputStream in)
@@ -164,6 +163,7 @@ public class DbLoader
 {
 String methodName = "loadJobs";
 
+logger.info(methodName, null, "  Load jobs 
");
 File dir = new File(jobHistory);
 if ( !dir.isDirectory() ) {
 logger.info(methodName, null, "Cannot find job history; skipping 
load of jobs.");
@@ -237,6 +237,7 @@ public class DbLoader
 {
 String methodName = "loadReservations";
 
+logger.info(methodName, null, "  Load reservations 
");
 File dir = new File(reservationHistory);
 if ( ! dir.isDirectory() ) {
 logger.info(methodName, null, "No reservation directory found; 
skipping database load of reservations.");
@@ -310,6 +311,8 @@ public class DbLoader
 public void loadServices()
 {
 String 

svn commit: r1708180 - /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java

[burn]

Author: burn
Date: Mon Oct 12 17:55:42 2015
New Revision: 1708180

URL: http://svn.apache.org/viewvc?rev=1708180=rev
Log:
Merge 4585 Fix %CPU when JP has child procs

Modified:

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1708180=1708179=1708180=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
 (original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
 Mon Oct 12 17:55:42 2015
@@ -18,7 +18,6 @@
  */
 package org.apache.uima.ducc.agent.processors;
 
-
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -47,460 +46,570 @@ import org.apache.uima.ducc.transport.ev
 import 
org.apache.uima.ducc.transport.event.common.IDuccProcessType.ProcessType;
 import org.apache.uima.ducc.transport.event.common.IProcessState.ProcessState;
 
-public class LinuxProcessMetricsProcessor extends BaseProcessor implements 
ProcessMetricsProcessor {
-  private RandomAccessFile statmFile;
-
-  // private RandomAccessFile nodeStatFile;
-  private RandomAccessFile processStatFile;
+public class LinuxProcessMetricsProcessor extends BaseProcessor implements
+   ProcessMetricsProcessor {
+   private RandomAccessFile statmFile;
+
+   // private RandomAccessFile nodeStatFile;
+   private RandomAccessFile processStatFile;
+
+   private long totalCpuInitUsage = 0;
+
+   private boolean initializing = true;
+
+   private final ExecutorService pool;
+
+   private IDuccProcess process;
+
+   private DuccGarbageStatsCollector gcStatsCollector;
+
+   private int blockSize = 4096; // default, OS specific
+
+   private DuccLogger logger;
+
+   private ManagedProcess managedProcess;
+
+   private NodeAgent agent;
+
+   private int fudgeFactor = 5; // default is 5%
+
+   private volatile boolean closed = true;
+
+   private long clockAtStartOfRun = 0;
+
+   private long percentCPU = 0;
+
+   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");
+   processStatFile = new RandomAccessFile(processStatFilePath, 
"r");
+   this.managedProcess = managedProcess;
+   this.agent = agent;
+   pool = Executors.newCachedThreadPool();
+   this.process = process;
+   gcStatsCollector = new DuccGarbageStatsCollector(logger, 
process);
+
+   // keep a refernce to this so that we can call close() when the 
process
+   // terminates. We need to
+   // close fds to stat and statm files
+   managedProcess.setMetricsProcessor(this);
+
+   blockSize = agent.getOSPageSize();
+
+   if (System.getProperty("ducc.agent.share.size.fudge.factor") != 
null) {
+   try {
+   fudgeFactor = Integer.parseInt(System
+   
.getProperty("ducc.agent.share.size.fudge.factor"));
+   } catch (NumberFormatException e) {
+   e.printStackTrace();
+   }
+   }
+   closed = false;
+   }
+
+   public void stop() {
+   try {
+   if (pool != null) {
+   pool.shutdown();
+   }
+   } catch (Exception e) {
+   logger.error("LinuxProcessMetricsProcessor.stop()", 
null, e);
+
+   }
+   }
+
+   public void close() {
+   closed = true;
+   try {
+   if (statmFile != null && statmFile.getFD().valid()) {
+   statmFile.close();
+   }
+   if (processStatFile != null && 
processStatFile.getFD().valid()) {
+   

svn commit: r1708161 - /uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties

[challngr]

Author: challngr
Date: Mon Oct 12 16:52:03 2015
New Revision: 1708161

URL: http://svn.apache.org/viewvc?rev=1708161=rev
Log:
UIMA-4577 Set RM persistence to null implementation.

Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties

Modified: 
uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties?rev=1708161=1708160=1708161=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties 
(original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/default.ducc.properties Mon 
Oct 12 16:52:03 2015
@@ -540,5 +540,8 @@ ducc.service.persistence.impl = org.apac
 #ducc.job.history.impl = org.apache.uima.ducc.database.HistoryManagerDb
 ducc.job.history.impl = 
org.apache.uima.ducc.transport.event.common.history.HistoryPersistenceManager
 
+ducc.rm.persistence.impl = 
org.apache.uima.ducc.common.persistence.rm.NullRmStatePersistence
+#ducc.rm.persistence.impl = 
org.apache.uima.ducc.database.RmStatePersistence
+
 # end database things 
---
 

svn commit: r1708187 - /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml

[burn]

Author: burn
Date: Mon Oct 12 18:06:55 2015
New Revision: 1708187

URL: http://svn.apache.org/viewvc?rev=1708187=rev
Log:
Merge 4508 Disable automatic svn updates

Modified:
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml?rev=1708187=1708186=1708187=diff
==
--- uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml 
(original)
+++ uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-parent/pom.xml 
Mon Oct 12 18:06:55 2015
@@ -685,27 +685,25 @@ ${uimaDUCCNoticeText}

 
 
-
-
-  org.codehaus.mojo
-  buildnumber-maven-plugin
-  1.3
-  
-
-  validate
-  
-create
-  
-
-  
-  
-false
-true
-  
-
-
-
-
+ 
+ 
+   org.codehaus.mojo
+   buildnumber-maven-plugin
+   1.3
+   
+ 
+   validate
+   
+ create
+   
+ 
+   
+   
+ false
+ false
+   
+ 
 

maven-compiler-plugin
@@ -730,7 +728,7 @@ ${uimaDUCCNoticeText}

${basedir}

${java.vendor}
Apache 
UIMA DUCC
-${buildNumber}
+   
${buildNumber}

svn commit: r1708175 - /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java

[burn]

Author: burn
Date: Mon Oct 12 17:27:33 2015
New Revision: 1708175

URL: http://svn.apache.org/viewvc?rev=1708175=rev
Log:
Merge 4588 - JP JD AP should not listen on admin channel

Modified:

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java?rev=1708175=1708174=1708175=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
 (original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/component/AbstractDuccComponent.java
 Mon Oct 12 17:27:33 2015
@@ -319,7 +319,9 @@ public abstract class AbstractDuccCompon
this.service = service;
if (System.getProperty("ducc.deploy.components") != null
&& 
!System.getProperty("ducc.deploy.components").equals("uima-as")
-&& 
!System.getProperty("ducc.deploy.components").equals("jd")
+   && 
!System.getProperty("ducc.deploy.components").equals("job-process")
+   && 
!System.getProperty("ducc.deploy.components").equals("service")
+   && 
!System.getProperty("ducc.deploy.components").equals("jd")
&& (endpoint = System.getProperty("ducc.admin.endpoint")) 
!= null) {
logger.info("start", null, ".Starting Admin Channel on 
endpoint:" + endpoint);
 startAdminChannel(endpoint, this);

svn commit: r1708181 - in /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent: NodeAgent.java launcher/CGroupsManager.java launcher/DuccCommandExe

[burn]

Author: burn
Date: Mon Oct 12 17:57:38 2015
New Revision: 1708181

URL: http://svn.apache.org/viewvc?rev=1708181=rev
Log:
Merge 4578 Agent should kill children

Modified:

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
   (contents, props changed)

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1708181=1708180=1708181=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
 (original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
 Mon Oct 12 17:57:38 2015
@@ -90,7 +90,9 @@ public class NodeAgent extends AbstractD
   public static DuccLogger logger = DuccLogger.getLogger(NodeAgent.class, 
COMPONENT_NAME);
 
   public static final String ProcessStateUpdatePort = 
"ducc.agent.process.state.update.port";
-
+  public static int SIGKILL=9;
+  public static int SIGTERM=15;
+  
   // Map of known processes this agent is managing. This map is published
   // at regular intervals as part of agent's inventory update.
   private Map inventory = new HashMap();
@@ -272,7 +274,13 @@ public class NodeAgent extends AbstractD
 if (cgroupsSubsystems == null) {
   cgroupsSubsystems = "memory,cpu";
 }
-cgroupsManager = new CGroupsManager(cgUtilsPath, 
cgroupsBaseDir, cgroupsSubsystems, logger);
+   long maxTimeToWaitForProcessToStop = 6; // default 
1 minute
+   if (configurationFactory.processStopTimeout != null) {
+   maxTimeToWaitForProcessToStop = Long
+   
.valueOf(configurationFactory.processStopTimeout);
+   }
+
+cgroupsManager = new CGroupsManager(cgUtilsPath, 
cgroupsBaseDir, cgroupsSubsystems, logger, maxTimeToWaitForProcessToStop);
 // check if cgroups base directory exists in the filesystem
 // which means that cgroups
 // and cgroups convenience package are installed and the
@@ -293,7 +301,7 @@ public class NodeAgent extends AbstractD
  useCgroups = true;
   try {
  // remove dummy container
- cgroupsManager.destroyContainer("test");
+ 
cgroupsManager.destroyContainer("test","duck", SIGKILL);
   } catch( Exception eee ) {}
   logger.info("nodeAgent", null, "--- Agent 
Running with CGroups Enabled");
  } else {

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java?rev=1708181=1708180=1708181=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
 (original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
 Mon Oct 12 17:57:38 2015
@@ -31,6 +31,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.uima.ducc.agent.NodeAgent;
 import org.apache.uima.ducc.agent.launcher.ManagedProcess;
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.Utils;
@@ -52,7 +53,7 @@ public class CGroupsManager {
private String cgroupUtilsDir=null;
private String cgroupSubsystems = ""; // comma separated list of 
subsystems

// eg. memory,cpu
-
+private long maxTimeToWaitForProcessToStop;
/**
 * @param args
 */
@@ -60,7 +61,7 @@ public class CGroupsManager {
try {
 
CGroupsManager cgMgr = new 

svn commit: r1708176 - /uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java

[burn]

Author: burn
Date: Mon Oct 12 17:29:57 2015
New Revision: 1708176

URL: http://svn.apache.org/viewvc?rev=1708176=rev
Log:
Merge 4630 Fix for DD perf metrics not in current UIMA-AS

Modified:

uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java

Modified: 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java?rev=1708176=1708175=1708176=diff
==
--- 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
 (original)
+++ 
uima/sandbox/uima-ducc/branches/uima-ducc-2.0.1/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jp/UimaASProcessContainer.java
 Mon Oct 12 17:29:57 2015
@@ -103,11 +103,14 @@ public class UimaASProcessContainer  ext
if ( "uima-as".equals(jobType)) {
System.out.println("UIMA-AS 
Version:"+UimaAsVersion.getFullVersionString());
 } 
-   // enable performance breakdown reporting for uima AS version > 
2.6.0
-   if ( UimaAsVersion.getMajorVersion() >=2 && 
UimaAsVersion.getMinorVersion() >= 6 && UimaAsVersion.getBuildRevision() > 0) {
-   enablePerformanceBreakdownReporting = true;
-   }
-   
+   // enable performance breakdown reporting when support is added 
in the next UIMA AS release after 2.6.0
+   // (assumes the fix will be after the current 2.6.1-SNAPSHOT 
level)
+if (UimaAsVersion.getMajorVersion() > 2 || 
(UimaAsVersion.getMajorVersion() == 2 &&
+(UimaAsVersion.getMinorVersion() > 6 || 
(UimaAsVersion.getMinorVersion() == 6 && 
+UimaAsVersion.getBuildRevision() > 1 {
+enablePerformanceBreakdownReporting = true;
+}
+
// generate Spring context file once
synchronized( UimaASProcessContainer.class) {
if ( !initialized ) {