sync changes

This commit is contained in:
Brendan O'Dea 2004-10-29 04:25:40 +00:00
parent a475f25c8a
commit 79d49cacd9

View file

@ -1,6 +1,6 @@
// L2TPNS Clustering Stuff // L2TPNS Clustering Stuff
char const *cvs_id_cluster = "$Id: cluster.c,v 1.12 2004-09-21 04:30:46 fred_nerk Exp $"; char const *cvs_id_cluster = "$Id: cluster.c,v 1.13 2004-10-29 04:25:40 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <sys/file.h> #include <sys/file.h>
@ -371,12 +371,12 @@ void cluster_send_ping(time_t basetime)
// //
// Walk the session counters looking for non-zero ones to send // Walk the session counters looking for non-zero ones to send
// to the master. We send up to 100 of them at one time. // to the master. We send up to 600 of them at one time.
// We examine a maximum of 2000 sessions. // We examine a maximum of 3000 sessions.
// (50k max session should mean that we normally // (50k max session should mean that we normally
// examine the entire session table every 25 seconds). // examine the entire session table every 25 seconds).
#define MAX_B_RECS (400) #define MAX_B_RECS (600)
void master_update_counts(void) void master_update_counts(void)
{ {
int i, c; int i, c;
@ -818,7 +818,7 @@ void cluster_heartbeat()
exit(1); exit(1);
} }
log(3,0,0,0, "Sending heartbeat #%d with %d changes (%d x-sess, %d x-tunnels, %d highsess, %d hightun size %d)\n", log(3,0,0,0, "Sending heartbeat #%d with %d changes (%d x-sess, %d x-tunnels, %d highsess, %d hightun, size %d)\n",
h.seq, config->cluster_num_changes, count, tcount, config->cluster_highest_sessionid, h.seq, config->cluster_num_changes, count, tcount, config->cluster_highest_sessionid,
config->cluster_highest_tunnelid, (p-buff)); config->cluster_highest_tunnelid, (p-buff));