Skip to content

Fix: treat DBConnector timeout=0 as infinite timeout #408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 1 commit into from
Nov 4, 2020
Merged

Fix: treat DBConnector timeout=0 as infinite timeout #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 37 additions & 30 deletions common/dbconnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,39 +402,40 @@ RedisContext::RedisContext(const RedisContext &other)
const char *unixPath = octx->unix_sock.path;
if (unixPath)
{
initContext(unixPath, *octx->timeout);
initContext(unixPath, octx->timeout);
}
else
{
initContext(octx->tcp.host, octx->tcp.port, *octx->timeout);
initContext(octx->tcp.host, octx->tcp.port, octx->timeout);
}
}

RedisContext::RedisContext(const string& hostname, int port,
unsigned int timeout)
{
struct timeval tv = {0, (suseconds_t)timeout * 1000};
initContext(hostname.c_str(), port, tv);
}

RedisContext::RedisContext(const string& unixPath, unsigned int timeout)
{
struct timeval tv = {0, (suseconds_t)timeout * 1000};
initContext(unixPath.c_str(), tv);
}

void RedisContext::initContext(const char *host, int port, const timeval& tv)
void RedisContext::initContext(const char *host, int port, const timeval *tv)
{
m_conn = redisConnectWithTimeout(host, port, tv);
if (tv)
{
m_conn = redisConnectWithTimeout(host, port, *tv);
}
else
{
m_conn = redisConnect(host, port);
}

if (m_conn->err)
throw system_error(make_error_code(errc::address_not_available),
"Unable to connect to redis");
}

void RedisContext::initContext(const char *path, const timeval &tv)
void RedisContext::initContext(const char *path, const timeval *tv)
{
m_conn = redisConnectUnixWithTimeout(path, tv);
if (tv)
{
m_conn = redisConnectUnixWithTimeout(path, *tv);
}
else
{
m_conn = redisConnectUnix(path);
}

if (m_conn->err)
throw system_error(make_error_code(errc::address_not_available),
Expand Down Expand Up @@ -506,19 +507,25 @@ DBConnector::DBConnector(int dbId, const RedisContext& ctx)
}

DBConnector::DBConnector(int dbId, const string& hostname, int port,
unsigned int timeout) :
RedisContext(hostname, port, timeout),
m_dbId(dbId),
m_namespace(EMPTY_NAMESPACE)
unsigned int timeout)
: m_dbId(dbId)
, m_namespace(EMPTY_NAMESPACE)
{
struct timeval tv = {0, (suseconds_t)timeout * 1000};
struct timeval *ptv = timeout ? &tv : NULL;
initContext(hostname.c_str(), port, ptv);

select(this);
}

DBConnector::DBConnector(int dbId, const string& unixPath, unsigned int timeout) :
RedisContext(unixPath, timeout),
m_dbId(dbId),
m_namespace(EMPTY_NAMESPACE)
DBConnector::DBConnector(int dbId, const string& unixPath, unsigned int timeout)
: m_dbId(dbId)
, m_namespace(EMPTY_NAMESPACE)
{
struct timeval tv = {0, (suseconds_t)timeout * 1000};
struct timeval *ptv = timeout ? &tv : NULL;
initContext(unixPath.c_str(), ptv);

select(this);
}

Expand All @@ -528,14 +535,14 @@ DBConnector::DBConnector(const string& dbName, unsigned int timeout, bool isTcpC
, m_namespace(netns)
{
struct timeval tv = {0, (suseconds_t)timeout * 1000};

struct timeval *ptv = timeout ? &tv : NULL;
if (isTcpConn)
{
initContext(SonicDBConfig::getDbHostname(dbName, netns).c_str(), SonicDBConfig::getDbPort(dbName, netns), tv);
initContext(SonicDBConfig::getDbHostname(dbName, netns).c_str(), SonicDBConfig::getDbPort(dbName, netns), ptv);
}
else
{
initContext(SonicDBConfig::getDbSock(dbName, netns).c_str(), tv);
initContext(SonicDBConfig::getDbSock(dbName, netns).c_str(), ptv);
}

select(this);
Expand Down
6 changes: 2 additions & 4 deletions common/dbconnector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ class RedisContext
* Timeout - The time in milisecond until exception is been thrown. For
* infinite wait, set this value to 0
*/
RedisContext(const std::string &hostname, int port, unsigned int timeout);
RedisContext(const std::string &unixPath, unsigned int timeout);
RedisContext(const RedisContext &other);
RedisContext& operator=(const RedisContext&) = delete;

Expand All @@ -101,8 +99,8 @@ class RedisContext

protected:
RedisContext();
void initContext(const char *host, int port, const timeval& tv);
void initContext(const char *path, const timeval &tv);
void initContext(const char *host, int port, const timeval *tv);
void initContext(const char *path, const timeval *tv);
void setContext(redisContext *ctx);

private:
Expand Down