From fd4bb48075a6ba1d38a5852fe08883dea2f007d7 Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Fri, 22 Feb 2013 22:46:12 -0600 Subject: [PATCH] viced: Improve CallPreamble error messages These messages are not very useful right now. At least try to say what host we sent an error to, so we know which host may be experiencing some troubles as a result. Reviewed-on: http://gerrit.openafs.org/9381 Reviewed-by: Mark Vitale Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit 6c41b1f740e16b5b9adfe9026630595be6f0699e) Change-Id: I4e9cf5e0d038c572895b4a31bfdff481ea0b3286 Reviewed-on: http://gerrit.openafs.org/10756 Reviewed-by: Andrew Deason Reviewed-by: Mark Vitale Reviewed-by: Benjamin Kaduk Reviewed-by: D Brashear Reviewed-by: Stephan Wiesand Tested-by: BuildBot --- src/viced/afsfileprocs.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c index 36cbfbdc3..46b2a10a4 100644 --- a/src/viced/afsfileprocs.c +++ b/src/viced/afsfileprocs.c @@ -382,7 +382,10 @@ CallPreamble(struct rx_call *acall, int activecall, retry: tclient = h_FindClient_r(*tconn); if (!tclient) { - ViceLog(0, ("CallPreamble: Couldn't get client.\n")); + ViceLog(0, ("CallPreamble: Couldn't get client struct for host " + "%s:%d, sending busy signal\n", + afs_inet_ntoa_r(rx_HostOf(rx_PeerOf(*tconn)), hoststr), + (int)ntohs(rx_PortOf(rx_PeerOf(*tconn))))); H_UNLOCK; return VBUSY; } @@ -391,7 +394,10 @@ CallPreamble(struct rx_call *acall, int activecall, if (!retry_flag) { h_ReleaseClient_r(tclient); h_Release_r(thost); - ViceLog(0, ("CallPreamble: Couldn't get CPS. Fail\n")); + ViceLog(0, ("CallPreamble: Couldn't get CPS for client from host " + "%s:%d, failing request\n", + afs_inet_ntoa_r(thost->host, hoststr), + (int)ntohs(thost->port))); H_UNLOCK; return -1001; } @@ -421,7 +427,10 @@ CallPreamble(struct rx_call *acall, int activecall, h_ReleaseClient_r(tclient); h_Release_r(thost); H_UNLOCK; - ViceLog(0, ("CallPreamble: couldn't reconnect to ptserver\n")); + ViceLog(0, ("CallPreamble: couldn't reconnect to ptserver while " + "handling request for %s:%d\n", + afs_inet_ntoa_r(thost->host, hoststr), + (int)ntohs(thost->port))); return -1001; } -- 2.39.5