add a node->tx_cnt counter

only send keepalive packets if the count is zero

(This used to be ctdb commit 2cbd424231caccf0a531cf6501761115efe68f3e)

diff --git a/ctdb/common/ctdb_monitor.c b/ctdb/common/ctdb_monitor.c
index 255ea5ee30acdb886d7e58d39332d125577b33a7..0af62eb2d686ecbaf5bfe43d39fcebca8b7cd237 100644 (file)
--- a/ctdb/common/ctdb_monitor.c
+++ b/ctdb/common/ctdb_monitor.c
@@ -64,8 +64,12 @@ static void ctdb_check_for_dead_nodes(struct event_context *ev, struct timed_eve
                        */
                        continue;
                }
+               
+               if (node->tx_cnt == 0) {
+                       ctdb_send_keepalive(ctdb, node->vnn);
+               }
 
-               ctdb_send_keepalive(ctdb, node->vnn);
+               node->tx_cnt = 0;
        }
        
        event_add_timed(ctdb->ev, ctdb, 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 0149714c8566d2885c8d95d6b4cb4d01b70321d4..a2545ac7a7f6a97f994f4c4575c331eef6e94a45 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -93,6 +93,7 @@ struct ctdb_node {
        /* used by the dead node monitoring */
        uint32_t dead_count;
        uint32_t rx_cnt;
+       uint32_t tx_cnt;
 
        /* a list of controls pending to this node, so we can time them out quickly
           if the node becomes disconnected */