Mercurial > hg > Database > Alice

changeset 558:0259a8aba18c dispose

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add ip to HostMessage.class, delete System.out in ReceiveData, some TopM class change using ip connection
author Nozomi Teruya <e125769@ie.u-ryukyu.ac.jp>
date Sat, 21 Nov 2015 18:23:51 +0900
parents 1a860019b2fe
children 1c7732a88920
files src/main/java/alice/datasegment/DataSegment.java src/main/java/alice/test/codesegment/remote/TestRemoteAlice.java src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java src/main/java/alice/topology/HostMessage.java src/main/java/alice/topology/manager/CreateTreeTopology.java src/main/java/alice/topology/manager/IncomingHosts.java src/main/java/alice/topology/node/StartTopologyNode.java src/main/java/alice/topology/node/TopologyNodeConfig.java
diffstat 8 files changed, 33 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/alice/datasegment/DataSegment.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/datasegment/DataSegment.java	Sat Nov 21 18:23:51 2015 +0900
@@ -1,6 +1,7 @@
 package alice.datasegment;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.concurrent.ConcurrentHashMap;
 
 import alice.daemon.IncomingTcpConnection;
@@ -40,12 +41,20 @@
         dataSegment.dataSegmentManagers.put(key, manager);
     }
 
-    public static RemoteDataSegmentManager connect(String connectionKey, String reverseKey, InetAddress ip, int port) {
+    public static RemoteDataSegmentManager connect(String connectionKey, String reverseKey, String ip, int port) {
         if (connectionKey.startsWith("compressed")){//compressedが含まれていたらエラーを返して終了
             System.out.println("You can't use 'compressed' for DataSegmentManager name.");
             System.exit(0);
         }
-        RemoteDataSegmentManager manager = new RemoteDataSegmentManager(connectionKey, reverseKey, ip, port);
+
+        InetAddress ipAddress = null;
+        try {
+            ipAddress = InetAddress.getByName(ip);
+        } catch (UnknownHostException e) {
+            e.printStackTrace();
+        }
+
+        RemoteDataSegmentManager manager = new RemoteDataSegmentManager(connectionKey, reverseKey, ipAddress, port);
         CompressedRemoteDataSegmentManager compressedManager = new CompressedRemoteDataSegmentManager(manager);
 
         register(connectionKey, manager);
--- a/src/main/java/alice/test/codesegment/remote/TestRemoteAlice.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/test/codesegment/remote/TestRemoteAlice.java	Sat Nov 21 18:23:51 2015 +0900
@@ -9,7 +9,7 @@
         TestRemoteConfig conf = new TestRemoteConfig(args);//トポロジー設定をコマンドライン引数からとって設定？
 
         new AliceDaemon(conf).listen();//構成開始？TopMはない
-        DataSegment.connect(conf.key, "", conf.getIP(), conf.connectPort);
+        DataSegment.connect(conf.key, "", conf.ip, conf.connectPort);
         new RemoteStartCodeSegment().execute();
     }
 
--- a/src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/test/codesegment/remote/TestRemoteConfig.java	Sat Nov 21 18:23:51 2015 +0900
@@ -8,7 +8,7 @@
 public class TestRemoteConfig extends Config {
 
     public String hostname;
-    private InetAddress ip;
+    public String ip;
     public int connectPort = 10000;
     public String key;
 
@@ -18,11 +18,7 @@
             if ("-h".equals(args[i])) {
                 hostname = args[++i];
             } else if ("-ip".equals(args[i])) {
-                try {
-                    ip = InetAddress.getByName(args[++i]);
-                } catch (UnknownHostException e) {
-                    e.printStackTrace();
-                }
+                ip = args[++i];
             } else if ("-cp".equals(args[i])) {
                 connectPort = Integer.parseInt(args[++i]);
             } else if ("-key".equals(args[i])) {
@@ -31,15 +27,4 @@
         }
     }
 
-    public InetAddress getIP(){
-        if (ip == null){
-            try {
-                ip = InetAddress.getByName(hostname);
-            } catch (UnknownHostException e) {
-                e.printStackTrace();
-            }
-        }
-        return ip;
-    }
-
 }
