Fix jubagraph cannot start with ZK: fixes #179

Before refactoring mixed bug which cause not to prepare ZK.
Fix to call server_helper_impl::prepare_for_start before *_serv constructor.

src/framework/server_helper.cpp

@@ -49,7 +49,7 @@ server_helper_impl::server_helper_impl(const server_argv& a) {
 #endif
 }
 
-bool server_helper_impl::prepare_for_start(const server_argv& a, bool use_cht) {
+void server_helper_impl::prepare_for_start(const server_argv& a, bool use_cht) {
 #ifdef HAVE_ZOOKEEPER_H
   if (!a.is_standalone()) {
     ls = zk_;
@@ -67,10 +67,8 @@ bool server_helper_impl::prepare_for_start(const server_argv& a, bool use_cht) {
     }
 
     register_actor(*zk_, a.type, a.name, a.eth, a.port);
-    return true;
   }
 #endif
-  return false;
 }
 
 }

src/framework/server_helper.hpp

@@ -35,7 +35,7 @@ namespace framework {
 class server_helper_impl {
 public:
   explicit server_helper_impl(const server_argv& a);
-  bool prepare_for_start(const server_argv& a, bool use_cht);
+  void prepare_for_start(const server_argv& a, bool use_cht);
 
   common::cshared_ptr<jubatus::common::lock_service> zk() const {
     return zk_;
@@ -50,8 +50,10 @@ class server_helper {
 public:
   typedef typename Server::status_t status_t;
 
-  explicit server_helper(const server_argv& a)
-      : impl_(a), use_cht_(false) {
+  explicit server_helper(const server_argv& a, bool use_cht = false)
+      : impl_(a), use_cht_(use_cht) {
+
+    impl_.prepare_for_start(a, use_cht);
     server_.reset(new Server(a, impl_.zk()));
   }
 
@@ -100,13 +102,10 @@ class server_helper {
     return status;
   }
 
-  void use_cht() {
-    use_cht_ = true;
-  }
-
   int start(pfi::network::mprpc::rpc_server& serv) {
     const server_argv& a = server_->argv();
-    if (impl_.prepare_for_start(a, use_cht_)) {
+
+    if (!a.is_standalone()) {
       server_->get_mixer()->start();
     }
 
@@ -127,9 +126,10 @@ class server_helper {
   }
 
 private:
+
   common::cshared_ptr<Server> server_;
   server_helper_impl impl_;
-  bool use_cht_;
+  const bool use_cht_;
 };
 
 }

src/server/graph_impl.cpp

@@ -19,8 +19,8 @@ class graph_impl_ : public graph<graph_impl_>
 public:
   graph_impl_(const server_argv& a):
     graph<graph_impl_>(a.timeout),
-    p_(new server_helper<graph_serv>(a))
-  { p_->use_cht();}
+    p_(new server_helper<graph_serv>(a, true))
+  {}
 
   std::string create_node(std::string name) //nolock random
   { NOLOCK__(p_); RETURN_OR_THROW(get_p()->create_node()); }

src/server/recommender_impl.cpp

@@ -19,8 +19,8 @@ class recommender_impl_ : public recommender<recommender_impl_>
 public:
   recommender_impl_(const server_argv& a):
     recommender<recommender_impl_>(a.timeout),
-    p_(new server_helper<recommender_serv>(a))
-  { p_->use_cht();}
+    p_(new server_helper<recommender_serv>(a, true))
+  {}
 
   bool set_config(std::string name, config_data c) //update broadcast
   { JWLOCK__(p_); RETURN_OR_THROW(get_p()->set_config(c)); }

src/server/stat_impl.cpp

@@ -19,8 +19,8 @@ class stat_impl_ : public stat<stat_impl_>
 public:
   stat_impl_(const server_argv& a):
     stat<stat_impl_>(a.timeout),
-    p_(new server_helper<stat_serv>(a))
-  { p_->use_cht();}
+    p_(new server_helper<stat_serv>(a, true))
+  {}
 
   bool set_config(std::string name, config_data c) //update broadcast
   { JWLOCK__(p_); RETURN_OR_THROW(get_p()->set_config(c)); }

tools/generator/impl_generator.ml

@@ -84,33 +84,33 @@ let generate s output strees =
 
   output <<< "namespace jubatus { namespace server {";
 (*  output <<< "using "^s#basename^"::server::"^s#basename^";"; no way!! *)
-  output <<< ("class "^s#basename^"_impl_ : public "^s#basename^"<"^s#basename^"_impl_>");
-  output <<< "{";
-  output <<< "public:";
-  output <<< ("  "^s#basename^"_impl_(const server_argv& a):");
-  output <<< ("    "^s#basename^"<"^s#basename^"_impl_>(a.timeout),");
-  output <<< ("    p_(new server_helper<"^s#basename^"_serv>(a))");
-
-
 
   let use_cht =
     let include_cht_api = function
       | Service(_, methods) ->
-	let has_cht (Method(_,_,_,decs)) =
-	  let rec has_cht_ = function
-	    | [] -> false;
-	    | Routing(Cht(_))::_ -> true;
-	    | _::tl -> has_cht_ tl
-	  in
-	  has_cht_ decs
-	in
-	List.exists has_cht methods;
+  let has_cht (Method(_,_,_,decs)) =
+    let rec has_cht_ = function
+      | [] -> false;
+      | Routing(Cht(_))::_ -> true;
+      | _::tl -> has_cht_ tl
+    in
+    has_cht_ decs
+  in
+  List.exists has_cht methods;
       | _ -> false
     in
-    if List.exists include_cht_api strees then " p_->use_cht();"
+    if List.exists include_cht_api strees then ", true"
     else ""
   in
-  output <<< ("  {" ^ use_cht ^ "}");
+  output <<< ("class "^s#basename^"_impl_ : public "^s#basename^"<"^s#basename^"_impl_>");
+  output <<< "{";
+  output <<< "public:";
+  output <<< ("  "^s#basename^"_impl_(const server_argv& a):");
+  output <<< ("    "^s#basename^"<"^s#basename^"_impl_>(a.timeout),");
+  output <<< ("    p_(new server_helper<"^s#basename^"_serv>(a" ^ use_cht ^ "))");
+  output <<< ("  {}");
+
+
 
   List.iter (fun l -> output <<< l)
     (List.flatten (List.map to_impl_strings