Skip to content

Commit 52fc82c

Browse files
authored
Merge pull request #291 from oceanbase/refine_login_timeout
Refine login timeout
2 parents c62ec4c + 17d1229 commit 52fc82c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/com/alipay/oceanbase/hbase/util/OHConnectionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.Properties;
2626

2727
import static com.alipay.oceanbase.hbase.constants.OHConstants.*;
28+
import static com.alipay.oceanbase.rpc.property.Property.RPC_CONNECT_TIMEOUT;
2829
import static org.apache.hadoop.hbase.client.ConnectionConfiguration.WRITE_BUFFER_PERIODIC_FLUSH_TIMEOUT_MS;
2930
import static org.apache.hadoop.hbase.client.ConnectionConfiguration.WRITE_BUFFER_PERIODIC_FLUSH_TIMEOUT_MS_DEFAULT;
3031
import static org.apache.hadoop.hbase.client.ConnectionConfiguration.WRITE_BUFFER_PERIODIC_FLUSH_TIMERTICK_MS;
@@ -99,8 +100,7 @@ public OHConnectionConfiguration(Configuration conf) {
99100
if (conf.get(SOCKET_TIMEOUT) != null) {
100101
rpcConnectTimeout = conf.getInt(SOCKET_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
101102
} else {
102-
rpcConnectTimeout = conf.getInt(SOCKET_TIMEOUT_CONNECT,
103-
DEFAULT_SOCKET_TIMEOUT_CONNECT);
103+
rpcConnectTimeout = RPC_CONNECT_TIMEOUT.getDefaultInt(); // use table default value
104104
}
105105
}
106106
this.rpcConnectTimeout = rpcConnectTimeout;

0 commit comments

Comments
 (0)