This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new 122770d Remove desc. on default values of connection_timeout_ms from
docs
122770d is described below
commit 122770d377eddfc37130c02f6f3a9c2910956918
Author: jamesge <[email protected]>
AuthorDate: Fri Aug 9 05:44:11 2019 -0700
Remove desc. on default values of connection_timeout_ms from docs
---
docs/cn/client.md | 2 +-
docs/en/client.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/cn/client.md b/docs/cn/client.md
index 616e8e1..2e92b73 100755
--- a/docs/cn/client.md
+++ b/docs/cn/client.md
@@ -507,7 +507,7 @@ Controller的特点：
**ChannelOptions.timeout_ms**是对应Channel上所有RPC的总超时，Controller.set_timeout_ms()可修改某次RPC的值。单位毫秒，默认值1秒，最大值2^31（约24天），-1表示一直等到回复或错误。
-**ChannelOptions.connect_timeout_ms**是对应Channel上所有RPC的连接超时，单位毫秒，默认值1秒。-1表示等到连接建立或出错，此值被限制为不能超过timeout_ms。注意此超时独立于TCP的连接超时，一般来说前者小于后者，反之则可能在connect_timeout_ms未达到前由于TCP连接超时而出错。
+**ChannelOptions.connect_timeout_ms**是对应Channel上所有RPC的连接超时(单位毫秒)。-1表示等到连接建立或出错，此值被限制为不能超过timeout_ms。注意此超时独立于TCP的连接超时，一般来说前者小于后者，反之则可能在connect_timeout_ms未达到前由于TCP连接超时而出错。
注意1：brpc中的超时是deadline，超过就意味着RPC结束，超时后没有重试。其他实现可能既有单次访问的超时，也有代表deadline的超时。迁移到brpc时请仔细区分。
diff --git a/docs/en/client.md b/docs/en/client.md
index 8bd7fec..fa936aa 100644
--- a/docs/en/client.md
+++ b/docs/en/client.md
@@ -511,9 +511,9 @@ There's **no** independent thread pool for client in brpc.
All Channels and Serv
**ChannelOptions.timeout_ms** is timeout in milliseconds for all RPCs via the
Channel, Controller.set_timeout_ms() overrides value for one RPC. Default value
is 1 second, Maximum value is 2^31 (about 24 days), -1 means wait indefinitely
for response or connection error.
-**ChannelOptions.connect_timeout_ms** is timeout in milliseconds for
connecting part of all RPC via the Channel, Default value is 1 second, and -1
means no timeout for connecting. This value is limited to be never greater than
timeout_ms. Note that this timeout is different from the connection timeout in
TCP, generally this timeout is smaller otherwise establishment of the
connection may fail before this timeout due to timeout in TCP layer.
+**ChannelOptions.connect_timeout_ms** is the timeout in milliseconds for
establishing connections of RPCs over the Channel, and -1 means no deadline.
This value is limited to be not greater than timeout_ms. Note that this
connection timeout is different from the one in TCP, generally this one is
smaller.
-NOTE1: timeout_ms in brpc is **deadline**, which means once it's reached, the
RPC ends, no retries after the timeout. Other impl. may have session timeout
and deadline timeout, do distinguish them before porting to brpc.
+NOTE1: timeout_ms in brpc is **deadline**, which means once it's reached, the
RPC ends without more retries. As a comparison, other implementations may have
session timeouts and deadline timeouts. Do distinguish them before porting to
brpc.
NOTE2: error code of RPC timeout is **ERPCTIMEDOUT (1008) **, ETIMEDOUT is
connection timeout and retriable.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
