# HG changeset patch # User akahori # Date 1534987908 -32400 # Node ID 34181394333fc0cb33cbdf9e72093cf1d3bd3229 # Parent 84089813455f99df34d17629e9dd5aff91bca935 fix RecordTopology diff -r 84089813455f -r 34181394333f src/main/java/christie/topology/manager/IncomingHosts.java --- a/src/main/java/christie/topology/manager/IncomingHosts.java Thu Aug 23 10:10:35 2018 +0900 +++ b/src/main/java/christie/topology/manager/IncomingHosts.java Thu Aug 23 10:31:48 2018 +0900 @@ -64,6 +64,7 @@ getLocalDGM().put(nodeInfo.sourceNodeName, hostMessage); log.info(" write to " + nodeInfo.sourceNodeName + " config message =" + hostMessage.toString() + " remain " + Integer.toString((nodeNames.size()))); + // RecordTopologyは, !conf.dynamic のときは呼ばれない. cgm.setup(new RecordTopology()); } diff -r 84089813455f -r 34181394333f src/main/java/christie/topology/manager/RecordTopology.java --- a/src/main/java/christie/topology/manager/RecordTopology.java Thu Aug 23 10:10:35 2018 +0900 +++ b/src/main/java/christie/topology/manager/RecordTopology.java Thu Aug 23 10:31:48 2018 +0900 @@ -13,7 +13,7 @@ public class RecordTopology extends CodeGear { @Take - HostMessage hostInfo; + HostMessage nodeInfo; @Peek HashMap> topology; @@ -22,13 +22,13 @@ @Override public void run(CodeGearManager cgm) { LinkedList connections; - if (!topology.containsKey(hostInfo.remoteAbsName)) { + if (!topology.containsKey(nodeInfo.remoteAbsName)) { connections = new LinkedList(); } else { - connections = topology.get(hostInfo.remoteAbsName); + connections = topology.get(nodeInfo.remoteAbsName); } - connections.add(hostInfo); - topology.put(hostInfo.remoteAbsName, connections); + connections.add(nodeInfo); + topology.put(nodeInfo.remoteAbsName, connections); // need debug option // for (LinkedList list :topology.values()){ // System.out.print(list.get(0).remoteAbsName+" : ");