From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 14 Dec 2011 17:52:51 +0000 (-0500)
Subject: Unix CM: reset blacklist on hard-mount retry
X-Git-Tag: upstream/1.6.1.pre4^2~77
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bd5acb7f79f9b3b1ab03521e0a90a13137863ca3;p=packages%2Fo%2Fopenafs.git

Unix CM: reset blacklist on hard-mount retry

Reset black-listed servers on a request when retrying due to a
hard-mount retry. When hard-mounts are in effect, a request may
retry indefinitely. If all the servers have been black-listed
due to a transient error, the request may never complete.

Reviewed-on: http://gerrit.openafs.org/6330
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit faa58c9f60a158481bdfee27e175a37c5fcd64aa)

Change-Id: I1ecc3fa78c064c46849dec47c77f2fc405f2ee7f
Reviewed-on: http://gerrit.openafs.org/6641
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Derrick Brashear <shadow@dementix.org>
---

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index 379d4258b..b022d95c4 100644
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -504,6 +504,8 @@ afs_Analyze(struct afs_conn *aconn, struct rx_connection *rxconn,
 
 			VSleep(hm_retry_int);
 			afs_CheckServers(1, cellp);
+			/* clear the black listed servers on this request. */
+			memset(areq->skipserver, 0, sizeof(areq->skipserver));
 
 			if (vp_vhm) {
 			    tvp = afs_FindVolume(afid, READ_LOCK);