Modified: uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/Helper.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/Helper.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/Helper.java (original) +++ uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/Helper.java Mon Apr 16 12:10:48 2018 @@ -171,22 +171,22 @@ public class Helper { if(process != null) { switch(type) { case UIMA: - retVal = job.getDuccId().getFriendly()+"-"+LogType.UIMA.name()+"-"+process.getNodeIdentity().getName()+"-"+process.getPID()+".log"; + retVal = job.getDuccId().getFriendly()+"-"+LogType.UIMA.name()+"-"+process.getNodeIdentity().getCanonicalName()+"-"+process.getPID()+".log"; break; case MR: - retVal = job.getDuccId().getFriendly()+"-"+LogType.POP.name()+"-"+process.getNodeIdentity().getName()+"-"+process.getPID()+".log"; + retVal = job.getDuccId().getFriendly()+"-"+LogType.POP.name()+"-"+process.getNodeIdentity().getCanonicalName()+"-"+process.getPID()+".log"; break; case SPU: - retVal = job.getDuccId().getFriendly()+"-"+LogType.UIMA.name()+"-"+process.getNodeIdentity().getName()+"-"+process.getPID()+".log"; + retVal = job.getDuccId().getFriendly()+"-"+LogType.UIMA.name()+"-"+process.getNodeIdentity().getCanonicalName()+"-"+process.getPID()+".log"; break; case SPC: - retVal = job.getDuccId().getFriendly()+"-"+LogType.POP.name()+"-"+process.getNodeIdentity().getName()+"-"+process.getPID()+".log"; + retVal = job.getDuccId().getFriendly()+"-"+LogType.POP.name()+"-"+process.getNodeIdentity().getCanonicalName()+"-"+process.getPID()+".log"; break; case JD: retVal = "jd.out.log"; // <UIMA-3802> // {jobid}-JD-{node}-{PID}.log - String node = process.getNodeIdentity().getName(); + String node = process.getNodeIdentity().getCanonicalName(); String pid = process.getPID(); retVal = job.getDuccId()+"-"+"JD"+"-"+node+"-"+pid+".log"; // </UIMA-3802> @@ -245,7 +245,7 @@ public class Helper { if(process != null) { NodeIdentity ni = process.getNodeIdentity(); if(ni != null) { - String name = ni.getName(); + String name = ni.getCanonicalName(); if(name != null) { sb.append(name); }
Modified: uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.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/nodeviz/NodeViz.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/nodeviz/NodeViz.java (original) +++ uima/uima-ducc/branches/reliable-ducc/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java Mon Apr 16 12:10:48 2018 @@ -205,7 +205,7 @@ public class NodeViz ProcessState state = proc.getProcessState(); Node n = proc.getNode(); - logger.debug(methodName, w.getDuccId(), (n == null ? "N/A" : n.getNodeIdentity().getName()), "Process[", pid, "] state [", state, "] is complete[", proc.isComplete(), "]"); + logger.debug(methodName, w.getDuccId(), (n == null ? "N/A" : n.getNodeIdentity().getCanonicalName()), "Process[", pid, "] state [", state, "] is complete[", proc.isComplete(), "]"); if ( proc.isComplete() ) { continue; } @@ -224,10 +224,10 @@ public class NodeViz break; } NodeIdentity ni = n.getNodeIdentity(); - NodeId nodeId = new NodeId(ni.getName()); + NodeId nodeId = new NodeId(ni.getCanonicalName()); MachineInfo mi = machinesData.getMachineInfoForNodeid(nodeId); if ( mi != null ) { - String key = strip(n.getNodeIdentity().getName()); + String key = strip(n.getNodeIdentity().getCanonicalName()); VisualizedHost vh = hosts.get(key); if ( vh == null ) { // System.out.println("Set host from OR with key:" + key + ":"); @@ -260,10 +260,10 @@ public class NodeViz logger.debug(methodName, w.getDuccId(), "NodeIdentity [N/A] mem[N/A"); } else { NodeIdentity ni = n.getNodeIdentity(); - NodeId nodeId = new NodeId(ni.getName()); + NodeId nodeId = new NodeId(ni.getCanonicalName()); MachineInfo mi = machinesData.getMachineInfoForNodeid(nodeId); if ( mi != null ) { - String key = strip(n.getNodeIdentity().getName()); + String key = strip(n.getNodeIdentity().getCanonicalName()); VisualizedHost vh = hosts.get(key); if ( vh == null ) { // System.out.println("Set host from OR with key:" + key + ":");
