Changeset 1279:a1685a53fe97 in freeDiameter

Timestamp:

Sep 12, 2014, 9:47:38 PM (10 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

When requests fall into timeout, log them, the timeout, and the slow peer.

Fix a typo in a variable name while here.

File:

• extensions/rt_busypeers/rtbusy.c (modified) (5 diffs)

extensions/rt_busypeers/rtbusy.c

@@ -50 +50 @@
         struct rt_data * rtd = NULL;
         struct fd_list * candidates = NULL;
-        int sendingattemtps;
+        int sendingattempts;
         int resend = 1;
         
@@ -73 +73 @@
                                     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 */
@@ -79 +79 @@
         /* 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;
@@ -107 +107 @@
                 /* 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 {
@@ -118 +124 @@
         } 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 ) );