[Openais] [PATCH] Add more pause timeout resets

[Steven Dake]

Signed-off-by: Steven Dake <sd...@redhat.com>
---
 exec/totemsrp.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/exec/totemsrp.c b/exec/totemsrp.c
index 3dcc05e..0194a7c 100644
--- a/exec/totemsrp.c
+++ b/exec/totemsrp.c
@@ -3501,6 +3501,8 @@ static int message_handler_orf_token (
                                cancel_heartbeat_timeout(instance);
                        }
 
+                       timer_function_pause_timeout (instance);
+                       timer_function_pause_timeout (instance);
                        return (0); /* discard token */
                }
 
@@ -3661,6 +3663,7 @@ printf ("token seq %d\n", token->seq);
                cancel_heartbeat_timeout(instance);
        }
 
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
@@ -3824,6 +3827,7 @@ static int message_handler_mcast (
                                memb_set_merge (&mcast_header.system_from, 1,
                                        instance->my_proc_list, 
&instance->my_proc_list_entries);
                                memb_state_gather_enter (instance, 8);
+                               timer_function_pause_timeout (instance);
                                return (0);
                        }
                        break;
@@ -3838,6 +3842,7 @@ static int message_handler_mcast (
                        instance->stats.rx_msg_dropped++;
                        break;
                }
+               timer_function_pause_timeout (instance);
                return (0);
        }
 
@@ -3880,6 +3885,7 @@ static int message_handler_mcast (
        }
 
 /* TODO remove from retrans message queue for old ring in recovery state */
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
@@ -3905,6 +3911,7 @@ static int message_handler_memb_merge_detect (
        if (memcmp (&instance->my_ring_id, &memb_merge_detect.ring_id,
                sizeof (struct memb_ring_id)) == 0) {
 
+               timer_function_pause_timeout (instance);
                return (0);
        }
 
@@ -3940,6 +3947,8 @@ static int message_handler_memb_merge_detect (
                /* do nothing in recovery */
                break;
        }
+
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
@@ -4248,6 +4257,7 @@ static int message_handler_memb_join (
                        }
                        break;
        }
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
@@ -4327,6 +4337,8 @@ static int message_handler_memb_commit_token (
                        }
                        break;
        }
+
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
@@ -4346,6 +4358,8 @@ static int message_handler_token_hold_cancel (
                        timer_function_token_retransmit_timeout (instance);
                }
        }
+
+       timer_function_pause_timeout (instance);
        return (0);
 }
 
-- 
1.7.4.4

_______________________________________________
Openais mailing list
Openais@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/openais