svn commit: r1693974 - in /uima/sandbox/uima-ducc/trunk: ./ uima-ducc-agent/ uima-ducc-cli/ uima-ducc-common/ uima-ducc-container/ uima-ducc-duccdocs/ uima-ducc-examples/ uima-ducc-orchestrator/ uima-
Author: cwiklik Date: Mon Aug 3 21:58:12 2015 New Revision: 1693974 URL: http://svn.apache.org/r1693974 Log: [maven-release-plugin] prepare release uima-ducc-2.0.0 Modified: uima/sandbox/uima-ducc/trunk/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-examples/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-pm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-rm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-sm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-transport/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-user/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-web/pom.xml Modified: uima/sandbox/uima-ducc/trunk/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1693974&r1=1693973&r2=1693974&view=diff == --- uima/sandbox/uima-ducc/trunk/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/pom.xml Mon Aug 3 21:58:12 2015 @@ -26,7 +26,7 @@ org.apache.uima uima-ducc-parent - 2.0.0-SNAPSHOT + 2.0.0 uima-ducc-parent/pom.xml @@ -44,13 +44,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml?rev=1693974&r1=1693973&r2=1693974&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml Mon Aug 3 21:58:12 2015 @@ -22,7 +22,7 @@ uima-ducc-parent org.apache.uima -2.0.0-SNAPSHOT +2.0.0 ../uima-ducc-parent/pom.xml @@ -38,13 +38,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-agent + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-agent + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml?rev=1693974&r1=1693973&r2=1693974&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Mon Aug 3 21:58:12 2015 @@ -24,7 +24,7 @@ org.apache.uima uima-ducc-parent -2.0.0-SNAPSHOT +2.0.0 ../uima-ducc-parent/pom.xml @@ -41,13 +41,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml URL:
svn commit: r1693976 - in /uima/sandbox/uima-ducc/trunk: ./ uima-ducc-agent/ uima-ducc-cli/ uima-ducc-common/ uima-ducc-container/ uima-ducc-duccdocs/ uima-ducc-examples/ uima-ducc-orchestrator/ uima-
Author: cwiklik Date: Mon Aug 3 21:58:31 2015 New Revision: 1693976 URL: http://svn.apache.org/r1693976 Log: [maven-release-plugin] prepare for next development iteration Modified: uima/sandbox/uima-ducc/trunk/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-container/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-examples/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-parent/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-pm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-rm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-sm/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-spawn/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-transport/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-user/pom.xml uima/sandbox/uima-ducc/trunk/uima-ducc-web/pom.xml Modified: uima/sandbox/uima-ducc/trunk/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/pom.xml?rev=1693976&r1=1693975&r2=1693976&view=diff == --- uima/sandbox/uima-ducc/trunk/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/pom.xml Mon Aug 3 21:58:31 2015 @@ -26,7 +26,7 @@ org.apache.uima uima-ducc-parent - 2.0.0 + 2.1.0-SNAPSHOT uima-ducc-parent/pom.xml @@ -44,13 +44,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0 + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml?rev=1693976&r1=1693975&r2=1693976&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/pom.xml Mon Aug 3 21:58:31 2015 @@ -22,7 +22,7 @@ uima-ducc-parent org.apache.uima -2.0.0 +2.1.0-SNAPSHOT ../uima-ducc-parent/pom.xml @@ -38,13 +38,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-agent - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-agent - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-agent + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml?rev=1693976&r1=1693975&r2=1693976&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/pom.xml Mon Aug 3 21:58:31 2015 @@ -24,7 +24,7 @@ org.apache.uima uima-ducc-parent -2.0.0 +2.1.0-SNAPSHOT ../uima-ducc-parent/pom.xml @@ -41,13 +41,13 @@ cutting/pasting the element, and just changing the following two properties --> - scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli + scm:svn:http://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli - scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli + scm:svn:https://svn.apache.org/repos/asf/uima/sandbox/uima-ducc/trunk/uima-ducc-cli - http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/uima-ducc-cli + http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/pom.xm
svn commit: r1693975 - /uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/
Author: cwiklik Date: Mon Aug 3 21:58:20 2015 New Revision: 1693975 URL: http://svn.apache.org/r1693975 Log: [maven-release-plugin] copy for tag uima-ducc-2.0.0 Added: uima/sandbox/uima-ducc/tags/uima-ducc-2.0.0/ - copied from r1693974, uima/sandbox/uima-ducc/trunk/
svn commit: r1693973 - /uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
Author: cwiklik
Date: Mon Aug 3 21:45:51 2015
New Revision: 1693973
URL: http://svn.apache.org/r1693973
Log:
UIMA-4149 fixed wrong permissions under apache-uima. All files had executable
bit on
Modified:
uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
Modified: uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml?rev=1693973&r1=1693972&r2=1693973&view=diff
==
--- uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/assembly/bin.xml Mon Aug 3 21:45:51
2015
@@ -239,7 +239,7 @@ under the License.
target/uima-as/apache-uima-as-${org.apache.uima.as.version}
apache-uima
- 755
+
755
svn commit: r1693966 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler: ResourceClass.java RmJob.java
Author: challngr
Date: Mon Aug 3 20:15:18 2015
New Revision: 1693966
URL: http://svn.apache.org/r1693966
Log:
UIMA-4358 Fix bad math calculating allotments.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java?rev=1693966&r1=1693965&r2=1693966&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/ResourceClass.java
Mon Aug 3 20:15:18 2015
@@ -111,11 +111,10 @@ public class ResourceClass
this.enforce_memory = props.getBooleanProperty("enforce", true);
}
+// For now, R 2.0.0 not configurable, and not cappable. Hope to
revive in future release.
this.fair_share_cap = Integer.MAX_VALUE; // UIMA-4275
if ( this.policy == Policy.FAIR_SHARE ) {
-fair_share_cap = props.getIntProperty("cap", Integer.MAX_VALUE);
-if (fair_share_cap == 0) fair_share_cap = Integer.MAX_VALUE;
this.share_weight = props.getIntProperty("weight");
if ( props.containsKey("expand-by-doubling") ) {
@@ -337,10 +336,11 @@ public class ResourceClass
// UIMA-4275
public boolean fairShareCapExceeded(IRmJob j)
{
-if ( policy != Policy.FAIR_SHARE ) return false;
-
-if ( j.getShareOrder() + countActiveShares() > calculateCap() ) return
true;
return false;
+// if ( policy != Policy.FAIR_SHARE ) return false;
+
+// if ( j.getShareOrder() + countActiveShares() > calculateCap() )
return true;
+// return false;
}
/**
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java?rev=1693966&r1=1693965&r2=1693966&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Mon Aug 3 20:15:18 2015
@@ -342,7 +342,7 @@ public class RmJob
public int countOccupancy()
{
-return assignedShares.size() + pendingShares.size();
+return (assignedShares.size() + pendingShares.size()) * share_order;
// if ( (given_by_order == null) || (given_by_order[share_order] == 0)
) {
// // must use current allocation because we haven't been counted
yet
svn commit: r1693956 - /uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html
Author: cwiklik Date: Mon Aug 3 19:04:21 2015 New Revision: 1693956 URL: http://svn.apache.org/r1693956 Log: UIMA-4511 add JIRA 4540 to the report Modified: uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html Modified: uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html?rev=1693956&r1=1693955&r2=1693956&view=diff == --- uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html (original) +++ uima/sandbox/uima-ducc/trunk/src/main/issuesFixed/jira-report.html Mon Aug 3 19:04:21 2015 @@ -52,6 +52,21 @@ + + + +https://issues.apache.org/jira/browse/UIMA-4540";> https://issues.apache.org/jira/images/icons/issuetypes/bug.png"; height="16" width="16" border="0" align="absmiddle" alt="Bug" title="Bug - A problem which impairs or prevents the functions of the product."> + + +https://issues.apache.org/jira/browse/UIMA-4540";>UIMA-4540 + + +https://issues.apache.org/jira/browse/UIMA-4540";>DUCC JP does not publish final AE init stats when it completes initialization + + +Fixed + +
svn commit: r1693952 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Author: cwiklik
Date: Mon Aug 3 18:28:02 2015
New Revision: 1693952
URL: http://svn.apache.org/r1693952
Log:
UIMA-4540 Clear AE init stats when state != Initializing
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java?rev=1693952&r1=1693951&r2=1693952&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Mon Aug 3 18:28:02 2015
@@ -203,7 +203,7 @@ public class DefaultNodeInventoryProcess
p.getValue().setUimaPipelineComponents(
new
ArrayList());
}
- if (
p.getValue().getProcessState().equals(ProcessState.Running)) {
+ if (
!p.getValue().getProcessState().equals(ProcessState.Initializing)) {
p.getValue().getUimaPipelineComponents().clear();
}
int pipelineInitStats = (p.getValue()
svn commit: r1693948 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Author: degenaro
Date: Mon Aug 3 17:56:02 2015
New Revision: 1693948
URL: http://svn.apache.org/r1693948
Log:
UIMA-4540 DUCC Orchestrator (OR) should copy inventory provided
UimaPipelineComponents list even if it is empty (trace)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1693948&r1=1693947&r2=1693948&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Mon Aug 3 17:56:02 2015
@@ -507,11 +507,11 @@ public class ProcessAccounting {
logger.trace(methodName, job.getDuccId(),
messages.fetch("enter"));
List list =
inventoryProcess.getUimaPipelineComponents();
if(list != null) {
- logger.debug(methodName, job.getDuccId(), "size:
"+list.size());
+ logger.trace(methodName, job.getDuccId(), "size:
"+list.size());
process.setUimaPipelineComponents(list);
}
else {
- logger.debug(methodName, job.getDuccId(), "size: null");
+ logger.trace(methodName, job.getDuccId(), "size: null");
}
logger.trace(methodName, job.getDuccId(),
messages.fetch("exit"));
}
svn commit: r1693944 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Author: cwiklik
Date: Mon Aug 3 17:34:14 2015
New Revision: 1693944
URL: http://svn.apache.org/r1693944
Log:
UIMA-4540 Rearranged code the deals with AE Init stat list. Clear list if
state=Running
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java?rev=1693944&r1=1693943&r2=1693944&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Mon Aug 3 17:34:14 2015
@@ -199,14 +199,17 @@ public class DefaultNodeInventoryProcess
* logger.warn(methodName, null,
* "endInit:"+endInitLong+"
"+"startRun:"+startRunLong); }
*/
- int pipelineInitStats = (p.getValue()
-
.getUimaPipelineComponents() == null) ? 0 : p
-
.getValue().getUimaPipelineComponents().size();
-
if
(p.getValue().getUimaPipelineComponents() == null) {
p.getValue().setUimaPipelineComponents(
new
ArrayList());
}
+ if (
p.getValue().getProcessState().equals(ProcessState.Running)) {
+
p.getValue().getUimaPipelineComponents().clear();
+ }
+ int pipelineInitStats = (p.getValue()
+
.getUimaPipelineComponents() == null) ? 0 : p
+
.getValue().getUimaPipelineComponents().size();
+
sb.append("\n\t[Process Type=")
.append(p.getValue().getProcessType())
.append(" DUCC ID=")
svn commit: r1693942 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Author: cwiklik
Date: Mon Aug 3 17:29:10 2015
New Revision: 1693942
URL: http://svn.apache.org/r1693942
Log:
UIMA-4540 Moved inventory publication beyond logging
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java?rev=1693942&r1=1693941&r2=1693942&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Mon Aug 3 17:29:10 2015
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
-*/
+ */
package org.apache.uima.ducc.agent.processors;
import java.util.ArrayList;
@@ -38,178 +38,217 @@ import org.apache.uima.ducc.transport.ev
*/
public class DefaultNodeInventoryProcessor implements NodeInventoryProcessor {
DuccLogger logger = new DuccLogger(this.getClass(), "AGENT");
- boolean inventoryChanged=true;
+ boolean inventoryChanged = true;
private NodeAgent agent;
- private HashMap previousInventory;
- private int forceInventoryUpdateMaxThreshold=0;
- private long counter=0;
-
- public DefaultNodeInventoryProcessor(NodeAgent agent,String
inventoryPublishRateSkipCount) {
+ private HashMap previousInventory;
+ private int forceInventoryUpdateMaxThreshold = 0;
+ private long counter = 0;
+
+ public DefaultNodeInventoryProcessor(NodeAgent agent,
+ String inventoryPublishRateSkipCount) {
this.agent = agent;
try {
- forceInventoryUpdateMaxThreshold =
Integer.parseInt(inventoryPublishRateSkipCount);
- } catch( Exception e) {
+ forceInventoryUpdateMaxThreshold = Integer
+
.parseInt(inventoryPublishRateSkipCount);
+ } catch (Exception e) {
}
- // Dont allow 0
- if ( forceInventoryUpdateMaxThreshold == 0 ) {
- forceInventoryUpdateMaxThreshold = 1;
+ // Dont allow 0
+ if (forceInventoryUpdateMaxThreshold == 0) {
+ forceInventoryUpdateMaxThreshold = 1;
}
}
+
/**
* Get a copy of agent {@code Process} inventory
*/
public HashMap getInventory() {
return agent.getInventoryCopy();
}
+
/**
*
*/
public void process(Exchange outgoingMessage) throws Exception {
- String methodName="process";
- // Get a deep copy of agent's inventory
+ String methodName = "process";
+ // Get a deep copy of agent's inventory
HashMap inventory = getInventory();
// Determine if the inventory changed since the last publishing
was done
- // First check if the inventory expanded or shrunk. If the same
in size,
+ // First check if the inventory expanded or shrunk. If the same
in size,
// compare process states and PID. If either of the two changed
for any
- // of the processes trigger immediate publish. If no changes
found, publish
- // according to skip counter
(ducc.agent.node.inventory.publish.rate.skip)
+ // of the processes trigger immediate publish. If no changes
found,
+ // publish
+ // according to skip counter
+ // (ducc.agent.node.inventory.publish.rate.skip)
// configured in ducc.properties.
- if ( previousInventory != null ) {
+ if (previousInventory != null) {
if (inventory.size() != previousInventory.size()) {
inventoryChanged = true;
} else {
- // Inventory maps are equal in size, check if
all processes in the current
- // inventory exist in the previous inventory
snapshot. If not, it means that
- // that perhaps a new process was added and one
was removed. In this case,
+ // Inventory maps are equal in size, check if
all processes in
+ // t
svn commit: r1693940 - /uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Author: cwiklik
Date: Mon Aug 3 17:22:22 2015
New Revision: 1693940
URL: http://svn.apache.org/r1693940
Log:
UIMA-4540 clear AE init list
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java?rev=1693940&r1=1693939&r2=1693940&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
Mon Aug 3 17:22:22 2015
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.agent.processors;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -174,7 +175,11 @@ public class DefaultNodeInventoryProcess
*/
int pipelineInitStats =
(p.getValue().getUimaPipelineComponents() == null ) ? 0 :
p.getValue().getUimaPipelineComponents().size();
- sb.append("\n\t[Process Type=").
+
+ if ( p.getValue().getUimaPipelineComponents() == null) {
+ p.getValue().setUimaPipelineComponents(new
ArrayList());
+ }
+ sb.append("\n\t[Process Type=").
append(p.getValue().getProcessType()).
append(" DUCC ID=").
append(p.getValue().getDuccId()).
svn commit: r1693923 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Author: degenaro
Date: Mon Aug 3 15:55:44 2015
New Revision: 1693923
URL: http://svn.apache.org/r1693923
Log:
UIMA-4540 DUCC Orchestrator (OR) should copy inventory provided
UimaPipelineComponents list even if it is empty (debug)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1693923&r1=1693922&r2=1693923&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Mon Aug 3 15:55:44 2015
@@ -507,8 +507,12 @@ public class ProcessAccounting {
logger.trace(methodName, job.getDuccId(),
messages.fetch("enter"));
List list =
inventoryProcess.getUimaPipelineComponents();
if(list != null) {
+ logger.debug(methodName, job.getDuccId(), "size:
"+list.size());
process.setUimaPipelineComponents(list);
}
+ else {
+ logger.debug(methodName, job.getDuccId(), "size: null");
+ }
logger.trace(methodName, job.getDuccId(),
messages.fetch("exit"));
}
svn commit: r1693916 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Author: degenaro
Date: Mon Aug 3 15:22:28 2015
New Revision: 1693916
URL: http://svn.apache.org/r1693916
Log:
UIMA-4540 DUCC Orchestrator (OR) should copy inventory provided
UimaPipelineComponents list even if it is empty
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1693916&r1=1693915&r2=1693916&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
Mon Aug 3 15:22:28 2015
@@ -507,9 +507,7 @@ public class ProcessAccounting {
logger.trace(methodName, job.getDuccId(),
messages.fetch("enter"));
List list =
inventoryProcess.getUimaPipelineComponents();
if(list != null) {
- if(!list.isEmpty()) {
- process.setUimaPipelineComponents(list);
- }
+ process.setUimaPipelineComponents(list);
}
logger.trace(methodName, job.getDuccId(),
messages.fetch("exit"));
}
svn commit: r1693914 - /uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
Author: challngr
Date: Mon Aug 3 15:17:49 2015
New Revision: 1693914
URL: http://svn.apache.org/r1693914
Log:
UIMA-4358 Use orchestrator publish rate, not the deprecated abbreviate
orchestrator rate to trigger scheduling.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1693914&r1=1693913&r2=1693914&view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
Mon Aug 3 15:17:49 2015
@@ -209,7 +209,7 @@ public class ResourceManagerComponent
nodeStability =
SystemPropertyResolver.getIntProperty("ducc.rm.node.stability",
DEFAULT_STABILITY_COUNT);
nodeMetricsUpdateRate =
SystemPropertyResolver.getIntProperty("ducc.agent.node.metrics.publish.rate",
DEFAULT_NODE_METRICS_RATE);
schedulingRatio =
SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.ratio",
DEFAULT_SCHEDULING_RATIO);
-orPublishingRate =
SystemPropertyResolver.getIntProperty("ducc.orchestrator.abbreviated.state.publish.rate",
DEFAULT_OR_PUBLISH_RATE);
+orPublishingRate =
SystemPropertyResolver.getIntProperty("ducc.orchestrator.state.publish.rate",
DEFAULT_OR_PUBLISH_RATE);
minRmPublishingRate = orPublishingRate - DEFAULT_RM_PUBLISHING_SLOP;
if ( minRmPublishingRate <=0 ) minRmPublishingRate =
DEFAULT_RM_PUBLISHING_SLOP;// somewhat arbitrary, but what else?
