Author: degenaro
Date: Mon Apr 16 12:10:48 2018
New Revision: 1829255

URL: http://svn.apache.org/viewvc?rev=1829255&view=rev
Log:
UIMA-5742 Reliable DUCC

- support short hostname for state and log directory and file names

Modified:
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeMetricsProcessor.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeIdentity.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/InetHelper.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateFile.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/system/events/log/SystemEventsLogger.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkUtil.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/Resource.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/json/jp/JobProcessCollection.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDataHelper.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/Helper.java
    
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
 Mon Apr 16 12:10:48 2018
@@ -242,7 +242,7 @@ public class NodeAgent extends AbstractD
                NodeIdentity nodeIdentity = new NodeIdentity();
        DaemonDuccEvent ev = new DaemonDuccEvent(daemon, eventType, 
nodeIdentity);
           ORDispatcher.dispatch(stateChangeEndpoint, ev, "");
-          logger.info(methodName, null, stateChangeEndpoint, eventType.name(), 
nodeIdentity.getName());
+          logger.info(methodName, null, stateChangeEndpoint, eventType.name(), 
nodeIdentity.getCanonicalName());
       }
        catch(Exception e) {
                logger.error(methodName, null, e);
@@ -620,7 +620,7 @@ public class NodeAgent extends AbstractD
   public void start(DuccService service) throws Exception {
     super.start(service, null);
     String methodName = "start";
-    String name = nodeIdentity.getName();
+    String name = nodeIdentity.getShortName();
     String ip = nodeIdentity.getIp();
     String jmxUrl = getProcessJmxUrl();
     DuccDaemonRuntimeProperties.getInstance().bootAgent(name, ip, jmxUrl);
@@ -2233,10 +2233,7 @@ public class NodeAgent extends AbstractD
       BufferedReader br = new BufferedReader(new FileReader(exclusionFile));
       String line;
       NodeIdentity node = getIdentity();
-      String nodeName = node.getName();
-      if (nodeName.indexOf(".") > -1) {
-        nodeName = nodeName.substring(0, nodeName.indexOf("."));
-      }
+      String nodeName = node.getShortName();
 
       while ((line = br.readLine()) != null) {
         if (line.startsWith(nodeName)) {
@@ -2277,7 +2274,7 @@ public class NodeAgent extends AbstractD
       String[] nodes = ((DuccAdminEventStopMetrics) 
event).getTargetNodes().split(",");
       //  Check if this message applies to this node
       for (String targetNode : nodes) {
-        if (Utils.isMachineNameMatch(targetNode.trim(), 
getIdentity().getName())) {
+        if (Utils.isMachineNameMatch(targetNode.trim(), 
getIdentity().getCanonicalName())) {
           logger.info("handleAdminEvent", null,
                   "... Agent Received an Admin Request to Stop Metrics 
Collection and Publishing");
           //  Stop Camel route responsible for driving collection and 
publishing of metrics

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
 Mon Apr 16 12:10:48 2018
@@ -487,7 +487,7 @@ public class AgentConfiguration {
       camelContext.addRoutes(inventoryRouteBuilder);
 
       logger.info("nodeAgent", null, "------- Agent Initialized - Identity 
Name:"
-              + agent.getIdentity().getName() + " IP:" + 
agent.getIdentity().getIp()
+              + agent.getIdentity().getCanonicalName() + " IP:" + 
agent.getIdentity().getIp()
               + " JP State Update Endpoint:" + 
common.managedProcessStateUpdateEndpoint);
       return agent;
 

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/Launcher.java
 Mon Apr 16 12:10:48 2018
@@ -86,7 +86,7 @@ public class Launcher {
                throws Exception {
         //     Instantiate executor that will actually exec the process using 
java's ProcessBuilder
         DuccCommandExecutor executor = 
-            new DuccCommandExecutor(agent, commandLine, 
nodeIdentity.getName(),nodeIdentity.getIp(), managedProcess);
+            new DuccCommandExecutor(agent, commandLine, 
nodeIdentity.getCanonicalName(),nodeIdentity.getIp(), managedProcess);
         Future<?> future = executorService.submit(executor);
         //     if we are launching a process, save the future object returned 
from Executor above
        managedProcess.setFuture(future);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeInventoryProcessor.java
 Mon Apr 16 12:10:48 2018
@@ -258,7 +258,7 @@ public class DefaultNodeInventoryProcess
 
                                }
                                logger.info(methodName, null, "Agent "
-                                               + agent.getIdentity().getName() 
+ " Posting Inventory:"
+                                               + 
agent.getIdentity().getCanonicalName() + " Posting Inventory:"
                                                + sb.toString());
                                outgoingMessage.getIn().setBody(new 
NodeInventoryUpdateDuccEvent(inventory,agent.getLastORSequence(), 
agent.getIdentity()));
 

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeMetricsProcessor.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeMetricsProcessor.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeMetricsProcessor.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/DefaultNodeMetricsProcessor.java
 Mon Apr 16 12:10:48 2018
@@ -89,7 +89,7 @@ public class DefaultNodeMetricsProcessor
                if ( agent.getNodeInfo() == null ) {
                        agent.setNodeInfo(node);
                }
-           logger.info(methodName, null, "... Agent 
"+node.getNodeIdentity().getName()+" Posting Users:"+
+           logger.info(methodName, null, "... Agent 
"+node.getNodeIdentity().getCanonicalName()+" Posting Users:"+
                    node.getNodeMetrics().getNodeUsersMap().size());
            
            NodeMetricsUpdateDuccEvent event = new 
NodeMetricsUpdateDuccEvent(node,agent.getInventoryRef().size());

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
 Mon Apr 16 12:10:48 2018
@@ -134,7 +134,7 @@ public class LinuxNodeMetricsProcessor e
 //                     Future<NodeCpuInfo> cpuFuture = 
pool.submit(cpuCollector);
                        NodeCpuInfo cpuInfo = new 
NodeCpuInfo(agent.numProcessors, String.valueOf(cpuCollector.call()));
                    
-                       e.getIn().setHeader("node", 
agent.getIdentity().getName());
+                       e.getIn().setHeader("node", 
agent.getIdentity().getCanonicalName());
                        NodeMemory memInfo = nmiFuture.get();
                        TreeMap<String, NodeUsersInfo> users = null;
                        // begin collecting user processes and activate rogue 
process detector
@@ -166,7 +166,7 @@ public class LinuxNodeMetricsProcessor e
                                                
                        ((DuccNode)node).duccLingExists(agent.duccLingExists());
                        
((DuccNode)node).runWithDuccLing(agent.runWithDuccLing());
-                       logger.info(methodName, null, "... Agent 
"+node.getNodeIdentity().getName()+
+                       logger.info(methodName, null, "... Agent 
"+node.getNodeIdentity().getCanonicalName()+
                                         " OS Name:" + osname +
                                         " OS Version:" + osversion +
                                         " OS Arch:" + osarch +
@@ -180,7 +180,7 @@ public class LinuxNodeMetricsProcessor e
                                        " Low Swap Threshold Defined in 
ducc.properties (KB):"+swapThreshold +
                                        " CPU Reporting 
Enabled:"+cpuReportingEnabled) ;
                        
-                       logger.trace(methodName, null, "... Agent 
"+node.getNodeIdentity().getName()+" Posting Users:"+
+                       logger.trace(methodName, null, "... Agent 
"+node.getNodeIdentity().getCanonicalName()+" Posting Users:"+
                                        
node.getNodeMetrics().getNodeUsersMap().size());
                        // Check if swap free is less than defined minimum 
threshold (check ducc.properties) 
                        if ( swapThreshold > 0 && ( 
node.getNodeMetrics().getNodeMemory().getSwapFree() < swapThreshold)) {

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeIdentity.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeIdentity.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeIdentity.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/NodeIdentity.java
 Mon Apr 16 12:10:48 2018
@@ -65,10 +65,22 @@ public class NodeIdentity implements Ser
                return nodeIdentities;
        }
 
-       public String getName() {
+       public String getCanonicalName() {
                return name;
        }
 
+       public String getShortName() {
+               String canonicalHostName = name;
+               String hostName = canonicalHostName;
+               if(canonicalHostName != null) {
+                       hostName = canonicalHostName;
+                       if(canonicalHostName.contains(".")) {
+                               hostName = canonicalHostName.split("\\.")[0];
+                       }
+               }
+               return hostName;
+       }
+       
        protected void setName(String name) {
                this.name = name;
        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
 Mon Apr 16 12:10:48 2018
@@ -314,7 +314,7 @@ public class DuccService extends Abstrac
             if ( System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()) 
== null ) {
                 NodeIdentity ni = new NodeIdentity();
                 
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_IP.value(), ni.getIp());
-                       
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(), 
ni.getName());
+                       
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value(), 
ni.getShortName());
 
             } else {
                 
System.setProperty(IDuccUser.EnvironmentVariable.DUCC_IP.value(), 
System.getenv(IDuccUser.EnvironmentVariable.DUCC_IP.value()));

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/InetHelper.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/InetHelper.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/InetHelper.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/InetHelper.java
 Mon Apr 16 12:10:48 2018
@@ -28,8 +28,8 @@ public class InetHelper {
        private static DuccLogger duccLogger = 
DuccLogger.getLogger(InetHelper.class);
        private static DuccId jobid = null;
        
-       public static String getHostName() {
-               String methodName = "getHostName";
+       public static String getCanonicalHostName() {
+               String methodName = "getCanonicalHostName";
                String hostname = "localhost";
                try {
                        InetAddress inetAddress = InetAddress.getLocalHost();
@@ -40,5 +40,27 @@ public class InetHelper {
                }
                return hostname;
        }
+       
+       public static String getShortHostName() {
+               String methodName = "getShortHostName";
+               String hostname = "localhost";
+               try {
+                       String canonicalHostName = getCanonicalHostName();
+                       if(canonicalHostName != null) {
+                               hostname = canonicalHostName;
+                               if(canonicalHostName.contains(".")) {
+                                       hostname = 
canonicalHostName.split("\\.")[0];
+                               }
+                       }
+               }
+               catch(Exception e) {
+                       duccLogger.error(methodName, jobid, e);
+               }
+               return hostname;
+       }
+       
+       public static String getHostName() {
+               return getShortHostName();
+       }
 
 }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java
 Mon Apr 16 12:10:48 2018
@@ -352,7 +352,7 @@ public class HistoryManagerDb
                     for ( IDuccProcess idp : map.values() ) {
                         long share_id = idp.getDuccId().getFriendly();
                         long pid = toInt(idp.getPID());
-                        String node = 
getString(idp.getNodeIdentity().getName());
+                        String node = 
getString(idp.getNodeIdentity().getCanonicalName());
                         String reason_agent = 
getString(idp.getReasonForStoppingProcess()); // called "reason" in duccprocess 
but not in ws
                         String extended_reason_agent = 
getString(idp.getExtendedReasonForStoppingProcess()); 
                         String reason_scheduler = 
getString(idp.getProcessDeallocationType().toString()); // called 
"processDeallocationType" in duccprocess but not in ws
@@ -405,7 +405,7 @@ public class HistoryManagerDb
                     for ( IDuccReservation idr : map.values() ) {
                         String node = "<none>";
                         if ( idr.getNode() != null ) {
-                            node = idr.getNode().getNodeIdentity().getName();
+                            node = 
idr.getNode().getNodeIdentity().getCanonicalName();
                         }
                        try {
                                                        
h.execute(reservationAllocPrepare, node, work_id,

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
 Mon Apr 16 12:10:48 2018
@@ -591,7 +591,7 @@ implements Orchestrator {
                String node = "?";
                NodeIdentity nodeIdentity = duccEvent.getNodeIdentity();
                if(nodeIdentity != null) {
-                       node = nodeIdentity.getName();
+                       node = nodeIdentity.getCanonicalName();
                }
                return node;
        }
@@ -1155,7 +1155,7 @@ implements Orchestrator {
                                        IDuccReservationMap map = 
duccWorkReservation.getReservationMap();
                                        for (DuccId key : map.keySet()) { 
                                                IDuccReservation value = 
duccWorkReservation.getReservationMap().get(key);
-                                               String node = 
value.getNodeIdentity().getName();
+                                               String node = 
value.getNodeIdentity().getCanonicalName();
                                                sb.append(node);
                                                sb.append(" ");
                                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
 Mon Apr 16 12:10:48 2018
@@ -88,7 +88,7 @@ public class OrchestratorState {
                synchronized(this) {
                        String node = "?";
                        if(nodeIdentity != null) {
-                               node = nodeIdentity.getName();
+                               node = nodeIdentity.getCanonicalName();
                        }
                        long currentValue = sequenceNumberState.get();
                        if(value > currentValue) {

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
 Mon Apr 16 12:10:48 2018
@@ -754,7 +754,7 @@ public class ProcessAccounting {
                DuccWorkMap workMap = orchestratorCommonArea.getWorkMap();
                try {
                        DuccId processId = inventoryProcess.getDuccId();
-                       logger.debug(methodName, null, processId, 
messages.fetchLabel("node")+inventoryProcess.getNodeIdentity().getName()+" 
"+messages.fetchLabel("PID")+inventoryProcess.getPID());
+                       logger.debug(methodName, null, processId, 
messages.fetchLabel("node")+inventoryProcess.getNodeIdentity().getCanonicalName()+"
 "+messages.fetchLabel("PID")+inventoryProcess.getPID());
                        TrackSync ts = TrackSync.await(workMap, 
this.getClass(), methodName);
                        synchronized(workMap) {
                                ts.using();

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
 Mon Apr 16 12:10:48 2018
@@ -1274,7 +1274,7 @@ public class StateManager {
                                        logger.info(methodName, 
duccWorkJob.getDuccId(), messages.fetch("resource added")
                                                                                
                +" "+messages.fetchLabel("process")+duccId.getFriendly()
                                                                                
                +" "+messages.fetchLabel("unique")+duccId.getUnique()
-                                                                               
                +" "+messages.fetchLabel("name")+nodeId.getName()
+                                                                               
                +" "+messages.fetchLabel("name")+nodeId.getCanonicalName()
                                                                                
                +" "+messages.fetchLabel("ip")+nodeId.getIp());
                                        changes++;
                                        // check on usefulness of recent 
allocation
@@ -1310,7 +1310,7 @@ public class StateManager {
                                        logger.warn(methodName, 
duccWorkJob.getDuccId(), messages.fetch("resource exists")
                                                +" 
"+messages.fetchLabel("process")+duccId.getFriendly()
                                                +" 
"+messages.fetchLabel("unique")+duccId.getUnique()
-                                               +" 
"+messages.fetchLabel("name")+nodeId.getName()
+                                               +" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()
                                                +" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                }
                        }
@@ -1337,7 +1337,7 @@ public class StateManager {
                                logger.info(methodName, 
duccWorkJob.getDuccId(), messages.fetch("resource processing")
                                        +" 
"+messages.fetchLabel("process")+duccId.getFriendly()
                                        +" 
"+messages.fetchLabel("unique")+duccId.getUnique()
-                                       +" 
"+messages.fetchLabel("name")+nodeId.getName()
+                                       +" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()
                                        +" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                if(processMap.containsKey(duccId)) {
                                        IDuccProcess process = 
processMap.get(duccId);
@@ -1350,7 +1350,7 @@ public class StateManager {
                                                logger.info(methodName, 
duccWorkJob.getDuccId(), messages.fetch("resource deallocated")
                                                        +" 
"+messages.fetchLabel("process")+duccId.getFriendly()
                                                        +" 
"+messages.fetchLabel("unique")+duccId.getUnique()
-                                                       +" 
"+messages.fetchLabel("name")+nodeId.getName()
+                                                       +" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()
                                                        +" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                                break;
                                        }
@@ -1358,7 +1358,7 @@ public class StateManager {
                                        if(process.isDefunct()) {
                                                
orchestratorCommonArea.getProcessAccounting().removeProcess(duccId);
                                                
processMap.removeProcess(duccId);
-                                               logger.info(methodName, duccId, 
messages.fetch("remove resource")+" 
"+messages.fetchLabel("name")+nodeId.getName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
+                                               logger.info(methodName, duccId, 
messages.fetch("remove resource")+" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                                changes++;
                                        }
                                        */
@@ -1367,7 +1367,7 @@ public class StateManager {
                                        logger.info(methodName, 
duccWorkJob.getDuccId(), messages.fetch("resource not found")
                                                +" 
"+messages.fetchLabel("process")+duccId.getFriendly()
                                                +" 
"+messages.fetchLabel("unique")+duccId.getUnique()
-                                               +" 
"+messages.fetchLabel("name")+nodeId.getName()
+                                               +" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()
                                                +" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                }
                        }
@@ -1393,11 +1393,11 @@ public class StateManager {
                                        long bytes = memoryGbPerProcess * 
SizeBytes.GB;
                                        DuccReservation reservation = new 
DuccReservation(duccId, node, bytes);
                                        
reservationMap.addReservation(reservation);
-                                       logger.info(methodName, duccId, 
messages.fetch("add resource")+" 
"+messages.fetchLabel("name")+nodeId.getName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
+                                       logger.info(methodName, duccId, 
messages.fetch("add resource")+" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                        changes++;
                                }
                                else {
-                                       logger.debug(methodName, duccId, 
messages.fetch("duplicate resource")+" 
"+messages.fetchLabel("name")+nodeId.getName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
+                                       logger.debug(methodName, duccId, 
messages.fetch("duplicate resource")+" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                }
                        }
                }
@@ -1418,11 +1418,11 @@ public class StateManager {
                                NodeIdentity nodeId = node.getNodeIdentity();
                                if(reservationMap.containsKey(duccId)) {
                                        
reservationMap.removeReservation(duccId);
-                                       logger.info(methodName, duccId, 
messages.fetch("remove resource")+" 
"+messages.fetchLabel("name")+nodeId.getName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
+                                       logger.info(methodName, duccId, 
messages.fetch("remove resource")+" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                        changes++;
                                }
                                else {
-                                       logger.debug(methodName, duccId, 
messages.fetch("not found resource")+" 
"+messages.fetchLabel("name")+nodeId.getName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
+                                       logger.debug(methodName, duccId, 
messages.fetch("not found resource")+" 
"+messages.fetchLabel("name")+nodeId.getCanonicalName()+" 
"+messages.fetchLabel("ip")+nodeId.getIp());
                                }
                        }
                }
@@ -1702,7 +1702,7 @@ public class StateManager {
                                                }
                                                else {
                                                        StringBuffer sb = new 
StringBuffer();
-                                                       
sb.append("node:"+inventoryProcess.getNodeIdentity().getName());
+                                                       
sb.append("node:"+inventoryProcess.getNodeIdentity().getCanonicalName());
                                                        sb.append(" ");
                                                        
sb.append("PID:"+inventoryProcess.getPID());
                                                        sb.append(" ");
@@ -1712,7 +1712,7 @@ public class StateManager {
                                        }
                                        else {
                                                StringBuffer sb = new 
StringBuffer();
-                                               
sb.append("node:"+inventoryProcess.getNodeIdentity().getName());
+                                               
sb.append("node:"+inventoryProcess.getNodeIdentity().getCanonicalName());
                                                sb.append(" ");
                                                
sb.append("PID:"+inventoryProcess.getPID());
                                                sb.append(" ");
@@ -1723,7 +1723,7 @@ public class StateManager {
                                else {
                                        DuccId jobId = null;
                                        StringBuffer sb = new StringBuffer();
-                                       
sb.append("node:"+inventoryProcess.getNodeIdentity().getName());
+                                       
sb.append("node:"+inventoryProcess.getNodeIdentity().getCanonicalName());
                                        sb.append(" ");
                                        
sb.append("PID:"+inventoryProcess.getPID());
                                        sb.append(" ");

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
 Mon Apr 16 12:10:48 2018
@@ -243,11 +243,11 @@ public class OrchestratorEventListener i
                        switch(type) {
                        case SWITCH_TO_BACKUP:
                        case SWITCH_TO_MASTER:
-                               logger.warn(methodName, null, 
daemonDuccEvent.getDaemon().getAbbrev(), 
daemonDuccEvent.getNodeIdentity().getName());
+                               logger.warn(methodName, null, 
daemonDuccEvent.getDaemon().getAbbrev(), 
daemonDuccEvent.getNodeIdentity().getCanonicalName());
                                SystemEventsLogger.warn(daemonDuccEvent);
                                break;
                        default:
-                               logger.info(methodName, null, 
daemonDuccEvent.getDaemon().getAbbrev(), 
daemonDuccEvent.getNodeIdentity().getName());
+                               logger.info(methodName, null, 
daemonDuccEvent.getDaemon().getAbbrev(), 
daemonDuccEvent.getNodeIdentity().getCanonicalName());
                                SystemEventsLogger.info(daemonDuccEvent);
                                break;
                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java
 Mon Apr 16 12:10:48 2018
@@ -64,7 +64,7 @@ public class JdReservation extends JdRes
                String retVal = null;
                NodeIdentity nodeIdentity= getNodeIdentity();
                if(nodeIdentity != null) {
-                       retVal = nodeIdentity.getName();
+                       retVal = nodeIdentity.getCanonicalName();
                }
                return retVal;
        }
@@ -151,7 +151,7 @@ public class JdReservation extends JdRes
                                }
                        }
                        if(retVal != null) {
-                               logger.info(location, jobIdentity, 
"driverId:"+driverIdentity+" "+"host: "+retVal.getName()+" "+"size: 
"+map.size());
+                               logger.info(location, jobIdentity, 
"driverId:"+driverIdentity+" "+"host: "+retVal.getCanonicalName()+" "+"size: 
"+map.size());
                        }
                }
                return retVal;
@@ -169,7 +169,7 @@ public class JdReservation extends JdRes
                                }
                        }
                        if(retVal != null) {
-                               logger.info(location, jobIdentity, 
"driverId:"+driverIdentity+" "+"host: "+retVal.getName()+" "+"size: 
"+map.size());
+                               logger.info(location, jobIdentity, 
"driverId:"+driverIdentity+" "+"host: "+retVal.getCanonicalName()+" "+"size: 
"+map.size());
                        }
                }
                return retVal;

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
 Mon Apr 16 12:10:48 2018
@@ -743,7 +743,7 @@ public class JdScheduler {
                                        logger.debug(location, jobIdentity, 
"host: "+host+" "+"job: "+jobIdentity);
                                        nodeIdentity = 
jdReservation.allocate(jobIdentity, driverIdentity);
                                        if(nodeIdentity != null) {
-                                               host = nodeIdentity.getName();
+                                               host = 
nodeIdentity.getCanonicalName();
                                                changes.set(true);
                                                break;
                                        }
@@ -771,7 +771,7 @@ public class JdScheduler {
                                        logger.debug(location, jobIdentity, 
"host: "+host+" "+"job: "+jobIdentity);
                                        nodeIdentity = 
jdReservation.deallocate(jobIdentity, driverIdentity);
                                        if(nodeIdentity != null) {
-                                               host = nodeIdentity.getName();
+                                               host = 
nodeIdentity.getCanonicalName();
                                                changes.set(true);
                                                break;
                                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
 Mon Apr 16 12:10:48 2018
@@ -179,7 +179,7 @@ public class HealthMonitor {
                                                }
                                                else {
                                                        
if(!process.isComplete()) {
-                                                               String nodeName 
= process.getNodeIdentity().getName();
+                                                               String nodeName 
= process.getNodeIdentity().getCanonicalName();
                                                                
if(!NodeAccounting.getInstance().isAlive(nodeName)) {
                                                                        
process.advanceProcessState(ProcessState.Stopped);
                                                                        
logger.info(methodName, job.getDuccId(), process.getDuccId(), 
ProcessState.Stopped);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
 Mon Apr 16 12:10:48 2018
@@ -123,7 +123,7 @@ public class NodeAccounting {
                                DuccId duccId = iterator.next();
                                IDuccProcess process = processMap.get(duccId);
                                NodeIdentity nodeIdentity = 
process.getNodeIdentity();
-                               String nodeName = nodeIdentity.getName();
+                               String nodeName = 
nodeIdentity.getCanonicalName();
                                heartbeat(nodeName);
                                break;
                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateFile.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateFile.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateFile.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/state/OrchestratorStateFile.java
 Mon Apr 16 12:10:48 2018
@@ -108,7 +108,7 @@ public class OrchestratorStateFile imple
                synchronized(this) {
                        String node = "?";
                        if(nodeIdentity != null) {
-                               node = nodeIdentity.getName();
+                               node = nodeIdentity.getCanonicalName();
                        }
                        long currentValue = seqNoPublication.get();
                        if(value > currentValue) {

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/system/events/log/SystemEventsLogger.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/system/events/log/SystemEventsLogger.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/system/events/log/SystemEventsLogger.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/system/events/log/SystemEventsLogger.java
 Mon Apr 16 12:10:48 2018
@@ -612,7 +612,7 @@ public class SystemEventsLogger {
                String daemon = dde.getDaemon().getAbbrev();
                String user = System.getProperty("user.name");
                String type = dde.getEventType().name();
-               Object[] event = { Labels.NODE+dde.getNodeIdentity().getName(), 
Labels.TOD+""+dde.getTod() };
+               Object[] event = { 
Labels.NODE+dde.getNodeIdentity().getCanonicalName(), 
Labels.TOD+""+dde.getTod() };
                duccLogger.event_info(daemon, user, type, event);
        }
        
@@ -623,7 +623,7 @@ public class SystemEventsLogger {
                String daemon = dde.getDaemon().getAbbrev();
                String user = System.getProperty("user.name");
                String type = dde.getEventType().name();
-               Object[] event = { Labels.NODE+dde.getNodeIdentity().getName(), 
Labels.TOD+""+dde.getTod() };
+               Object[] event = { 
Labels.NODE+dde.getNodeIdentity().getCanonicalName(), 
Labels.TOD+""+dde.getTod() };
                duccLogger.event_warn(daemon, user, type, event);
        }
        

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-pm/src/main/java/org/apache/uima/ducc/pm/ProcessManagerComponent.java
 Mon Apr 16 12:10:48 2018
@@ -108,7 +108,7 @@ implements ProcessManager {
                NodeIdentity nodeIdentity = new NodeIdentity();
                DaemonDuccEvent ev = new DaemonDuccEvent(daemon, eventType, 
nodeIdentity);
             eventDispatcher.dispatch(stateChangeEndpoint, ev, "");
-            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getName());
+            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getCanonicalName());
         }
        catch(Exception e) {
                logger.error(methodName, null, e);
@@ -291,7 +291,7 @@ implements ProcessManager {
                                process.getProcessState().toString(),
                                process.getResourceState().toString(),
                                process.getNodeIdentity().getIp(),
-                               process.getNodeIdentity().getName(),
+                               process.getNodeIdentity().getCanonicalName(),
                                process.getProcessDeallocationType().toString(),
                                (process.getProcessJmxUrl() == null ? "N/A" : 
process.getProcessJmxUrl() ));
                

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
 Mon Apr 16 12:10:48 2018
@@ -192,7 +192,7 @@ public class JobManagerConverter
             NodeIdentity ni = idr.getNodeIdentity();
             Machine m = scheduler.getMachine(ni);
             if ( m == null ) {                             // not known, huh? 
maybe next epoch it will have checked in
-                logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getName());
+                logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getCanonicalName());
             } else {
                 m.blacklist(job.getDuccId(), idr.getDuccId(), -1);
             }
@@ -246,7 +246,7 @@ public class JobManagerConverter
                     NodeIdentity ni = idp.getNodeIdentity();
                     Machine m = scheduler.getMachine(ni);
                     if ( m == null ) {                             // not 
known, huh? maybe next epoch it will have checked in
-                        logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getName());
+                        logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getCanonicalName());
                     } else {
                         m.whitelist(idp.getDuccId());
                     }
@@ -258,7 +258,7 @@ public class JobManagerConverter
                     NodeIdentity ni = idp.getNodeIdentity();
                     Machine m = scheduler.getMachine(ni);
                     if ( m == null ) {                             // not 
known, huh? maybe next epoch it will have checked in
-                        logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getName());
+                        logger.warn(methodName, job.getDuccId(), "Problem 
whitelisting: cannot find machine", ni.getCanonicalName());
                     } else {
                         m.whitelist(idp.getDuccId());
                     }
@@ -426,13 +426,13 @@ public class JobManagerConverter
                 NodeIdentity ni = proc.getNodeIdentity();
 
                 if ( proc.isComplete() ) {
-                    logger.debug(methodName, j.getId(), "Skipping process", 
pid, "on", ni.getName(), "beacause state is", state);
+                    logger.debug(methodName, j.getId(), "Skipping process", 
pid, "on", ni.getCanonicalName(), "beacause state is", state);
                     continue;
                  }
 
                 Machine m = scheduler.getMachine(ni);
                 if ( m == null ) {                             // not known, 
huh? maybe next epoch it will have checked in
-                    refuse(j, "Cannot restore job because node " + 
ni.getName()  + " is unknown.");
+                    refuse(j, "Cannot restore job because node " + 
ni.getCanonicalName()  + " is unknown.");
                     return false;                              // so we don't 
add it to global tables
                 } else {
                     DuccId id = proc.getDuccId();
@@ -469,7 +469,7 @@ public class JobManagerConverter
                 NodeIdentity ni = res.getNodeIdentity();
                 Machine m = scheduler.getMachine(ni);
                 if ( m == null ) {                             // not known, 
huh? maybe next epoch it will have checked in
-                    refuse(j, "Cannot restore reservation because node " + 
ni.getName() + " is unknown.");
+                    refuse(j, "Cannot restore reservation because node " + 
ni.getCanonicalName() + " is unknown.");
                     return false;                              // so we don't 
add it to global tables
                 } else {
                     DuccId id = res.getDuccId();
@@ -1269,9 +1269,9 @@ public class JobManagerConverter
                                             "   Process[", pid, 
                                             "] state [", state, 
                                             "] is complete [", 
proc.isComplete(),
-                                            "] Node [", 
n.getNodeIdentity().getName() + "." + proc.getDuccId(),                         
                   
+                                            "] Node [", 
n.getNodeIdentity().getCanonicalName() + "." + proc.getDuccId(),                
                            
                                             "] mem [", mem, "]");              
      
-                                logger.info(methodName, w.getDuccId(), "      
Recover node[", n.getNodeIdentity().getName());
+                                logger.info(methodName, w.getDuccId(), "      
Recover node[", n.getNodeIdentity().getCanonicalName());
                                 // 
                                 // Note, not ignoring dead processes belonging 
to live jobs.  Is this best or should we be
                                 // more conservative and not use nodes that we 
don't know 100% for sure are ok?
@@ -1305,7 +1305,7 @@ public class JobManagerConverter
                             } else {
                                 long mem = n 
.getNodeMetrics().getNodeMemory().getMemTotal();
                                 logger.info(methodName, w.getDuccId(), 
-                                            "   Node[", 
n.getNodeIdentity().getName(),
+                                            "   Node[", 
n.getNodeIdentity().getCanonicalName(),
                                             "] mem[", mem, "]");
                                 nodes.put(n, n);
                             }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/NodeStability.java
 Mon Apr 16 12:10:48 2018
@@ -48,21 +48,21 @@ public class NodeStability
 
         scheduler.nodeDeath(nodes);
         for ( Node n : nodes.keySet() ) {
-            logger.debug(methodName, null, "*** ! Notification of node 
death:", n.getNodeIdentity().getName());
+            logger.debug(methodName, null, "*** ! Notification of node 
death:", n.getNodeIdentity().getCanonicalName());
         }
     }
 
     public void missedNode(Node n, int c)
     {
        String methodName = "missedNode";
-        logger.warn(methodName, null, "*** Missed heartbeat ***", 
n.getNodeIdentity().getName(), "count[", c, "]");
+        logger.warn(methodName, null, "*** Missed heartbeat ***", 
n.getNodeIdentity().getCanonicalName(), "count[", c, "]");
         scheduler.nodeHb(n, c);
     }
 
     public void nodeRecovers(Node n)
     {
        String methodName = "nodeRecovers";
-        logger.info(methodName, null, "*** Node recovers ***", 
n.getNodeIdentity().getName());
+        logger.info(methodName, null, "*** Node recovers ***", 
n.getNodeIdentity().getCanonicalName());
         scheduler.nodeHb(n, 0);
     }
 

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/ResourceManagerComponent.java
 Mon Apr 16 12:10:48 2018
@@ -220,7 +220,7 @@ public class ResourceManagerComponent
                NodeIdentity nodeIdentity = new NodeIdentity();
                DaemonDuccEvent ev = new DaemonDuccEvent(daemon, eventType, 
nodeIdentity);
             eventDispatcher.dispatch(stateChangeEndpoint, ev, "");
-            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getName());
+            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getCanonicalName());
         }
        catch(Exception e) {
                logger.error(methodName, null, e);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/event/ResourceManagerEventListener.java
 Mon Apr 16 12:10:48 2018
@@ -108,7 +108,7 @@ public class ResourceManagerEventListene
                NodeIdentity ni = duccEvent.getNodeIdentity();
                LifecycleEvent lifecycleEvent = duccEvent.getLifecycleEvent();
                StringBuffer sb = new StringBuffer();
-               sb.append("node:"+ni.getName()+" ");
+               sb.append("node:"+ni.getCanonicalName()+" ");
                        sb.append("id:"+process.getDuccId().toString()+" ");
                        sb.append("lifecycleEvent:"+lifecycleEvent.name()+" ");
                        String args = sb.toString().trim();

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Machine.java
 Mon Apr 16 12:10:48 2018
@@ -81,7 +81,7 @@ public class Machine
     {
         this.node = node;
         this.memory =  node.getNodeMetrics().getNodeMemory().getMemTotal();
-        this.id = node.getNodeIdentity().getName();
+        this.id = node.getNodeIdentity().getCanonicalName();
     }
 
 //    public Machine(String id, long memory)
@@ -505,7 +505,7 @@ public class Machine
      */
     public boolean matches(String s)
     {
-        String name = getNodeIdentity().getName();
+        String name = getNodeIdentity().getCanonicalName();
         if ( s.equals(name) ) return true;                 // try for a 
perfect match
         
         // see if s is qualified with the domain name

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/NodePool.java
 Mon Apr 16 12:10:48 2018
@@ -204,7 +204,7 @@ class NodePool
     {
         // allow the names to be machines or ip addresses
         if ( subpoolNames.containsKey( n.getNodeIdentity().getIp()   )) return 
true;
-        if ( subpoolNames.containsKey( n.getNodeIdentity().getName() )) return 
true;
+        if ( subpoolNames.containsKey( n.getNodeIdentity().getCanonicalName() 
)) return true;
         return false;
     }
 
@@ -1012,7 +1012,7 @@ class NodePool
     {
         String methodName = "signalDb";
         try {
-            
persistenceAccess.setNodeProperty(m.getNode().getNodeIdentity().getName(), key, 
value);
+            
persistenceAccess.setNodeProperty(m.getNode().getNodeIdentity().getCanonicalName(),
 key, value);
         } catch (Exception e) {
             logger.warn(methodName, null, "Cannot update DB property", key, 
"for machine", m);
         }
@@ -1024,7 +1024,7 @@ class NodePool
         NodeIdentity nid = n.getNodeIdentity();
 
         Map<RmNodes, Object> props = new HashMap<RmNodes, Object>();
-        props.put(RmNodes.Name, nid.getName());
+        props.put(RmNodes.Name, nid.getCanonicalName());
         props.put(RmNodes.Ip, nid.getIp());
         props.put(RmNodes.Nodepool, id);
         props.put(RmNodes.Quantum, share_quantum / ( 1024*1024));
@@ -1078,7 +1078,7 @@ class NodePool
 
         updateMaxOrder(order);
 
-        String n = node.getNodeIdentity().getName();
+        String n = node.getNodeIdentity().getCanonicalName();
 
         // if it's offline it can't be restored like this.
         if ( offlineMachines.containsKey(node) ) {

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Scheduler.java
 Mon Apr 16 12:10:48 2018
@@ -825,7 +825,7 @@ public class Scheduler
                 Machine m = getMachine(n);
 
                 if ( m == null ) {
-                    logger.warn(methodName, null, "Cannot find any record of 
machine", n.getNodeIdentity().getName());
+                    logger.warn(methodName, null, "Cannot find any record of 
machine", n.getNodeIdentity().getCanonicalName());
                     continue;
                 }
 
@@ -1138,13 +1138,13 @@ public class Scheduler
     //
     NodePool getNodepoolByName(NodeIdentity ni)
     {
-        NodePool np = nodepoolsByNode.get( ni.getName() );
+        NodePool np = nodepoolsByNode.get( ni.getCanonicalName() );
         if ( np == null ) {
             np = nodepoolsByNode.get( ni.getIp() );
         }
         if ( np == null ) {
             np = nodepools[0];
-            updateNodepoolsByNode(ni.getName(), np);     // assign this guy to 
the default np
+            updateNodepoolsByNode(ni.getCanonicalName(), np);     // assign 
this guy to the default np
             // nodepoolsByNode.put( ni.getName(), np);          // assign this 
guy to the default np
         }
         return np;
@@ -1155,7 +1155,7 @@ public class Scheduler
     {        
         String methodName = "nodeArrives";
         if ( ! isInitialized() ) {
-            logger.info(methodName, null, "Waiting for (re)initialization; 
node = " + node.getNodeIdentity().getName());
+            logger.info(methodName, null, "Waiting for (re)initialization; 
node = " + node.getNodeIdentity().getCanonicalName());
             return;
         }
 

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/Share.java
 Mon Apr 16 12:10:48 2018
@@ -287,7 +287,7 @@ public class Share
                 npid = Long.parseLong(pid);
             }
 
-                       
persistenceAccess.updateShare(getNode().getNodeIdentity().getName(), id, jobid, 
investment, state.toString(), getInitializationTime(), npid);
+                       
persistenceAccess.updateShare(getNode().getNodeIdentity().getCanonicalName(), 
id, jobid, investment, state.toString(), getInitializationTime(), npid);
                } catch (Exception e) {
             logger.warn(methodName, job.getId(), "Cannot update share 
statistics in database for share", id, e);
                }
@@ -361,7 +361,7 @@ public class Share
        String methodName = "setFixed";
         fixed = true;
         try {
-                       
persistenceAccess.setFixed(getNode().getNodeIdentity().getName(), id, 
job.getId(), true);
+                       
persistenceAccess.setFixed(getNode().getNodeIdentity().getCanonicalName(), id, 
job.getId(), true);
                } catch (Exception e) {
             logger.warn(methodName, job.getId(), "Cannot update 'fixed' in 
database for share", id, e);
                }
@@ -377,7 +377,7 @@ public class Share
        String methodName = "evicted";
         evicted = true;
         try {
-               
persistenceAccess.setEvicted(getNode().getNodeIdentity().getName(), id, 
job.getId(), true);
+               
persistenceAccess.setEvicted(getNode().getNodeIdentity().getCanonicalName(), 
id, job.getId(), true);
                } catch (Exception e) {
             logger.warn(methodName, job.getId(), "Cannot update 'evicted' in 
database for share", id, e);
                }
@@ -393,7 +393,7 @@ public class Share
        String methodName = "purge";
         purged = true;
         try {
-               
persistenceAccess.setPurged(getNode().getNodeIdentity().getName(), id, 
job.getId(), true);
+               
persistenceAccess.setPurged(getNode().getNodeIdentity().getCanonicalName(), id, 
job.getId(), true);
                } catch (Exception e) {
             logger.warn(methodName, job.getId(), "Cannot update 'purge bit' in 
database for share", id, e);
                }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
 Mon Apr 16 12:10:48 2018
@@ -631,7 +631,7 @@ public class ServiceHandler
             } else {
                 for ( DuccId pid : pm.keySet() ) {
                     NodeIdentity ni = pm.get(pid).getNodeIdentity();
-                    node = ni.getName();
+                    node = ni.getCanonicalName();
                     share_id = pid.getFriendly();
                 }
             }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
 Mon Apr 16 12:10:48 2018
@@ -97,7 +97,7 @@ public class ServiceManagerComponent
        /**
         *
         */
-       private static DuccLogger logger = 
DuccLogger.getLogger(ServiceManagerComponent.class.getName(), COMPONENT_NAME);
+       private static DuccLogger logger = 
DuccLogger.getLogger(ServiceManagerComponent.class.getCanonicalName(), 
COMPONENT_NAME);
        private static DuccId jobid = null;
 
        private IDuccWorkMap localMap = null;
@@ -281,7 +281,7 @@ public class ServiceManagerComponent
                NodeIdentity nodeIdentity = new NodeIdentity();
                DaemonDuccEvent ev = new DaemonDuccEvent(daemon, eventType, 
nodeIdentity);
             eventDispatcher.dispatch(stateChangeEndpoint, ev, "");
-            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getName());
+            logger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getCanonicalName());
         }
        catch(Exception e) {
                logger.error(methodName, null, e);
@@ -302,7 +302,7 @@ public class ServiceManagerComponent
         meta_ping_rate      = 
SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.rate"          , 
meta_ping_rate);
         meta_ping_timeout   = 
SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.timeout"       , 
meta_ping_timeout);
         meta_ping_stability = 
SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.stability"     , 
meta_ping_stability);
-        default_ping_class  = 
SystemPropertyResolver.getStringProperty("ducc.sm.default.monitor.class", 
UimaAsPing.class.getName());
+        default_ping_class  = 
SystemPropertyResolver.getStringProperty("ducc.sm.default.monitor.class", 
UimaAsPing.class.getCanonicalName());
 
         String rm = SystemPropertyResolver.getStringProperty("ducc.runmode", 
"");
         if ( rm.equals("Test") ) testmode = true;
@@ -349,7 +349,7 @@ public class ServiceManagerComponent
 
         readAdministrators();
 
-        stateHandler = 
StateServicesFactory.getInstance(this.getClass().getName(), COMPONENT_NAME);
+        stateHandler = 
StateServicesFactory.getInstance(this.getClass().getCanonicalName(), 
COMPONENT_NAME);
 
         // // String dbname = System.getProperty("ducc.db.name");
         // String dburl  = System.getProperty("ducc.state.database.url"); // 
"remote:localhost:2424/DuccState"

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
 Mon Apr 16 12:10:48 2018
@@ -215,7 +215,7 @@ public class JobDriverStateExchanger ext
                                IDuccProcess p = entry.getValue();
                                ProcessState state = p.getProcessState();
                                NodeIdentity ni = p.getNodeIdentity();
-                               String node = ni.getName();
+                               String node = ni.getCanonicalName();
                                String ip = ni.getIp();
                                String pidName = p.getDuccId().getFriendly()+"";
                                String pid = p.getPID();

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/DuccHttpClient.java
 Mon Apr 16 12:10:48 2018
@@ -205,7 +205,7 @@ public class DuccHttpClient {
                return ip;
        }
        private String getNodeName() {
-               String nn =nodeIdentity.getName();
+               String nn =nodeIdentity.getCanonicalName();
                if ( 
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value()) != null) {
                        nn = 
System.getenv(IDuccUser.EnvironmentVariable.DUCC_NODENAME.value());
                }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
 Mon Apr 16 12:10:48 2018
@@ -353,7 +353,7 @@ public class DuccWorkReservation extends
                        IDuccReservationMap map = getReservationMap();
                        for (DuccId key : map.keySet()) { 
                                IDuccReservation value = 
getReservationMap().get(key);
-                               String node = value.getNodeIdentity().getName();
+                               String node = 
value.getNodeIdentity().getCanonicalName();
                                if(unique) {
                                        if(!list.contains(node)) {
                                                list.add(node);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkUtil.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkUtil.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkUtil.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkUtil.java
 Mon Apr 16 12:10:48 2018
@@ -34,7 +34,7 @@ public class DuccWorkUtil {
        private static void put(List<String> list, NodeIdentity nodeIdentity) {
                if(list != null) {
                        if(nodeIdentity != null) {
-                               String name = nodeIdentity.getName();
+                               String name = nodeIdentity.getCanonicalName();
                                if(name != null) {
                                        if(!list.contains(name)) {
                                                list.add(name);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/Resource.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/Resource.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/Resource.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/Resource.java
 Mon Apr 16 12:10:48 2018
@@ -72,6 +72,6 @@ public class Resource implements IResour
 
     public String toString()
     {
-        return getNodeId().getName() + "." + duccId.getFriendly() + "^" + 
itime + ( purged ? "^P" : "");
+        return getNodeId().getCanonicalName() + "." + duccId.getFriendly() + 
"^" + itime + ( purged ? "^P" : "");
     }
 }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/json/jp/JobProcessCollection.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/json/jp/JobProcessCollection.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/json/jp/JobProcessCollection.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/json/jp/JobProcessCollection.java
 Mon Apr 16 12:10:48 2018
@@ -91,7 +91,7 @@ public class JobProcessCollection {
        private static String getHostName(IDuccWorkJob job, IDuccProcess 
process) {
                String retVal = null;
                try {
-                       retVal = process.getNodeIdentity().getName();
+                       retVal = process.getNodeIdentity().getCanonicalName();
                }
                catch(Exception e) {
                }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
 Mon Apr 16 12:10:48 2018
@@ -97,7 +97,7 @@ public class Distiller {
                                                                                
if(!process.isDeallocated()) {
                                                                                
        NodeIdentity ni = process.getNodeIdentity();
                                                                                
        if(ni != null) {
-                                                                               
                String name = ni.getName();
+                                                                               
                String name = ni.getCanonicalName();
                                                                                
                if(name != null) {
                                                                                
                        add(map, name, bytes);
                                                                                
                        SizeBytes sb = new SizeBytes(Type.Bytes,bytes);
@@ -135,7 +135,7 @@ public class Distiller {
                                                                
for(IDuccReservation reservation : reservationMap.values()) {
                                                                        
NodeIdentity ni = reservation.getNodeIdentity();
                                                                        if(ni 
!= null) {
-                                                                               
String name = ni.getName();
+                                                                               
String name = ni.getCanonicalName();
                                                                                
if(name != null) {
                                                                                
        SizeBytes sb = new SizeBytes(SizeBytes.Type.Bytes, 
dw.getSchedulingInfo().getMemorySizeAllocatedInBytes());
                                                                                
        long bytes = sb.getBytes();
@@ -180,7 +180,7 @@ public class Distiller {
                                                                                
if(!process.isDeallocated()) {
                                                                                
        NodeIdentity ni = process.getNodeIdentity();
                                                                                
        if(ni != null) {
-                                                                               
                String name = ni.getName();
+                                                                               
                String name = ni.getCanonicalName();
                                                                                
                if(name != null) {
                                                                                
                        add(map, name, bytes);
                                                                                
                        SizeBytes sb = new SizeBytes(Type.Bytes,bytes);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDataHelper.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDataHelper.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDataHelper.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDataHelper.java
 Mon Apr 16 12:10:48 2018
@@ -171,7 +171,7 @@ public class DuccDataHelper {
                                                IDuccProcess proc = 
map.get(procid);
                                                if(!proc.isComplete()) {
                                                        NodeIdentity 
nodeIdentity = proc.getNodeIdentity();
-                                                       String procNodeName = 
nodeIdentity.getName();
+                                                       String procNodeName = 
nodeIdentity.getCanonicalName();
                                                        if(procNodeName != 
null) {
                                                                
if(nodeName.equals(procNodeName)) {
                                                                        
JobProcessInfo jpi = new JobProcessInfo();

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
 Mon Apr 16 12:10:48 2018
@@ -379,7 +379,7 @@ public class DuccMachinesData {
                        String ipString = ip.toString();
                        ipToNodeUsersInfoMap.put(ipString, map);
                }
-               String machineName = 
nodeMetrics.getNodeIdentity().getName().trim();
+               String machineName = 
nodeMetrics.getNodeIdentity().getCanonicalName().trim();
                NodeId nodeId = new NodeId(machineName);
                ipToNameMap.put(ip,nodeId);
                nameToIpMap.put(nodeId,ip);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
 Mon Apr 16 12:10:48 2018
@@ -268,6 +268,16 @@ public class MachineInfo implements Comp
                return this.name;
        }
        
+       public String getShortName() {
+               String retVal = this.name;
+               if(retVal != null) {
+                       if(retVal.contains(".")) {
+                               retVal = retVal.split("\\.")[0];
+                       }
+               }
+               return retVal;
+       }
+       
        public void setMemTotal(String value) {
                this.memTotal = value;
        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
 Mon Apr 16 12:10:48 2018
@@ -114,7 +114,7 @@ implements IWebServer {
                NodeIdentity nodeIdentity = new NodeIdentity();
                DaemonDuccEvent ev = new DaemonDuccEvent(daemon, eventType, 
nodeIdentity);
             eventDispatcher.dispatch(stateChangeEndpoint, ev, "");
-            duccLogger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getName());
+            duccLogger.info(methodName, null, stateChangeEndpoint, 
eventType.name(), nodeIdentity.getCanonicalName());
         }
        catch(Exception e) {
                duccLogger.error(methodName, null, e);

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
 Mon Apr 16 12:10:48 2018
@@ -539,8 +539,8 @@ public abstract class DuccAbstractHandle
                                if(nodeId != null) {
                                        String ip = nodeId.getIp();
                                        
if(DuccMachinesData.getInstance().isMachineSwapping(ip)) {
-                                               
if(!retVal.contains(nodeId.getName())) {
-                                                       
retVal.add(nodeId.getName());
+                                               
if(!retVal.contains(nodeId.getCanonicalName())) {
+                                                       
retVal.add(nodeId.getCanonicalName());
                                                }
                                        }
                                }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
 Mon Apr 16 12:10:48 2018
@@ -3175,7 +3175,7 @@ public class DuccHandler extends DuccAbs
                        Iterator<MachineInfo> iterator = 
machines.keySet().iterator();
                        while(iterator.hasNext()) {
                                MachineInfo machineInfo = iterator.next();
-                               Properties properties = 
DuccDaemonRuntimeProperties.getInstance().getAgent(machineInfo.getName());
+                               Properties properties = 
DuccDaemonRuntimeProperties.getInstance().getAgent(machineInfo.getShortName());
                                if(first) {
                                        first = false;
                                }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
 Mon Apr 16 12:10:48 2018
@@ -767,7 +767,7 @@ public class DuccHandlerClassic extends
                                IDuccReservationMap map = 
reservation.getReservationMap();
                                for (DuccId key : map.keySet()) { 
                                        IDuccReservation value = 
reservation.getReservationMap().get(key);
-                                       String node = 
value.getNodeIdentity().getName();
+                                       String node = 
value.getNodeIdentity().getCanonicalName();
                                        if(!nodeMap.containsKey(node)) {
                                                nodeMap.put(node,new 
Integer(0));
                                        }
@@ -824,7 +824,7 @@ public class DuccHandlerClassic extends
                        while(iterator.hasNext()) {
                                DuccId processId = iterator.next();
                                IDuccProcess process = 
job.getProcessMap().get(processId);
-                               String node = 
process.getNodeIdentity().getName();
+                               String node = 
process.getNodeIdentity().getCanonicalName();
                                nodeMap.put(node, 1);
                        }
                }
@@ -1645,7 +1645,7 @@ public class DuccHandlerClassic extends
                                while(iterator.hasNext()) {
                                        MachineInfo machineInfo = 
iterator.next();
                                        DuccDaemonRuntimeProperties drp = 
DuccDaemonRuntimeProperties.getInstance();
-                                       String machineName = 
machineInfo.getName();
+                                       String machineName = 
machineInfo.getShortName();
                                        if(machineName.startsWith("=")) {
                                                continue;
                                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
 Mon Apr 16 12:10:48 2018
@@ -1083,7 +1083,7 @@ public class DuccHandlerJsonFormat exten
                                IDuccReservationMap map = 
reservation.getReservationMap();
                                for (DuccId key : map.keySet()) { 
                                        IDuccReservation value = 
reservation.getReservationMap().get(key);
-                                       String node = 
value.getNodeIdentity().getName();
+                                       String node = 
value.getNodeIdentity().getCanonicalName();
                                        if(!nodeMap.containsKey(node)) {
                                                nodeMap.put(node,new 
Integer(0));
                                        }
@@ -1140,7 +1140,7 @@ public class DuccHandlerJsonFormat exten
                        while(iterator.hasNext()) {
                                DuccId processId = iterator.next();
                                IDuccProcess process = 
job.getProcessMap().get(processId);
-                               String node = 
process.getNodeIdentity().getName();
+                               String node = 
process.getNodeIdentity().getCanonicalName();
                                nodeMap.put(node, 1);
                        }
                }
@@ -2445,7 +2445,7 @@ public class DuccHandlerJsonFormat exten
                                        row = new JsonArray();
                                        MachineInfo machineInfo = 
iterator.next();
                                        DuccDaemonRuntimeProperties drp = 
DuccDaemonRuntimeProperties.getInstance();
-                                       String machineName = 
machineInfo.getName();
+                                       String machineName = 
machineInfo.getShortName();
                                        if(machineName.startsWith("=")) {
                                                continue;
                                        }

Modified: 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
URL: 
http://svn.apache.org/viewvc/uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java?rev=1829255&r1=1829254&r2=1829255&view=diff
==============================================================================
--- 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
 (original)
+++ 
uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
 Mon Apr 16 12:10:48 2018
@@ -125,7 +125,7 @@ public class DuccWebUtil {
                                for(Entry<DuccId, IDuccProcess> entry : 
map.entrySet()) {
                                        IDuccProcess proc = entry.getValue();
                                        NodeIdentity nodeIdentity = 
proc.getNodeIdentity();
-                                       String host = nodeIdentity.getName();
+                                       String host = 
nodeIdentity.getCanonicalName();
                                        if(host != null) {
                                                String pid = proc.getPID();
                                                if(pid != null) {


Reply via email to