make it possible to fix the setup port

amplab · Feb 7, 2016 · 880b3da · 880b3da
1 parent c042aa2
commit 880b3da
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/scripts/masterimage/Dockerfile b/scripts/masterimage/Dockerfile
@@ -32,5 +32,5 @@ ENV PYTHONPATH=/root/orchestra/lib:/root/orchestra/lib/orchpy/build/lib.linux-x8
 ENV LD_LIBRARY_PATH=/root/orchestra/target/debug/:${LD_LIBRARY_PATH}
 
 WORKDIR /root/orchestra
-CMD ["cargo", "run", "7114", "7227"]
-EXPOSE 7114 7227
+CMD ["cargo", "run", "7114", "7227", "7228"]
+EXPOSE 7114 7227 7228
diff --git a/scripts/orchestra-master-service.json b/scripts/orchestra-master-service.json
@@ -2,7 +2,7 @@
    "kind":"Service",
    "apiVersion":"v1",
    "metadata":{
-      "name":"orchestra-master",
+      "name":"orchestra-service",
       "labels":{
          "app":"orchestra",
          "role":"master"
@@ -12,15 +12,17 @@
       "clusterIP": "10.0.171.131",
       "ports": [
         {
-					"name": "incoming",
-          "port": 7114,
-          "targetPort": "orch-server"
+          "name": "incoming",
+          "port": 7114
         },
-				{
-					"name": "publish",
-					"port":7227,
-					"targetPort":"orch-server"
-				}
+        {
+          "name": "publish",
+          "port":7227
+        },
+        {
+          "name": "setup",
+          "port":7228
+        }
       ],
       "selector":{
          "app":"orchestra",

diff --git a/src/main.rs b/src/main.rs
@@ -24,14 +24,16 @@ use argparse::{ArgumentParser, Store};
 fn main() {
     let mut incoming_port = 0;
     let mut publish_port = 0;
+    let mut setup_port = 0;
     {
         let mut ap = ArgumentParser::new();
         ap.set_description("Orchestra server");
         ap.refer(&mut incoming_port).add_argument("incoming_port", Store, "port for incoming requests");
         ap.refer(&mut publish_port).add_argument("publish_port", Store, "port for message broadcasting");
+        ap.refer(&mut setup_port).add_argument("setup_port", Store, "port for setting up broadcasting");
         ap.parse_args_or_exit();
     }
     env_logger::init().unwrap();
     let mut server = server::Server::new(publish_port);
-    server.main_loop(incoming_port);
+    server.main_loop(incoming_port, setup_port);
 }
diff --git a/src/server.rs b/src/server.rs
@@ -216,12 +216,12 @@ impl<'a> Server<'a> {
   }
 
   /// Start the server's main loop.
-  pub fn main_loop<'b>(self: &'b mut Server<'a>, incoming_port: u16) {
+  pub fn main_loop<'b>(self: &'b mut Server<'a>, incoming_port: u16, setup_port: u16) {
     let mut socket = self.zmq_ctx.socket(zmq::REP).ok().unwrap();
     let localhost = IpAddr::from_str("0.0.0.0").unwrap();
     bind_socket(&mut socket, &localhost, Some(incoming_port));
     loop {
-      self.process_request(&mut socket);
+      self.process_request(&mut socket, setup_port);
     }
   }
 
@@ -315,7 +315,7 @@ impl<'a> Server<'a> {
   }
 
   /// Process request by client.
-  pub fn process_request<'b>(self: &'b mut Server<'a>, socket: &'b mut Socket) {
+  pub fn process_request<'b>(self: &'b mut Server<'a>, socket: &'b mut Socket, setup_port: u16) {
     let msg = receive_message(socket);
     match msg.get_field_type() {
       comm::MessageType::INVOKE => {