Author: degenaro
Date: Thu Apr 14 20:42:56 2016
New Revision: 1739187
URL: http://svn.apache.org/viewvc?rev=1739187&view=rev
Log:
UIMA-4884 DUCC standardization of environment variables
- remove environment variable DUCC_PROCESSID_UNIQUE
- create system property -Dducc.deploy.JpUniqueId
Modified:
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/CommandExecutor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccUser.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
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=1739187&r1=1739186&r2=1739187&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
Thu Apr 14 20:42:56 2016
@@ -108,7 +108,7 @@ public class UimaAsServiceConfiguration
return new ProcessEventListener(service);
}
private ServiceStateNotificationAdapter
serviceAdapter(DuccEventDispatcher eventDispatcher, String stateUpdateEndpoint)
{
- return new ServiceAdapter(eventDispatcher,
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
stateUpdateEndpoint);
+ return new ServiceAdapter(eventDispatcher,
System.getProperty(IDuccUser.DashD.DUCC_ID_PROCESS_UNIQUE.value()),
stateUpdateEndpoint);
}
@Bean
public ManagedService managedService() throws Exception {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java?rev=1739187&r1=1739186&r2=1739187&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CommandExecutor.java
Thu Apr 14 20:42:56 2016
@@ -123,14 +123,12 @@ public abstract class CommandExecutor im
// managedProcess).getCommandLine();
Map<String, String> env = new HashMap<String, String>();
if (!isKillCommand(cmdLine)) {
+
cmdLine.addOption(IDuccUser.DashD.DUCC_ID_PROCESS_UNIQUE.dvalue()+"="+((ManagedProcess)
managedProcess).getDuccId().getUnique());
// Enrich environment for the new process. Via
these settings
// the UIMA AS
// service wrapper can notify the agent of its
state.
env.put(IDuccUser.EnvironmentVariable.DUCC_IP.value(), ip);
env.put(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(), host);
- // Add process unique ducc id to correlate
process state updates
-
env.put(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value(),
((ManagedProcess) managedProcess)
- .getDuccId().getUnique());
// Add "friendly" process name for coordination
with JD and OR
env.put(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS.value(),
((ManagedProcess) managedProcess)
.getDuccId().getFriendly()+"");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccUser.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccUser.java?rev=1739187&r1=1739186&r2=1739187&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccUser.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/IDuccUser.java
Thu Apr 14 20:42:56 2016
@@ -21,12 +21,11 @@ package org.apache.uima.ducc.common;
// Note: Coordinate with org.apache.uima.ducc.IUser
public interface IDuccUser {
-
+
public enum EnvironmentVariable {
DUCC_HOME("DUCC_HOME"),
DUCC_ID_JOB("DUCC_JOBID"),
DUCC_ID_PROCESS("DUCC_PROCESSID"),
- DUCC_ID_PROCESS_UNIQUE("DUCC_PROCESSID_UNIQUE"),
DUCC_ID_SERVICE("DUCC_SERVICE_INSTANCE"),
DUCC_LOG_PREFIX("DUCC_PROCESS_LOG_PREFIX"),
//
@@ -67,5 +66,44 @@ public interface IDuccUser {
}
}
+ public enum DashD {
+ DUCC_ID_PROCESS_UNIQUE("ducc.deploy.JpUniqueId"),
+ ;
+
+ private String value = null;
+
+ private DashD(String valueForKey) {
+ setValue(valueForKey);
+ }
+
+ private void setValue(String valueForKey) {
+ value = valueForKey;
+ }
+
+ private String getValue() {
+ return value;
+ }
+
+ public String standard() {
+ return name();
+ }
+
+ public String mapped() {
+ return getValue();
+ }
+
+ public String value() {
+ String retVal = mapped();
+ switch(this) {
+ default:
+ break;
+ }
+ return retVal;
+ }
+
+ public String dvalue() {
+ return "-D"+value();
+ }
+ }
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java?rev=1739187&r1=1739186&r2=1739187&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JobProcessConfiguration.java
Thu Apr 14 20:42:56 2016
@@ -241,7 +241,7 @@ public class JobProcessConfiguration {
// Create Agent proxy which will be used to notify Agent
// of state changes.
agent = new AgentSession(eventDispatcher,
-
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
+
System.getProperty(IDuccUser.DashD.DUCC_ID_PROCESS_UNIQUE.value()),
common.managedServiceEndpoint);
System.out
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java?rev=1739187&r1=1739186&r2=1739187&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/service/ServiceConfiguration.java
Thu Apr 14 20:42:56 2016
@@ -223,7 +223,7 @@ public class ServiceConfiguration {
// Create Agent proxy which will be used to notify Agent
// of state changes.
agent = new AgentSession(eventDispatcher,
-
System.getenv(IDuccUser.EnvironmentVariable.DUCC_ID_PROCESS_UNIQUE.value()),
+
System.getProperty(IDuccUser.DashD.DUCC_ID_PROCESS_UNIQUE.value()),
common.managedServiceEndpoint);
System.out
