Author: degenaro
Date: Thu Jun 16 12:46:05 2016
New Revision: 1748713
URL: http://svn.apache.org/viewvc?rev=1748713&view=rev
Log:
UIMA-4979 DUCC Resource Manager (RM) remove state publication rate
configuration remnants
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/config/CommonConfiguration.java
Thu Jun 16 12:46:05 2016
@@ -137,9 +137,6 @@ public class CommonConfiguration {
@Value("#{ systemProperties['ducc.agent.node.inventory.publish.rate']
}")
public String nodeInventoryPublishRate;
- @Value("#{ systemProperties['ducc.rm.state.publish.rate'] }")
- public String rmStatePublishRate;
-
@Value("#{ systemProperties['ducc.uima-as.endpoint'] }")
public String managedServiceEndpoint;
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
Thu Jun 16 12:46:05 2016
@@ -162,8 +162,7 @@ public class DuccPropertiesResolver {
public static final String ducc_rm_node_stability =
"ducc.rm.node.stability";
public static final String ducc_agent_node_metrics_publish_rate =
"ducc.agent.node.metrics.publish.rate";
- public static final String ducc_rm_state_publish_rate =
"ducc.rm.state.publish.rate";
-
+
public static final String ducc_agent_node_inventory_publish_rate
="ducc.agent.node.inventory.publish.rate";
public static final String ducc_agent_node_inventory_publish_rate_skip
="ducc.agent.node.inventory.publish.rate.skip";
Modified:
uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
(original)
+++
uima/uima-ducc/trunk/uima-ducc-container/src/test/resources/ducc_runtime/resources/ducc.properties
Thu Jun 16 12:46:05 2016
@@ -571,8 +571,5 @@ ducc.runmode.pw = quack
ducc.db.jvm.args = -Xmx1G
# INSERT by merger Thu Jul 23 14:28:36 2015
-ducc.rm.state.publish.rate = 10000
-
-# INSERT by merger Thu Jul 23 14:28:36 2015
ducc.authentication.implementer =
org.apache.uima.ducc.ws.authentication.NeverFailAuthenticator
Modified:
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
(original)
+++
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
Thu Jun 16 12:46:05 2016
@@ -49,7 +49,6 @@ ducc.job-process.configuration.class=org
ducc.service.configuration.class=org.apache.uima.ducc.transport.configuration.service.ServiceConfiguration
ducc.rm.fragmentation.threshold = 1
-ducc.rm.state.publish.rate = 10000
ducc.rm.share.quantum = 15
ducc.agent.rogue.process.user.exclusion.filter=root,postfix,ntp,nobody,daemon,100,degenaro,messagebus,nslcd,syslog,whoopsie
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
(original)
+++
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/resources/ducc_runtime/resources/ducc.properties
Thu Jun 16 12:46:05 2016
@@ -576,8 +576,5 @@ ducc.runmode.pw = quack
ducc.db.jvm.args = -Xmx1G
# INSERT by merger Fri Sep 11 17:17:08 2015
-ducc.rm.state.publish.rate = 10000
-
-# INSERT by merger Fri Sep 11 17:17:08 2015
ducc.authentication.implementer =
org.apache.uima.ducc.ws.authentication.NeverFailAuthenticator
Modified:
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
Thu Jun 16 12:46:05 2016
@@ -215,8 +215,6 @@ public class ResourceManagerComponent
minRmPublishingRate = orPublishingRate - DEFAULT_RM_PUBLISHING_SLOP;
if ( minRmPublishingRate <=0 ) minRmPublishingRate =
DEFAULT_RM_PUBLISHING_SLOP; // somewhat arbitrary, but what else?
- // schedulingEpoch =
SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.rate",
DEFAULT_SCHEDULING_RATE);
-
String adminEndpoint =
System.getProperty("ducc.rm.admin.endpoint");
if ( adminEndpoint == null ) {
logger.warn(methodName, null, "No admin endpoint configured. Not
starting admin channel.");
Modified:
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1748713&r1=1748712&r2=1748713&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
Thu Jun 16 12:46:05 2016
@@ -19,7 +19,6 @@
package org.apache.uima.ducc.rm.scheduler;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
@@ -245,7 +244,6 @@ public class Scheduler
logger.info(methodName, null, " node stability
: ", nodeStability);
logger.info(methodName, null, " init stability
: ", SystemPropertyResolver.getIntProperty("ducc.rm.init.stability"));
logger.info(methodName, null, " fast recovery
: ", SystemPropertyResolver.getBooleanProperty("ducc.rm.fast.recovery",
true));
- logger.info(methodName, null, " RM publish rate
: ", SystemPropertyResolver.getIntProperty("ducc.rm.state.publish.rate",
60));
logger.info(methodName, null, " metrics update
rate : ",
SystemPropertyResolver.getIntProperty("ducc.agent.node.metrics.publish.rate",
DEFAULT_NODE_METRICS_RATE));
logger.info(methodName, null, " initialization
cap : ",
SystemPropertyResolver.getIntProperty("ducc.rm.initialization.cap"));
