Mercurial > hg > Database > Christie
changeset 16:186a86dc4c8a
working RemotePutTest by 2 node
| author | Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 15 Jan 2018 16:27:58 +0900 |
| parents | 4e867538adb7 |
| children | 59fabebb67d8 |
| files | src/main/java/christie/codegear/CodeGearManager.java src/main/java/christie/codegear/Command.java src/main/java/christie/daemon/IncomingTcpConnection.java src/main/java/christie/test/Remote/StartRemoteTest.java |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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<String, IncomingTcpConnection> acceptHash = new ConcurrentHashMap<String, IncomingTcpConnection>(); public String cgmName; - public Config conf; + public Config conf;//ToDo: make daemon from config public CodeGearManager(String cgmName, ThreadPoolExecutor exe, ConcurrentHashMap<String, CodeGearManager> cgms, int localPort) { dataGearManagers.put("local", localDGM);
--- 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){
--- 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<String, CodeGearManager> 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();
--- 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);