From 9e483ede12f305e8952c02307853346bfc75e9da Mon Sep 17 00:00:00 2001 From: Brad Hubbard Date: Thu, 14 Nov 2019 15:07:32 +1000 Subject: [PATCH] common/admin_socket: Increase socket timeouts With the move of the 'bench' command to the admin socket the recv timeout is being exceeded in testing due to the duration of the command. Fixes: https://tracker.ceph.com/issues/42387 Signed-off-by: Brad Hubbard (cherry picked from commit 4dd67b9e3cb1a4168f6804b144e4178f2b821108) --- src/common/admin_socket_client.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/admin_socket_client.cc b/src/common/admin_socket_client.cc index 9886bba6c06d7..136573ac647f3 100644 --- a/src/common/admin_socket_client.cc +++ b/src/common/admin_socket_client.cc @@ -70,7 +70,7 @@ static std::string asok_connect(const std::string &path, int *fd) } struct timeval timer; - timer.tv_sec = 5; + timer.tv_sec = 10; timer.tv_usec = 0; if (::setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO, &timer, sizeof(timer))) { int err = errno; @@ -80,7 +80,7 @@ static std::string asok_connect(const std::string &path, int *fd) close(socket_fd); return oss.str(); } - timer.tv_sec = 5; + timer.tv_sec = 10; timer.tv_usec = 0; if (::setsockopt(socket_fd, SOL_SOCKET, SO_SNDTIMEO, &timer, sizeof(timer))) { int err = errno; -- 2.39.5