diff --git a/conf/sentinel.conf b/conf/sentinel.conf index f50c24b..207f9b2 100644 --- a/conf/sentinel.conf +++ b/conf/sentinel.conf @@ -40,9 +40,9 @@ # ServerRetryTimeout 1 # KeepAlive 120 # Sentinels { -# + 10.2.2.2 -# + 10.2.2.3 -# + 10.2.2.4 +# + 10.2.2.2:7500 +# + 10.2.2.3:7500 +# + 10.2.2.4:7500 # } # Group shard001 { # } diff --git a/src/ConnectConnectionPool.cpp b/src/ConnectConnectionPool.cpp index 1430a1f..e4ea3e1 100644 --- a/src/ConnectConnectionPool.cpp +++ b/src/ConnectConnectionPool.cpp @@ -53,11 +53,10 @@ ConnectConnection* ConnectConnectionPool::getShareConnection(int db) c->close(mHandler); return nullptr; } - if (mServ->fail() || c->isConnecting()) { + if (mServ->fail()) { return nullptr; } return c; - return mServ->fail() ? nullptr : c; } ConnectConnection* ConnectConnectionPool::getPrivateConnection(int db)