diff --git a/scripts/base/frameworks/sumstats/cluster.bro b/scripts/base/frameworks/sumstats/cluster.bro index b609abf472..0286e0f6e6 100644 --- a/scripts/base/frameworks/sumstats/cluster.bro +++ b/scripts/base/frameworks/sumstats/cluster.bro @@ -61,12 +61,11 @@ redef Cluster::manager2worker_events += /SumStats::(get_a_key)/; redef Cluster::worker2manager_events += /SumStats::cluster_(send_result|key_intermediate_response)/; redef Cluster::worker2manager_events += /SumStats::(send_a_key|send_no_key)/; +# This variable is maintained to know what keys have recently sent or received +# intermediate updates so they don't overwhelm the manager. +global recent_global_view_keys: set[string, Key] &create_expire=1min; + @if ( Cluster::local_node_type() != Cluster::MANAGER ) -# This variable is maintained to know what keys have recently sent as -# intermediate updates so they don't overwhelm their manager. The count that is -# yielded is the number of times the percentage threshold has been crossed and -# an intermediate result has been received. -global recent_global_view_keys: table[string, Key] of count &create_expire=1min &default=0; # Result tables indexed on a uid that are currently being sent to the # manager. @@ -76,8 +75,7 @@ global sending_results: table[string] of ResultTable = table() &read_expire=1min # being collected somewhere other than a worker. function data_added(ss: SumStat, key: Key, result: Result) { - # If an intermediate update for this value was sent recently, don't send - # it again. + # If an intermediate update for this key was sent recently, don't send it again if ( [ss$name, key] in recent_global_view_keys ) return; @@ -88,7 +86,7 @@ function data_added(ss: SumStat, key: Key, result: Result) { # kick off intermediate update event SumStats::cluster_key_intermediate_response(ss$name, key); - ++recent_global_view_keys[ss$name, key]; + add recent_global_view_keys[ss$name, key]; } } @@ -441,6 +439,10 @@ event SumStats::cluster_key_intermediate_response(ss_name: string, key: Key) { #print fmt("MANAGER: receiving intermediate key data from %s", get_event_peer()$descr); #print fmt("MANAGER: requesting key data for %s", key); + # If an intermediate update for this key was handled recently, don't do it again + if ( [ss_name, key] in recent_global_view_keys ) + return; + add recent_global_view_keys[ss_name, key]; if ( ss_name in outstanding_global_views && |outstanding_global_views[ss_name]| > max_outstanding_global_views )