Mercurial > hg > freeDiameter
changeset 1279:a1685a53fe97
When requests fall into timeout, log them, the timeout, and the slow peer.
Fix a typo in a variable name while here.
| author | Thomas Klausner <tk@giga.or.at> |
|---|---|
| date | Fri, 12 Sep 2014 14:47:38 +0200 |
| parents | 2a7b32176d2e |
| children | 3eeb564e7bea |
| files | extensions/rt_busypeers/rtbusy.c |
| diffstat | 1 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/rt_busypeers/rtbusy.c Wed Aug 06 15:21:16 2014 +0200 +++ b/extensions/rt_busypeers/rtbusy.c Fri Sep 12 14:47:38 2014 +0200 @@ -49,7 +49,7 @@ struct msg * qry = NULL; struct rt_data * rtd = NULL; struct fd_list * candidates = NULL; - int sendingattemtps; + int sendingattempts; int resend = 1; @@ -72,13 +72,13 @@ (uint8_t *)(oh ? (DiamId_t)oh->os.data : fd_g_config->cnf_diamid), oh ? oh->os.len : fd_g_config->cnf_diamid_len , ER_DIAMETER_TOO_BUSY, &candidates, - &sendingattemtps) ); + &sendingattempts) ); /* Now we need to decide if we re-send this query to a different peer or return an error to upstream */ /* First, are we exceeding the allowed attempts? */ if (rtbusy_conf.RetryMaxPeers != 0) { - if (sendingattemtps >= rtbusy_conf.RetryMaxPeers) { + if (sendingattempts >= rtbusy_conf.RetryMaxPeers) { TRACE_DEBUG(FULL, "Maximum number of sending attempts reached for message %p, returning an error upstream", qry); resend = 0; } @@ -106,10 +106,16 @@ } /* Send the query again. We need to re-associate the expirecb which was cleaned, if it is used */ if (rtbusy_conf.RelayTimeout) { + char *buf = NULL; + size_t len; struct timespec expire; CHECK_SYS( clock_gettime(CLOCK_REALTIME, &expire) ); expire.tv_sec += rtbusy_conf.RelayTimeout/1000 + ((expire.tv_nsec + (1000000LL * (rtbusy_conf.RelayTimeout % 1000))) / 1000000000LL); expire.tv_nsec = (expire.tv_nsec + (1000000LL * (rtbusy_conf.RelayTimeout % 1000))) % 1000000000LL; + CHECK_MALLOC_DO( fd_msg_dump_full(&buf, &len, NULL, *pmsg, fd_g_config->cnf_dict, 0, 1), /* nothing */); + TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), re-sending: %s", senttolen, sentto, + rtbusy_conf.RelayTimeout, buf); + free(buf); CHECK_FCT( fd_msg_send_timeout( pmsg, NULL, NULL, rtbusy_expirecb, &expire ) ); } else { CHECK_FCT( fd_msg_send(pmsg, NULL, NULL) ); @@ -117,6 +123,13 @@ } else { if (is_req) { + char *buf = NULL; + size_t len; + + CHECK_MALLOC_DO( fd_msg_dump_full(&buf, &len, NULL, *pmsg, fd_g_config->cnf_dict, 0, 1), /* nothing */); + TRACE_ERROR( "No answer received for message from peer '%.*s' before timeout (%dms), giving up and sending error reply: %s", senttolen, sentto, + rtbusy_conf.RelayTimeout, buf); + free(buf); /* We must create an answer */ CHECK_FCT( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, pmsg, MSGFL_ANSW_ERROR ) );