Reduce showmount timeouts.

Showmount itself tries to use a short timeout but
the RPC clnttcp_create and clntudp_create calls will call portmap
internally to get the port to use if it is set to 0 in the passed
address structure. The above calls then use the internal timeouts,
 basically 60 seconds, which slows things down. Also the for tcp a
blocking connect is used which can take quite a while to timeout as
well.

showmount tries tcp then udp so a fail can go through several lengthy
waits before failing.

I've grabbed some of the autofs code and put together a patch to allow
specification of the timeouts for the portmap getport and to implement a
non-blocking connect.

Signed-off-by: Neil Brown <neilb@suse.de>

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 8fb58a2c2e1c13c6936a8cdfea9b64b785d56ece..9979621e3c3a26d4cbcd2e994cfb3c71b0a8ece2 100644 (file)
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -19,6 +19,7 @@
 
 #include <stdio.h>
 #include <rpc/rpc.h>
 
 #include <stdio.h>
 #include <rpc/rpc.h>

+#include <rpc/pmap_prot.h>

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>


@@ -27,6 +28,7 @@
 #include <unistd.h>
 #include <memory.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <memory.h>
 #include <stdlib.h>

+#include <fcntl.h>

 
 #include <netdb.h>
 #include <arpa/inet.h>
 
 #include <netdb.h>
 #include <arpa/inet.h>


@@ -35,6 +37,10 @@
 #include <mount.h>
 #include <unistd.h>
 
 #include <mount.h>
 #include <unistd.h>
 

+#define TIMEOUT_UDP    3
+#define TIMEOUT_TCP    10
+#define TOTAL_TIMEOUT  20
+

 static char *  version = "showmount for " VERSION;
 static char *  program_name;
 static int     headers = 1;
 static char *  version = "showmount for " VERSION;
 static char *  program_name;
 static int     headers = 1;


@@ -73,6 +79,173 @@ int n;
        exit(n);
 }
 
        exit(n);
 }
 

+/*
+ *  Perform a non-blocking connect on the socket fd.
+ *
+ *  tout contains the timeout.  It will be modified to contain the time
+ *  remaining (i.e. time provided - time elasped).
+ */
+static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout)
+{
+       int flags, ret;
+       socklen_t len;
+       fd_set rset;
+
+       flags = fcntl(fd, F_GETFL, 0);
+       if (flags < 0)
+               return -1;
+
+       ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+       if (ret < 0)
+               return -1;
+
+       /*
+        * From here on subsequent sys calls could change errno so
+        * we set ret = -errno to capture it in case we decide to
+        * use it later.
+        */
+       len = sizeof(struct sockaddr);
+       ret = connect(fd, (struct sockaddr *)addr, len);
+       if (ret < 0 && errno != EINPROGRESS) {
+               ret = -errno;
+               goto done;
+       }
+
+       if (ret == 0)
+               goto done;
+
+       /* now wait */
+       FD_ZERO(&rset);
+       FD_SET(fd, &rset);
+
+       ret = select(fd + 1, &rset, NULL, NULL, tout);
+       if (ret <= 0) {
+               if (ret == 0)
+                       ret = -ETIMEDOUT;
+               else
+                       ret = -errno;
+               goto done;
+       }
+
+       if (FD_ISSET(fd, &rset)) {
+               int status;
+
+               len = sizeof(ret);
+               status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &ret, &len);
+               if (status < 0) {
+                       ret = -errno;
+                       goto done;
+               }
+
+               /* Oops - something wrong with connect */
+               if (ret)
+                       ret = -ret;
+       }
+
+done:
+       fcntl(fd, F_SETFL, flags);
+       return ret;
+}
+
+static unsigned short getport(struct sockaddr_in *addr,
+                        unsigned long prog, unsigned long vers, int prot)
+{
+       CLIENT *client;
+       enum clnt_stat status;
+       struct pmap parms;
+       int ret, sock;
+       struct sockaddr_in laddr, saddr;
+       struct timeval tout = {0, 0};
+       socklen_t len;
+       unsigned int send_sz = 0;
+       unsigned int recv_sz = 0;
+       unsigned short port;
+
+       memset(&laddr, 0, sizeof(laddr));
+       memset(&saddr, 0, sizeof(saddr));
+       memset(&parms, 0, sizeof(parms));
+
+       memcpy(&saddr, addr, sizeof(saddr));
+       saddr.sin_port = htons(PMAPPORT);
+
+       if (prot == IPPROTO_TCP) {
+               sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+               if (sock == -1) {
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       return 0;
+               }
+
+               tout.tv_sec = TIMEOUT_TCP;
+
+               ret = connect_nb(sock, &saddr, &tout);
+               if (ret == -1) {
+                       close(sock);
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       return 0;
+               }
+       } else {
+               /*
+                * bind to any unused port.  If we left this up to the rpc
+                * layer, it would bind to a reserved port, which has been shown
+                * to exhaust the reserved port range in some situations.
+                */
+               sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+               if (sock == -1) {
+                       rpc_createerr.cf_stat = RPC_SYSTEMERROR;
+                       rpc_createerr.cf_error.re_errno = errno;
+                       return 0;
+               }
+
+               laddr.sin_family = AF_INET;
+               laddr.sin_port = 0;
+               laddr.sin_addr.s_addr = htonl(INADDR_ANY);
+
+               tout.tv_sec = TIMEOUT_UDP;
+
+               send_sz = RPCSMALLMSGSIZE;
+               recv_sz = RPCSMALLMSGSIZE;
+
+               len = sizeof(struct sockaddr_in);
+               if (bind(sock, (struct sockaddr *)&laddr, len) < 0) {
+                       close(sock);
+                       sock = RPC_ANYSOCK;
+                       /* FALLTHROUGH */
+               }
+       }
+
+       client = clntudp_bufcreate(&saddr, PMAPPROG, PMAPVERS,
+                                  tout, &sock, send_sz, recv_sz);
+       if (!client) {
+               close(sock);
+               rpc_createerr.cf_stat = RPC_RPCBFAILURE;
+               return 0;
+       }
+
+       clnt_control(client, CLSET_FD_CLOSE, NULL);
+
+       parms.pm_prog = prog;
+       parms.pm_vers = vers;
+       parms.pm_prot = prot;
+
+       status = clnt_call(client, PMAPPROC_GETPORT,
+                          (xdrproc_t) xdr_pmap, (caddr_t) &parms,
+                          (xdrproc_t) xdr_u_short, (caddr_t) &port,
+                          tout);
+
+       if (status != RPC_SUCCESS) {
+               clnt_geterr(client, &rpc_createerr.cf_error);
+               rpc_createerr.cf_stat = status;
+               clnt_destroy(client);
+               return 0;
+       }
+
+       clnt_destroy(client);
+
+       return htons(port);
+}
+

 int main(argc, argv)
 int argc;
 char **argv;
 int main(argc, argv)
 int argc;
 char **argv;


