jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DAFS: do not save or restore host state if CPS in progress

Browse Source 
If a fileserver is shutdown while one or more PR_GetHostCPS calls
are in progress, this state is saved in the fsstate.dat file as
hostFlags HCPS_WAITING, HCPS_INPROGRESS.  Other hosts that are
merely waiting will have HCPS_WAITING recorded.

However, it makes no sense to restore host structs in this state,
because the GetCPS calls will no longer be in progress.  Once these
hosts become active, they will block server threads and quickly cause
all server threads to be exhausted as other CPS requests are blocked
behind them.

Instead, exclude these states from both save and restore.

Reviewed-on: https://gerrit.openafs.org/12561
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 38a3f51fb8b3910ecdd7cacb06f35ec681990aea)

Change-Id: I0e02543fd2e547fcc9f95db0973f09e5951a1da1
Reviewed-on: https://gerrit.openafs.org/12568
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Mark Vitale 2017-02-20 20:16:47 -05:00 committed by Stephan Wiesand
parent fb7eceb760
commit 72a48c34e7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/viced/host.c
View File

@ -123,6 +123,9 @@ void h_TossStuff_r(struct host *host);
#define IN_CLASSB_SUBNET 0xffffff00
#endif
#define hostBusyFlags(hf) \
((hf) & (HWHO_INPROGRESS | HCPS_INPROGRESS | HCPS_WAITING) \
|| !((hf) & ALTADDR))
/* get a new block of CEs and chain it on CEFree */
static void
@ -3007,8 +3010,7 @@ h_isBusy_r(struct host *host)
return 1;
}
if ((host->hostFlags & HWHO_INPROGRESS) || !(host->hostFlags & ALTADDR)) {
/* We shouldn't hit this if the host wasn't locked, but just in case... */
if (hostBusyFlags(host->hostFlags)) {
return 1;
}
@ -3471,7 +3473,7 @@ h_stateRestoreHost(struct fs_dump_state * state)
osi_Assert(hcps != NULL);
}
if ((hdsk.hostFlags & HWHO_INPROGRESS) || !(hdsk.hostFlags & ALTADDR)) {
if (hostBusyFlags(hdsk.hostFlags)) {
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),