My apologies for the delayed response... I just saw this... On 11/23/2016 06:26 PM, NeilBrown wrote: > On Thu, Nov 24 2016, Steve Dickson wrote: >>> >>> So I think the current behavior is correct. You might be able to argue >>> that certain error codes should trigger a shorter timeout, but it would >>> need a strong argument. >> Going with the theory the window is very small, how about >> a retry with a timeout then a failure? > > I started looking at changing the timeout and it wouldn't be too hard > (if we can agree on a suitable delay), but I feel I must ask why this is > important. Over the last few Connectathon and bakeathons I've been floating the idea of dismantling the UDP support and nobody to objected... The main reason is to cut the testing matrix in half. I keep getting these goofy UDP bugs from our QE guys that nobody is going to fix... and I have not seen a UDP bug from a customer in years.. I really don't think it being used so why continue to support it? > In what situation are you likely to mount with the wrong protocol, that > you aren't able to just Ctrl-C when you realized what a dumb thing you > just did? I turned off the UDP support in rpc.nfsd and mounts started to hang. > > If rpcbind isn't running, which is arguably a very similar situation > (no protocols are register) we have always had a long timeout. Why is > "just one protocol not registered" any different? ECONNREFUSED can also me the server is not up so we need to wait. > > > Anyway, below is the patch I was working on. I stopped when I wasn't > sure how to handle ECONNREFUSED. I've quick took and it does look a little messy or we revert the EOPNOTSUPP commit... But at least you know my motivation. steved. > > NeilBrown > > > > diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c > index d5dfb5e4a669..084776115b9>>> I disagree with the "hang forever" description. I just tested after >>> disabling UDP on an nfs server, and the delay was 2 minutes, 5 seconds >>> before a failure was reported. It might be longer when trying TCP on a >>> server that only supports UDP. >> Yeah I did not wait that long... You are much more of a patient man than I ;-) >> I do think this is a regression. Going an from an instant failure to one >> that takes over 2min is not a good thing... IMHO. >>f 100644 > --- a/utils/mount/stropts.c > +++ b/utils/mount/stropts.c > @@ -935,24 +935,30 @@ static int nfs_try_mount(struct nfsmount_info *mi) > * failed so far, but fail immediately if there is a local > * error (like a bad mount option). > * > - * ESTALE is also a temporary error because some servers > - * return ESTALE when a share is temporarily offline. > + * If there is a remote error, like ESTALE or RPC_PROGNOTREGISTERED > + * then it is probably permanent, but there is a small chance > + * the it is temporary can we caught the server at an awkward > + * time during start-up. A shorter timeout is best for such > + * circumstances, so return a distinct status. > * > - * Returns 1 if we should fail immediately, or 0 if we > - * should retry. > + * Returns PERMANENT if we should fail immediately, > + * TEMPORARY if we should retry normally, or > + * REMOTE if we should retry with shorter timeout. > */ > -static int nfs_is_permanent_error(int error) > +enum error_type { PERMANENT, TEMPORARY, REMOTE }; > +static enum error_type nfs_error_type(int error) > { > switch (error) { > case ESTALE: > + case EOPNOTSUPP: /* aka RPC_PROGNOTREGISTERED */ > + return REMOTE; > case ETIMEDOUT: > case ECONNREFUSED: > case EHOSTUNREACH: > - case EOPNOTSUPP: /* aka RPC_PROGNOTREGISTERED */ > case EAGAIN: > - return 0; /* temporary */ > + return TEMPORARY; > default: > - return 1; /* permanent */ > + return PERMANENT; > } > } > > @@ -967,6 +973,7 @@ static int nfsmount_fg(struct nfsmount_info *mi) > { > unsigned int secs = 1; > time_t timeout; > + int last_errno = 0; > > timeout = nfs_parse_retry_option(mi->options, > NFS_DEF_FG_TIMEOUT_MINUTES); > @@ -987,13 +994,22 @@ static int nfsmount_fg(struct nfsmount_info *mi) > */ > return EX_SUCCESS; > > - if (nfs_is_permanent_error(errno)) > + switch(nfs_error_type(errno)) { > + case PERMANENT: > + timeout = 0; > break; > - > - if (time(NULL) > timeout) { > + case REMOTE: > + if (errno == last_errno) > + timeout = 0; > + break; > + case TEMPORARY: > errno = ETIMEDOUT; > break; > } > + last_errno = errno; > + > + if (time(NULL) > timeout) > + break; > > if (errno != ETIMEDOUT) { > if (sleep(secs)) > @@ -1020,7 +1036,7 @@ static int nfsmount_parent(struct nfsmount_info *mi) > if (nfs_try_mount(mi)) > return EX_SUCCESS; > > - if (nfs_is_permanent_error(errno)) { > + if (nfs_error_type(errno) == PERMANENT) { > mount_error(mi->spec, mi->node, errno); > return EX_FAIL; > } > @@ -1055,8 +1071,14 @@ static int nfsmount_child(struct nfsmount_info *mi) > if (nfs_try_mount(mi)) > return EX_SUCCESS; > > - if (nfs_is_permanent_error(errno)) > + switch (nfs_error_type(errno)) { > + case REMOTE: /* Doesn't hurt to keep trying remote errors > + * when in the background > + */ > + case PERMANENT: > + timeout = 0; > break; > + } > > if (time(NULL) > timeout) > break; > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html