@@ -82,7 +255,7 @@ char **argv;
        enum clnt_stat clnt_stat;
        struct hostent *hp;
        struct sockaddr_in server_addr;
        enum clnt_stat clnt_stat;
        struct hostent *hp;
        struct sockaddr_in server_addr;

-       int msock;
+       int ret, msock;

        struct timeval total_timeout;
        struct timeval pertry_timeout;
        int c;
        struct timeval total_timeout;
        struct timeval pertry_timeout;
        int c;


@@ -171,13 +344,32 @@ char **argv;
 
        /* create mount deamon client */
 
 
        /* create mount deamon client */
 

-       server_addr.sin_port = 0;
-       msock = RPC_ANYSOCK;
-       if ((mclient = clnttcp_create(&server_addr,
-           MOUNTPROG, MOUNTVERS, &msock, 0, 0)) == NULL) {
-               server_addr.sin_port = 0;
+       mclient = NULL;
+       msock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+       if (msock != -1) {
+               server_addr.sin_port = getport(&server_addr,
+                                        MOUNTPROG, MOUNTVERS, IPPROTO_TCP);
+               if (server_addr.sin_port) {
+                       ret = connect_nb(msock, &server_addr, 0);
+                       if (ret != -1)
+                               mclient = clnttcp_create(&server_addr,
+                                               MOUNTPROG, MOUNTVERS, &msock,
+                                               0, 0);
+                       else
+                               close(msock);
+               } else
+                       close(msock);
+       }
+
+       if (!mclient) {
+               server_addr.sin_port = getport(&server_addr,
+                                        MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
+               if (!server_addr.sin_port) {
+                       clnt_pcreateerror("portmap getport");
+                       exit(1);
+               }

                msock = RPC_ANYSOCK;
                msock = RPC_ANYSOCK;

-               pertry_timeout.tv_sec = 3;
+               pertry_timeout.tv_sec = TIMEOUT_UDP;

                pertry_timeout.tv_usec = 0;
                if ((mclient = clntudp_create(&server_addr,
                    MOUNTPROG, MOUNTVERS, pertry_timeout, &msock)) == NULL) {
                pertry_timeout.tv_usec = 0;
                if ((mclient = clntudp_create(&server_addr,
                    MOUNTPROG, MOUNTVERS, pertry_timeout, &msock)) == NULL) {


@@ -186,11 +378,12 @@ char **argv;
                }
        }
        mclient->cl_auth = authunix_create_default();
                }
        }
        mclient->cl_auth = authunix_create_default();

-       total_timeout.tv_sec = 20;
+       total_timeout.tv_sec = TOTAL_TIMEOUT;

        total_timeout.tv_usec = 0;
 
        if (eflag) {
                memset(&exportlist, '\0', sizeof(exportlist));
        total_timeout.tv_usec = 0;
 
        if (eflag) {
                memset(&exportlist, '\0', sizeof(exportlist));

+

                clnt_stat = clnt_call(mclient, MOUNTPROC_EXPORT,
                        (xdrproc_t) xdr_void, NULL,
                        (xdrproc_t) xdr_exports, (caddr_t) &exportlist,
                clnt_stat = clnt_call(mclient, MOUNTPROC_EXPORT,
                        (xdrproc_t) xdr_void, NULL,
                        (xdrproc_t) xdr_exports, (caddr_t) &exportlist,