From: Andrew Deason <adeason@sinenomine.net>
Date: Thu, 29 Sep 2011 21:04:54 +0000 (-0500)
Subject: DAFS: Skip hosts with invalid flags on restore
X-Git-Tag: upstream/1.6.1.pre1^2~196
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9378144f94425df4abbe818ae93b3eb06c49b43c;p=packages%2Fo%2Fopenafs.git

DAFS: Skip hosts with invalid flags on restore

Host entries with HWHO_INPROGRESS set or ALTADDR unset do not have
valid state, since those flags indicate that the fileserver was in the
middle of identifying the host when the host struct was serialized.
Skip entries from the on-disk host data that have such invalid flags
set when restoring state, so we do not load invalid data.

Reviewed-on: http://gerrit.openafs.org/5527
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 6e7b31ef0a69b8ea39e8acc474a7aab48f828d3d)

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

diff --git a/src/tviced/serialize_state.h b/src/tviced/serialize_state.h
index 6478e714e..2a34723d4 100644
--- a/src/tviced/serialize_state.h
+++ b/src/tviced/serialize_state.h
@@ -41,6 +41,7 @@
 
 /* values for the 'valid' field in idx_map_entry_t */
 #define FS_STATE_IDX_VALID 1
+#define FS_STATE_IDX_SKIPPED 2
 
 /*
  * on-disk structures
diff --git a/src/viced/callback.c b/src/viced/callback.c
index 8e2d2ad75..40bebec69 100644
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -2460,6 +2460,12 @@ cb_stateRestoreCBs(struct fs_dump_state * state, struct FileEntry * fe,
 
     for (idx = 0; idx < niovecs; idx++) {
 	cbdsk = (struct CBDiskEntry *) iov[idx].iov_base;
+
+	if (cbdsk->cb.hhead < state->h_map.len &&
+	    state->h_map.entries[cbdsk->cb.hhead].valid == FS_STATE_IDX_SKIPPED) {
+	    continue;
+	}
+
 	if ((cb = GetCB()) == NULL) {
 	    ViceLog(0, ("cb_stateRestoreCBs: ran out of free CallBack structures\n"));
 	    ret = 1;
diff --git a/src/viced/host.c b/src/viced/host.c
index 65e54d321..a93b93bd5 100644
--- a/src/viced/host.c
+++ b/src/viced/host.c
@@ -3384,6 +3384,16 @@ h_stateRestoreHost(struct fs_dump_state * state)
 	osi_Assert(hcps != NULL);
     }
 
+    if ((hdsk.hostFlags & HWHO_INPROGRESS) || !(hdsk.hostFlags & ALTADDR)) {
+	char hoststr[16];
+	ViceLog(0, ("h_stateRestoreHost: skipping host %s:%d due to invalid flags 0x%x\n",
+	            afs_inet_ntoa_r(hdsk.host, hoststr), (int)ntohs(hdsk.port),
+	            (unsigned)hdsk.hostFlags));
+	bail = 0;
+	state->h_map.entries[hdsk.index].valid = FS_STATE_IDX_SKIPPED;
+	goto done;
+    }
+
     /* for restoring state, we better be able to get a host! */
     host = GetHT();
     osi_Assert(host != NULL);