Merge pull request baidu#180 from zd-double/opensource

Add create_with_init option in RpcChannelOptions
ydxc · Jan 20, 2017 · 029d73c · 029d73c
2 parents 636920b + 3462acc
commit 029d73c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/src/sofa/pbrpc/rpc_channel.cc b/src/sofa/pbrpc/rpc_channel.cc
@@ -16,7 +16,10 @@ RpcChannel::RpcChannel(RpcClient* rpc_client,
         const RpcChannelOptions& options)
     : _impl(new SimpleRpcChannelImpl(rpc_client->impl(), server_address, options))
 {
-    _impl->Init();
+    if (options.create_with_init)
+    {
+        _impl->Init();
+    }
 }
 
 RpcChannel::RpcChannel(RpcClient* rpc_client,
@@ -27,23 +30,37 @@ RpcChannel::RpcChannel(RpcClient* rpc_client,
     std::ostringstream os;
     os << server_ip << ":" << server_port;
     _impl.reset(new SimpleRpcChannelImpl(rpc_client->impl(), os.str(), options));
-    _impl->Init();
+    if (options.create_with_init)
+    {
+        _impl->Init();
+    }
 }
 
 RpcChannel::RpcChannel(RpcClient* rpc_client,
         const std::vector<std::string>& address_list,
         const RpcChannelOptions& options)
     : _impl(new DynamicRpcChannelImpl(rpc_client->impl(), address_list, options))
 {
-    _impl->Init();
+    if (options.create_with_init)
+    {
+        _impl->Init();
+    }
 }
 
 RpcChannel::RpcChannel(RpcClient* rpc_client,
         AddressProvider* address_provider,
         const RpcChannelOptions& options)
     : _impl(new DynamicRpcChannelImpl(rpc_client->impl(), address_provider, options))
 {
-    _impl->Init();
+    if (options.create_with_init)
+    {
+        _impl->Init();
+    }
+}
+
+bool RpcChannel::Init()
+{
+    return _impl->Init();
 }
 
 RpcChannel::~RpcChannel()

diff --git a/src/sofa/pbrpc/rpc_channel.h b/src/sofa/pbrpc/rpc_channel.h
@@ -32,9 +32,14 @@ struct RpcChannelOptions {
     // Value 0 means no limit, default value is 0.
     uint32 server_load_capacity;
 
+    // If initialize the RpcChannel in construct function, default is true.
+    // If create_with_init is false, RpcChannel should be initialized by calling Init().
+    bool create_with_init;
+
     RpcChannelOptions()
         : connect_timeout(10)
         , server_load_capacity(0)
+        , create_with_init(true)
     {}
 };
 
@@ -93,6 +98,14 @@ class RpcChannel : public google::protobuf::RpcChannel
                AddressProvider* address_provider,
                const RpcChannelOptions& options = RpcChannelOptions());
 
+    // Initialize RpcChannel.
+    // For single server point, it will resolve server address in this function,
+    // and if resolve server address succeed return true, otherwise return false.
+    // For multiple server points, it will update internal server list and
+    // register detect task. After all of these are completed return true, and
+    // never return false.
+    bool Init();
+
     // Destructor.
     virtual ~RpcChannel();