# HG changeset patch # User akahori # Date 1535417153 -32400 # Node ID 76b6da075ce0fa0c151db72d6d7a68c29e1a9268 # Parent 9922e6decbe806e1da100f1f96301f943e2dc1bf fix run code diff -r 9922e6decbe8 -r 76b6da075ce0 src/main/java/christie/topology/manager/IncomingHosts.java --- a/src/main/java/christie/topology/manager/IncomingHosts.java Fri Aug 24 11:12:20 2018 +0900 +++ b/src/main/java/christie/topology/manager/IncomingHosts.java Tue Aug 28 09:45:53 2018 +0900 @@ -29,6 +29,7 @@ @Take String MD5; + private Logger log = Logger.getLogger(IncomingHosts.class); public IncomingHosts() { @@ -60,8 +61,7 @@ getLocalDGM().put("nodeInfo", hostMessage); - // TODO: ここをTopologyNodeのIncommingConnectionInfoにおくれるようにしないと, 動かない. - //getLocalDGM().put("hostInfo", hostMessage); + getLocalDGM().put("hostInfo", hostMessage); log.info(" write to " + nodeInfo.sourceNodeName + " config message =" + hostMessage.toString() + " remain " + Integer.toString((nodeNames.size()))); @@ -73,7 +73,7 @@ // configuration finish for (String key : resultParse.keySet()) { log.info(" write to " + key + " end message =" + (new HostMessage("",0,"","")).toString()); - getDGM(key).put("hostInfo", new HostMessage("",0,"","")); // end mark + getLocalDGM().put("hostInfo", new HostMessage("",0,"","")); // end mark } } diff -r 9922e6decbe8 -r 76b6da075ce0 src/main/java/christie/topology/node/ConfigurationFinish.java --- a/src/main/java/christie/topology/node/ConfigurationFinish.java Fri Aug 24 11:12:20 2018 +0900 +++ b/src/main/java/christie/topology/node/ConfigurationFinish.java Tue Aug 28 09:45:53 2018 +0900 @@ -16,7 +16,7 @@ int configNodeNum; @Peek - Config config; + TopologyNodeConfig config; private CodeGear startCS; diff -r 9922e6decbe8 -r 76b6da075ce0 src/main/java/christie/topology/node/CreateConnectionList.java --- a/src/main/java/christie/topology/node/CreateConnectionList.java Fri Aug 24 11:12:20 2018 +0900 +++ b/src/main/java/christie/topology/node/CreateConnectionList.java Tue Aug 28 09:45:53 2018 +0900 @@ -1,14 +1,16 @@ package christie.topology.node; +import christie.annotation.Peek; import christie.annotation.Take; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; +import java.util.ArrayList; import java.util.List; public class CreateConnectionList extends CodeGear { - @Take - List _CLIST; + @Peek + ArrayList _CLIST; @Take String cMember; @@ -17,8 +19,6 @@ @Override protected void run(CodeGearManager cgm) { _CLIST.add(cMember); - getLocalDGM().put("_CLIST", _CLIST); - } } diff -r 9922e6decbe8 -r 76b6da075ce0 src/main/java/christie/topology/node/IncomingConnectionInfo.java --- a/src/main/java/christie/topology/node/IncomingConnectionInfo.java Fri Aug 24 11:12:20 2018 +0900 +++ b/src/main/java/christie/topology/node/IncomingConnectionInfo.java Tue Aug 28 09:45:53 2018 +0900 @@ -2,6 +2,7 @@ import christie.annotation.Take; +import christie.annotation.TakeFrom; import christie.codegear.CodeGear; import christie.codegear.CodeGearManager; import christie.topology.HostMessage; @@ -9,7 +10,7 @@ public class IncomingConnectionInfo extends CodeGear { - @Take + @TakeFrom("manager") HostMessage hostInfo; private String absName; @@ -21,8 +22,7 @@ this.absName = absName; this.count = count; this.managerKey = managerKey; - // hostInfo.setKey(managerKey,absName); - + //hostInfo.setKey(managerKey,absName); } diff -r 9922e6decbe8 -r 76b6da075ce0 src/main/java/christie/topology/node/PrepareToClose.java --- a/src/main/java/christie/topology/node/PrepareToClose.java Fri Aug 24 11:12:20 2018 +0900 +++ b/src/main/java/christie/topology/node/PrepareToClose.java Tue Aug 28 09:45:53 2018 +0900 @@ -13,7 +13,7 @@ @Peek String _CLOSEMESSEAGE; - @Take + @Peek List _CLIST; @@ -39,7 +39,7 @@ new ReceiveCloseMessage(CommandType.TAKE); }*/ cgm.setup(new PrepareToClose()); - getLocalDGM().put("_CLIST", _CLIST); + //getLocalDGM().put("_CLIST", _CLIST); }