cm_serverRef_t *tsrp;
cm_cell_t *cellp = NULL;
cm_ucell_t *ucellp;
+ cm_volume_t * volp = NULL;
+ cm_vol_state_t *statep = NULL;
int retry = 0;
int free_svr_list = 0;
int dead_session;
/* leave 5 seconds margin for sleep */
timeLeft = HardDeadtimeout - timeUsed;
+ /* get a pointer to the cell */
+ if (errorCode) {
+ if (cellp == NULL && serverp)
+ cellp = serverp->cellp;
+ if (cellp == NULL && serversp) {
+ struct cm_serverRef * refp;
+ for ( refp=serversp ; cellp == NULL && refp != NULL; refp=refp->next) {
+ if ( refp->server )
+ cellp = refp->server->cellp;
+ }
+ }
+ if (cellp == NULL && fidp) {
+ cellp = cm_FindCellByID(fidp->cell);
+ }
+ }
+
if (errorCode == CM_ERROR_TIMEDOUT) {
if (timeLeft > 5 ) {
thrd_Sleep(3000);
- if (cellp == NULL && serverp)
- cellp = serverp->cellp;
- if (cellp == NULL && serversp) {
- struct cm_serverRef * refp;
- for ( refp=serversp ; cellp == NULL && refp != NULL; refp=refp->next) {
- if ( refp->server )
- cellp = refp->server->cellp;
- }
- }
cm_CheckServers(CM_FLAG_CHECKDOWNSERVERS, cellp);
retry = 1;
}
/* Volume instances marked offline will be restored by the
* background daemon thread as they become available
*/
-#if 0
- if (timeLeft > 7) {
- thrd_Sleep(5000);
+ if (timeLeft > 7 && fidp) {
+ cm_volume_t *volp;
+ cm_vol_state_t *statep;
- if (fidp) { /* Not a VLDB call */
- if (!serversp) {
- code = cm_GetServerList(fidp, userp, reqp, &serverspp);
- if (code == 0) {
- serversp = *serverspp;
- free_svr_list = 1;
- }
- }
- if (serversp) {
- lock_ObtainWrite(&cm_serverLock);
- for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
- /* REDIRECT */
- tsrp->status = srv_not_busy;
- }
- lock_ReleaseWrite(&cm_serverLock);
- if (free_svr_list) {
- cm_FreeServerList(&serversp, 0);
- *serverspp = serversp;
- }
- retry = 1;
- }
+ thrd_Sleep(5000);
- cm_ForceUpdateVolume(fidp, userp, reqp);
- } else { /* VLDB call */
- if (serversp) {
- lock_ObtainWrite(&cm_serverLock);
- for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
- /* REDIRECT */
- tsrp->status = srv_not_busy;
- }
- lock_ReleaseWrite(&cm_serverLock);
- if (free_svr_list) {
- cm_FreeServerList(&serversp, 0);
- *serverspp = serversp;
- }
- }
- }
+ code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp,
+ CM_GETVOL_FLAG_NO_LRU_UPDATE,
+ &volp);
+ if (code == 0) {
+ if (fidp->volume == volp->rw.ID)
+ statep = &volp->rw;
+ else if (fidp->volume == volp->ro.ID)
+ statep = &volp->ro;
+ else if (fidp->volume == volp->bk.ID)
+ statep = &volp->bk;
+
+ if (statep->state != vl_offline) {
+ retry = 1;
+ } else {
+ if (cm_CheckOfflineVolume(volp, statep->ID))
+ retry = 1;
+ }
+
+ cm_PutVolume(volp);
+ }
}
-#endif
}
else if (errorCode == CM_ERROR_ALLBUSY) {
- /* Volume instances marked busy will be restored by the
- * background daemon thread as they become available.
+ /* Volumes that are busy cannot be determined to be non-busy
+ * without actually attempting to access them.
*/
osi_Log0(afsd_logp, "cm_Analyze passed CM_ERROR_ALLBUSY.");
-#if 0
if (timeLeft > 7) {
+
thrd_Sleep(5000);
- if (!serversp) {
- code = cm_GetServerList(fidp, userp, reqp, &serverspp);
+
+ if (fidp) { /* File Server query */
+ code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp,
+ CM_GETVOL_FLAG_NO_LRU_UPDATE,
+ &volp);
if (code == 0) {
- serversp = *serverspp;
- free_svr_list = 1;
+ if (fidp->volume == volp->rw.ID)
+ statep = &volp->rw;
+ else if (fidp->volume == volp->ro.ID)
+ statep = &volp->ro;
+ else if (fidp->volume == volp->bk.ID)
+ statep = &volp->bk;
+
+ if (statep->state != vl_offline && statep->state != vl_busy) {
+ retry = 1;
+ } else {
+ if (!serversp) {
+ code = cm_GetServerList(fidp, userp, reqp, &serverspp);
+ if (code == 0) {
+ serversp = *serverspp;
+ free_svr_list = 1;
+ }
+ }
+ lock_ObtainWrite(&cm_serverLock);
+ for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
+ if (tsrp->status == srv_busy) {
+ tsrp->status = srv_not_busy;
+ }
+ }
+ lock_ReleaseWrite(&cm_serverLock);
+ if (free_svr_list) {
+ cm_FreeServerList(&serversp, 0);
+ *serverspp = serversp;
+ }
+
+ cm_UpdateVolumeStatus(volp, statep->ID);
+ retry = 1;
+ }
+
+ cm_PutVolume(volp);
}
- }
- lock_ObtainWrite(&cm_serverLock);
- for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
- if (tsrp->status == srv_busy) {
- /* REDIRECT */
- tsrp->status = srv_not_busy;
+ } else { /* VL Server query */
+ if (serversp) {
+ lock_ObtainWrite(&cm_serverLock);
+ for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
+ if (tsrp->status == srv_busy) {
+ tsrp->status = srv_not_busy;
+ }
+ }
+ lock_ReleaseWrite(&cm_serverLock);
+ retry = 1;
}
}
- lock_ReleaseWrite(&cm_serverLock);
- if (free_svr_list) {
- cm_FreeServerList(&serversp, 0);
- *serverspp = serversp;
- }
- retry = 1;
}
-#endif
}
/* special codes: VBUSY and VRESTARTING */
lock_ObtainWrite(&cm_serverLock);
for (tsrp = serversp; tsrp; tsrp=tsrp->next) {
if (tsrp->server == serverp && tsrp->status == srv_not_busy) {
- /* REDIRECT */
tsrp->status = srv_busy;
+ if (fidp) { /* File Server query */
+ code = cm_GetVolumeByID(cellp, fidp->volume, userp, reqp,
+ CM_GETVOL_FLAG_NO_LRU_UPDATE,
+ &volp);
+ if (code == 0) {
+ if (fidp->volume == volp->rw.ID)
+ statep = &volp->rw;
+ else if (fidp->volume == volp->ro.ID)
+ statep = &volp->ro;
+ else if (fidp->volume == volp->bk.ID)
+ statep = &volp->bk;
+ }
+
+ cm_PutVolume(volp);
+ }
break;
}
}
lock_ReleaseWrite(&cm_serverLock);
+
+ if (statep)
+ cm_UpdateVolumeStatus(volp, statep->ID);
+
if (free_svr_list) {
cm_FreeServerList(&serversp, 0);
*serverspp = serversp;