support: Set proper retransmit timeout for datagram transports

Instead of setting the total timeout and the retransmit timeout to the
same value for datagram transports, use a 1 second retransmit timeout,
so we actually get a retransmit or two before failing.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/nfs/rpc_socket.c b/support/nfs/rpc_socket.c
index a2255c304114ead58c975d884e203e62c88b1301..ac4e6d81c68849244e86d231155fbadbe805ca1d 100644 (file)
--- a/support/nfs/rpc_socket.c
+++ b/support/nfs/rpc_socket.c
@@ -326,7 +326,9 @@ static CLIENT *nfs_get_udpclient(const struct sockaddr *sap,
                                        version, *timeout, &sock);
 #endif /* !HAVE_LIBTIRPC */
        if (client != NULL) {
                                        version, *timeout, &sock);
 #endif /* !HAVE_LIBTIRPC */
        if (client != NULL) {

-               CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT, (char *)timeout);
+               struct timeval retry_timeout = { 1, 0 };
+               CLNT_CONTROL(client, CLSET_RETRY_TIMEOUT,
+                                               (char *)&retry_timeout);

                CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);
        } else
                (void)close(sock);
                CLNT_CONTROL(client, CLSET_FD_CLOSE, NULL);
        } else
                (void)close(sock);