# HG changeset patch # User Nozomi Teruya # Date 1516001278 -32400 # Node ID 186a86dc4c8a58d797d0c5034bdf6b5a6399ee4d # Parent 4e867538adb75af60b4f3c15299cb2c8658e00a1 working RemotePutTest by 2 node diff -r 4e867538adb7 -r 186a86dc4c8a src/main/java/christie/codegear/CodeGearManager.java --- a/src/main/java/christie/codegear/CodeGearManager.java Sun Jan 14 23:33:46 2018 +0900 +++ b/src/main/java/christie/codegear/CodeGearManager.java Mon Jan 15 16:27:58 2018 +0900 @@ -21,7 +21,7 @@ private LocalDataGearManager localDGM = new LocalDataGearManager(); private ConcurrentHashMap acceptHash = new ConcurrentHashMap(); public String cgmName; - public Config conf; + public Config conf;//ToDo: make daemon from config public CodeGearManager(String cgmName, ThreadPoolExecutor exe, ConcurrentHashMap cgms, int localPort) { dataGearManagers.put("local", localDGM); diff -r 4e867538adb7 -r 186a86dc4c8a src/main/java/christie/codegear/Command.java --- a/src/main/java/christie/codegear/Command.java Sun Jan 14 23:33:46 2018 +0900 +++ b/src/main/java/christie/codegear/Command.java Mon Jan 15 16:27:58 2018 +0900 @@ -15,7 +15,7 @@ public String key; public CommandType type; public Class clazz = null; - private static final MessagePack packer = new MessagePack(); + private MessagePack packer = new MessagePack(); //for put public Command(DataGear dg, String cgmName, String dsmName, String key, CommandType type, Class clazz){ diff -r 4e867538adb7 -r 186a86dc4c8a src/main/java/christie/daemon/IncomingTcpConnection.java --- a/src/main/java/christie/daemon/IncomingTcpConnection.java Sun Jan 14 23:33:46 2018 +0900 +++ b/src/main/java/christie/daemon/IncomingTcpConnection.java Mon Jan 15 16:27:58 2018 +0900 @@ -18,7 +18,7 @@ ConcurrentHashMap cgms; Connection connection; - private static final MessagePack packer = new MessagePack(); + private MessagePack packer = new MessagePack(); public IncomingTcpConnection(Connection connection, CodeGearManager cgm) { this.cgms = cgm.getCgms(); diff -r 4e867538adb7 -r 186a86dc4c8a src/main/java/christie/test/Remote/StartRemoteTest.java --- a/src/main/java/christie/test/Remote/StartRemoteTest.java Sun Jan 14 23:33:46 2018 +0900 +++ b/src/main/java/christie/test/Remote/StartRemoteTest.java Mon Jan 15 16:27:58 2018 +0900 @@ -13,7 +13,7 @@ CodeGearManager cgm = createCGM("first", 10000); new StartRemoteTest(cgm); - cgm.createRemoteDGM("remote", "localhost", 10001); + cgm.createRemoteDGM("remote", "localhost", 10001);//CS生成とremoteを立てる順番の依存性について cgm.setup(new CreateRemotePutTest( "second")); CodeGearManager cgm2 = createCGM("second", 10001);