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 <bhubbard@redhat.com>
(cherry picked from commit 4dd67b9e3cb1a4168f6804b144e4178f2b821108)

diff --git a/src/common/admin_socket_client.cc b/src/common/admin_socket_client.cc
index 9886bba6c06d7d7683aa6f90628c38b4e593dc5b..136573ac647f3fc2194738af478045ece8be0222 100644 (file)
--- 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;