From: Andrew Deason Date: Wed, 26 Feb 2014 17:42:16 +0000 (-0600) Subject: viced: Restore some previous log message language X-Git-Tag: upstream/1.6.8^2~7 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e6a43bff17019160154726d7f6ed48805ae14cbc;p=packages%2Fo%2Fopenafs.git viced: Restore some previous log message language Before commit 6c41b1f740e16b5b9adfe9026630595be6f0699e, we logged these three messages in the fileserver in different situations: CallPreamble: Couldn't get client. CallPreamble: Couldn't get CPS. Fail CallPreamble: couldn't reconnect to ptserver After commits 6c41b1f740e16b5b9adfe9026630595be6f0699e and 0a5e878aa0a71c4dfaef1806744ed78bcc13b9f4, these messages were changed to contain more useful information, but the language was also changed. The messages now look like: Client host too busy while handling request from host %s:%d viceid %d fid %lu.%lu.%lu, failing request Cannot get CPS for client while handling request [...], failing request Cannot reconnect to ptserver while handling request [...], failing request While the new messages are more informative, and (in my opinion) better describe what is happening in those situations, they do look very different from the old messages. This can break scripts that try to parse these logs, but in general it is also not clear to administrators that these messages still refer to the same events. So instead, put these messages back the way they were. Still include the extra information, of course, but revert the language to look more like the old messages. Now we log: CallPreamble: Couldn't get client while handling request from host %s:%d viceid %d fid %lu.%lu.%lu, failing request CallPreamble: Couldn't get CPS while handling request [...], failing request CallPreamble: couldn't reconnect to ptserver while handling request [...], failing request Thanks to Ben Kaduk for bringing this up. Reviewed-on: http://gerrit.openafs.org/10857 Reviewed-by: Benjamin Kaduk Reviewed-by: Andrew Deason Tested-by: D Brashear Reviewed-by: D Brashear (cherry picked from commit 0e9bb718ce231ffd73fe11810d8dc1d3902e4b2d) Change-Id: I35c8369a7efba0c08c000a24e14385209082cfe0 Reviewed-on: http://gerrit.openafs.org/10953 Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk Reviewed-by: Chas Williams - CONTRACTOR Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 5dee3176f..fd40171b5 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -410,7 +410,7 @@ CallPreamble(struct rx_call *acall, int activecall, struct AFSFid *Fid, tclient = h_FindClient_r(*tconn, &viceid); if (!tclient) { H_UNLOCK; - LogClientError("Client host too busy", *tconn, viceid, Fid); + LogClientError("CallPreamble: Couldn't get client", *tconn, viceid, Fid); return VBUSY; } thost = tclient->host; @@ -419,7 +419,7 @@ CallPreamble(struct rx_call *acall, int activecall, struct AFSFid *Fid, h_ReleaseClient_r(tclient); h_Release_r(thost); H_UNLOCK; - LogClientError("Cannot get CPS for client", *tconn, viceid, Fid); + LogClientError("CallPreamble: Couldn't get CPS", *tconn, viceid, Fid); return -1001; } retry_flag = 0; /* Retry once */ @@ -448,7 +448,7 @@ CallPreamble(struct rx_call *acall, int activecall, struct AFSFid *Fid, h_ReleaseClient_r(tclient); h_Release_r(thost); H_UNLOCK; - LogClientError("Cannot reconnect to ptserver", *tconn, viceid, Fid); + LogClientError("CallPreamble: couldn't reconnect to ptserver", *tconn, viceid, Fid); return -1001; }