--- a/src/main/java/alice/topology/HostMessage.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/topology/HostMessage.java	Sat Nov 21 18:23:51 2015 +0900
@@ -9,7 +9,7 @@
 public class HostMessage {
     public String name;
     public int port;
-    public InetAddress ip;
+    public String ip;
 
     public String connectionName;
     public String absName; // this is absName which have these IP and port.
@@ -21,21 +21,18 @@
     public boolean alive;
 
     public HostMessage() { }
-    public HostMessage(String name, int port) {
+    public HostMessage(String name, String ip, int port) {
         this.name = name;
+        this.ip = ip;
         this.port = port;
     }
 
-    public HostMessage(String name, int port, String connectionName, String reverseName) {
+    public HostMessage(String name, String ip, int port, String connectionName, String reverseName) {
         this.name = name;
+        this.ip = ip;
         this.port = port;
         this.connectionName = connectionName;
         this.reverseName = reverseName;
-        try {
-            this.ip = InetAddress.getByName(name);
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
     }
 
     public boolean isAlive() {
--- a/src/main/java/alice/topology/manager/CreateTreeTopology.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/topology/manager/CreateTreeTopology.java	Sat Nov 21 18:23:51 2015 +0900
@@ -60,7 +60,7 @@
             HostMessage parent = nameTable.get(parentAbsName);
             int num = manager.getMyNumber();
 
-            HostMessage newHost = new HostMessage(parent.name, parent.port, "parent", "child"+num);
+            HostMessage newHost = new HostMessage(parent.name, parent.ip, parent.port, "parent", "child"+num);
             newHost.absName = parentAbsName;
             newHost.remoteAbsName = nodeName; // address
             ods.put(newHost.remoteAbsName, newHost);
@@ -69,7 +69,7 @@
             new RecodeTopology();
 
             // put own information parent
-            newHost = new HostMessage(host.name, host.port, "child"+num, "parent");
+            newHost = new HostMessage(host.name, parent.ip, host.port, "child"+num, "parent");
             newHost.absName = nodeName;
             newHost.remoteAbsName = parentAbsName;
 
--- a/src/main/java/alice/topology/manager/IncomingHosts.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/topology/manager/IncomingHosts.java	Sat Nov 21 18:23:51 2015 +0900
@@ -53,7 +53,7 @@
 
         LinkedList<NodeInfo> nodes = topology.get(nodeName);
         for (NodeInfo nodeInfo : nodes) {
-            HostMessage newHost = new HostMessage(host.name, host.port,
+            HostMessage newHost = new HostMessage(host.name, host.ip, host.port,
                     nodeInfo.connectionName, nodeInfo.reverseName);
             newHost.absName = nodeName;
             newHost.remoteAbsName = nodeInfo.sourceNodeName;
--- a/src/main/java/alice/topology/node/StartTopologyNode.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/topology/node/StartTopologyNode.java	Sat Nov 21 18:23:51 2015 +0900
@@ -22,14 +22,16 @@
     public void run() {
         DataSegment.connect("manager", "manager", conf.getManagerHostIP(), conf.getManagerPort());
         String localHostName = null;
+        String localIP = null;
         try {
             localHostName = InetAddress.getLocalHost().getHostName();
+            localIP = InetAddress.getLocalHost().getHostAddress();
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }
         new SaveCookie();
 
-        HostMessage host = new HostMessage(localHostName, conf.localPort);
+        HostMessage host = new HostMessage(localHostName,localIP, conf.localPort);
         host.cookie = conf.cookie;
         ods.put("manager", "host", host);
 
--- a/src/main/java/alice/topology/node/TopologyNodeConfig.java	Fri Nov 20 17:57:55 2015 +0900
+++ b/src/main/java/alice/topology/node/TopologyNodeConfig.java	Sat Nov 21 18:23:51 2015 +0900
@@ -8,7 +8,7 @@
 public class TopologyNodeConfig extends Config {
 
     private String managerHostName;
-    private InetAddress managerHostIP;
+    private String managerHostIP;
     private int managerPort = 10000;
     public String cookie;
     private ArrayList<Class> eventList = new ArrayList<Class>();
@@ -24,29 +24,18 @@
             } else if ("-cookie".equals(args[i])) {
                 cookie = args[++i];
             } else if ("-ip".equals(args[i])){
-                setManagerHostIP(args[++i]);
+                managerHostIP = args[++i];
             }
         }
     }
 
-    public void setManagerHostIP(String args) {
-        try {
-            managerHostIP = InetAddress.getByName(args);
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
-    }
+   public String getManagerHostIP(){
+       return managerHostIP;
+   }
 
-    public InetAddress getManagerHostIP(){
-        if (managerHostIP == null){
-            try {
-                managerHostIP = InetAddress.getByName(getManagerHostName());
-            } catch (UnknownHostException e) {
-                e.printStackTrace();
-            }
-        }
-        return managerHostIP;
-    }
+   public void setManagerHostIP(String ip){
+       this.managerHostIP = ip;
+   }
 
     public String getManagerHostName() {
         return managerHostName;