Changeset 1207:043b894b0511 in freeDiameter for libfdcore/peers.c

Timestamp:

Jun 14, 2013, 6:30:42 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleanups in failover situation to avoid deadlocks and corrupt messages ids. Tested OK now.

File:

• libfdcore/peers.c (modified) (4 diffs)

libfdcore/peers.c

@@ -78 +78 @@
         fd_list_init(&p->p_expiry, p);
         CHECK_FCT( fd_fifo_new(&p->p_tosend, 5) );
+        CHECK_FCT( fd_fifo_new(&p->p_tofailover, 0) );
         p->p_hbh = lrand48();
         
@@ -233 +234 @@
         }
 
-/* Empty the lists of p_tosend and p_sentreq messages */
+/* Empty the lists of p_tosend, p_failover, and p_sentreq messages */
 void fd_peer_failover_msg(struct fd_peer * peer)
 {
@@ -258 +259 @@
         }
         
+        /* Requeue all messages in the "failover" queue */
+        while ( fd_fifo_tryget(peer->p_tofailover, &m) == 0 ) {
+                fd_hook_call(HOOK_MESSAGE_FAILOVER, m, peer, NULL, fd_msg_pmdl_get(m));
+                CHECK_FCT_DO(fd_fifo_post_noblock(fd_g_outgoing, (void *)&m), 
+                        {
+                                /* fallback: destroy the message */
+                                fd_hook_call(HOOK_MESSAGE_DROPPED, m, NULL, "Internal error: unable to requeue this message during failover process", fd_msg_pmdl_get(m));
+                                CHECK_FCT_DO(fd_msg_free(m), /* What can we do more? */)
+                        } );
+        }
+        
         /* Requeue all routable sent requests */
         fd_p_sr_failover(&peer->p_sr);
@@ -335 +347 @@
         
         CHECK_FCT_DO( fd_fifo_del(&p->p_tosend), /* continue */ );
+        CHECK_FCT_DO( fd_fifo_del(&p->p_tofailover), /* continue */ );
         CHECK_POSIX_DO( pthread_mutex_destroy(&p->p_state_mtx), /* continue */);
         CHECK_POSIX_DO( pthread_mutex_destroy(&p->p_sr.mtx), /* continue */);