long code;
char addr[16]="unknown";
int forcing_new = 0;
+ int location_updated = 0;
char *format;
DWORD msgID;
lock_ReleaseWrite(&cm_serverLock);
if (free_svr_list) {
cm_FreeServerList(serverspp, 0);
- serverspp = NULL;
serversp = NULL;
free_svr_list = 0;
}
switch ( errorCode ) {
case VBUSY:
msgID = MSG_SERVER_REPORTS_VBUSY;
- format = "Server %s reported busy when accessing volume %d.";
+ format = "Server %s reported busy when accessing volume %d in cell %s.";
break;
case VRESTARTING:
msgID = MSG_SERVER_REPORTS_VRESTARTING;
- format = "Server %s reported restarting when accessing volume %d.";
+ format = "Server %s reported restarting when accessing volume %d in cell %s.";
break;
}
((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),
((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24));
- osi_Log2(afsd_logp, format, osi_LogSaveString(afsd_logp,addr), fidp->volume);
- LogEvent(EVENTLOG_WARNING_TYPE, msgID, addr, fidp->volume);
+ osi_Log3(afsd_logp, format, osi_LogSaveString(afsd_logp,addr), fidp->volume, cellp->name);
+ LogEvent(EVENTLOG_WARNING_TYPE, msgID, addr, fidp->volume, cellp->name);
}
lock_ObtainWrite(&cm_serverLock);
if (free_svr_list) {
cm_FreeServerList(serverspp, 0);
- serverspp = NULL;
serversp = NULL;
free_svr_list = 0;
}
switch ( errorCode ) {
case VNOVOL:
msgID = MSG_SERVER_REPORTS_VNOVOL;
- format = "Server %s reported volume %d as not attached (does not exist).";
+ format = "Server %s reported volume %d in cell %s as not attached (does not exist).";
break;
case VMOVED:
msgID = MSG_SERVER_REPORTS_VMOVED;
- format = "Server %s reported volume %d as moved.";
+ format = "Server %s reported volume %d in cell %s as moved.";
break;
case VOFFLINE:
msgID = MSG_SERVER_REPORTS_VOFFLINE;
- format = "Server %s reported volume %d as offline.";
+ format = "Server %s reported volume %d in cell %s as offline.";
break;
case VSALVAGE:
msgID = MSG_SERVER_REPORTS_VSALVAGE;
- format = "Server %s reported volume %d as needs salvage.";
+ format = "Server %s reported volume %d in cell %s as needs salvage.";
break;
case VNOSERVICE:
msgID = MSG_SERVER_REPORTS_VNOSERVICE;
- format = "Server %s reported volume %d as not in service.";
+ format = "Server %s reported volume %d in cell %s as not in service.";
break;
case VIO:
msgID = MSG_SERVER_REPORTS_VIO;
- format = "Server %s reported volume %d as temporarily unaccessible.";
+ format = "Server %s reported volume %d in cell %s as temporarily unaccessible.";
break;
}
- if (serverp && fidp) {
- /* Log server being offline for this volume */
- sprintf(addr, "%d.%d.%d.%d",
- ((serverp->addr.sin_addr.s_addr & 0xff)),
- ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
- ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),
- ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24));
+ if (fidp) { /* File Server query */
+ if (serverp) {
+ /* Log server being offline for this volume */
+ sprintf(addr, "%d.%d.%d.%d",
+ ((serverp->addr.sin_addr.s_addr & 0xff)),
+ ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
+ ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),
+ ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24));
+
+ osi_Log3(afsd_logp, format, osi_LogSaveString(afsd_logp,addr), fidp->volume, cellp->name);
+ LogEvent(EVENTLOG_WARNING_TYPE, msgID, addr, fidp->volume, cellp->name);
+ }
- osi_Log2(afsd_logp, format, osi_LogSaveString(afsd_logp,addr), fidp->volume);
- LogEvent(EVENTLOG_WARNING_TYPE, msgID, addr, fidp->volume);
- }
+ code = cm_FindVolumeByID(cellp, fidp->volume, userp, reqp,
+ CM_GETVOL_FLAG_NO_LRU_UPDATE,
+ &volp);
+ if (code == 0)
+ statep = cm_VolumeStateByID(volp, fidp->volume);
- /*
- * Mark server offline for this volume or delete the volume
- * from the server list if it was moved or is not present.
- */
- if (!serversp && fidp) {
- code = cm_GetServerList(fidp, userp, reqp, &serverspp);
- if (code == 0) {
- serversp = *serverspp;
- free_svr_list = 1;
+ if ((errorCode == VMOVED || errorCode == VNOVOL || errorCode == VOFFLINE) &&
+ !(reqp->flags & CM_REQ_VOLUME_UPDATED))
+ {
+ code = cm_ForceUpdateVolume(fidp, userp, reqp);
+ if (code == 0)
+ location_updated = 1;
+
+ /* Even if the update fails, there might still be another replica */
+
+ reqp->flags |= CM_REQ_VOLUME_UPDATED;
+ osi_Log3(afsd_logp, "cm_Analyze called cm_ForceUpdateVolume cell %u vol %u code 0x%x",
+ fidp->cell, fidp->volume, code);
+ }
+
+ if (statep) {
+ cm_UpdateVolumeStatus(volp, statep->ID);
+ osi_Log3(afsd_logp, "cm_Analyze NewVolState cell %u vol %u state %u",
+ fidp->cell, fidp->volume, statep->state);
+ }
+
+ if (volp) {
+ lock_ObtainRead(&cm_volumeLock);
+ cm_PutVolume(volp);
+ lock_ReleaseRead(&cm_volumeLock);
+ volp = NULL;
+ }
+
+ /*
+ * Mark server offline for this volume or delete the volume
+ * from the server list if it was moved or is not present.
+ */
+ if (!serversp || location_updated) {
+ code = cm_GetServerList(fidp, userp, reqp, &serverspp);
+ if (code == 0) {
+ serversp = *serverspp;
+ free_svr_list = 1;
+ }
}
}
((tsrp->server->addr.sin_addr.s_addr & 0xff)),
((tsrp->server->addr.sin_addr.s_addr & 0xff00)>> 8),
((tsrp->server->addr.sin_addr.s_addr & 0xff0000)>> 16),
- ((tsrp->server->addr.sin_addr.s_addr & 0xff000000)>> 24));
+ ((tsrp->server->addr.sin_addr.s_addr & 0xff000000)>> 24));
if (tsrp->server == serverp) {
/* REDIRECT */
if (errorCode == VMOVED || errorCode == VNOVOL) {
- osi_Log2(afsd_logp, "volume %d not present on server %s",
+ osi_Log2(afsd_logp, "volume %d not present on server %s",
fidp->volume, osi_LogSaveString(afsd_logp,addr));
tsrp->status = srv_deleted;
if (fidp)
cm_RemoveVolumeFromServer(serverp, fidp->volume);
} else {
- osi_Log2(afsd_logp, "volume %d instance on server %s marked offline",
+ osi_Log2(afsd_logp, "volume %d instance on server %s marked offline",
fidp->volume, osi_LogSaveString(afsd_logp,addr));
tsrp->status = srv_offline;
}
/* break; */
} else {
- osi_Log3(afsd_logp, "volume %d exists on server %s with status %u",
+ osi_Log3(afsd_logp, "volume %d exists on server %s with status %u",
fidp->volume, osi_LogSaveString(afsd_logp,addr), tsrp->status);
}
- }
+ }
lock_ReleaseWrite(&cm_serverLock);
/* Free the server list before cm_ForceUpdateVolume is called */
if (free_svr_list) {
cm_FreeServerList(serverspp, 0);
- serverspp = NULL;
serversp = NULL;
free_svr_list = 0;
}
- if (fidp) { /* File Server query */
- code = cm_FindVolumeByID(cellp, fidp->volume, userp, reqp,
- CM_GETVOL_FLAG_NO_LRU_UPDATE,
- &volp);
- if (code == 0)
- statep = cm_VolumeStateByID(volp, fidp->volume);
-
- if ((errorCode == VMOVED || errorCode == VNOVOL) &&
- !(reqp->flags & CM_REQ_VOLUME_UPDATED))
- {
- code = cm_ForceUpdateVolume(fidp, userp, reqp);
- if (code)
- timeLeft = 0; /* prevent a retry on failure */
- else
- reqp->flags |= CM_REQ_VOLUME_UPDATED;
- osi_Log3(afsd_logp, "cm_Analyze called cm_ForceUpdateVolume cell %u vol %u code 0x%x",
- fidp->cell, fidp->volume, code);
- }
-
- if (statep) {
- cm_UpdateVolumeStatus(volp, statep->ID);
- osi_Log3(afsd_logp, "cm_Analyze NewVolState cell %u vol %u state %u",
- fidp->cell, fidp->volume, statep->state);
- }
-
- if (volp) {
- lock_ObtainRead(&cm_volumeLock);
- cm_PutVolume(volp);
- lock_ReleaseRead(&cm_volumeLock);
- volp = NULL;
- }
- }
-
if ( timeLeft > 2 )
retry = 1;
} else if ( errorCode == VNOVNODE ) {
osi_LogSaveString(afsd_logp,addr));
reqp->tokenIdleErrorServp = serverp;
reqp->idleError++;
+ }
- if (timeLeft > 2) {
- if (!fidp) { /* vldb */
- retry = 1;
- } else { /* file */
- cm_volume_t *volp = cm_GetVolumeByFID(fidp);
- if (volp) {
- if (fidp->volume == cm_GetROVolumeID(volp))
- retry = 1;
- cm_PutVolume(volp);
- }
+ if (timeLeft > 2) {
+ if (!fidp) { /* vldb */
+ retry = 1;
+ } else { /* file */
+ cm_volume_t *volp = cm_GetVolumeByFID(fidp);
+ if (volp) {
+ if (fidp->volume == cm_GetROVolumeID(volp))
+ retry = 1;
+ cm_PutVolume(volp);
}
}
}
}
+ else if (errorCode == RX_MSGSIZE) {
+ /*
+ * RPC failed because a transmitted rx packet
+ * may have grown larger than the path mtu.
+ * Force a retry and the Rx library will try
+ * with a smaller mtu size.
+ */
+
+ if (serverp) {
+ sprintf(addr, "%d.%d.%d.%d",
+ ((serverp->addr.sin_addr.s_addr & 0xff)),
+ ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
+ ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),
+ ((serverp->addr.sin_addr.s_addr & 0xff000000)>> 24));
+
+ LogEvent(EVENTLOG_WARNING_TYPE, MSG_RX_MSGSIZE_EXCEEDED, addr);
+ osi_Log1(afsd_logp, "cm_Analyze: Path MTU may have been exceeded addr[%s]",
+ osi_LogSaveString(afsd_logp,addr));
+ }
+
+ if (timeLeft > 2)
+ retry = 1;
+ }
else if (errorCode >= -64 && errorCode < 0) {
/* mark server as down */
if (serverp)
else if (retry && dead_session)
retry = 0;
- out:
/* drop this on the way out */
if (connp)
cm_PutConn(connp);
rx_SetConnIdleDeadTime(tcp->rxconnp, IdleDeadtimeout);
/*
+ * Let the Rx library know that we can auto-retry if an
+ * RX_MSGSIZE error is returned.
+ */
+ rx_SetMsgsizeRetryErr(tcp->rxconnp, RX_MSGSIZE);
+ /*
* Attempt to limit NAT pings to the anonymous file server connections.
* Only file servers implement client callbacks and we only need one ping
* to be sent to each server.