Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix a race condition when multiple workers report intermediate indexes simultaneously.

Browse source
This commit is contained in:
Seth Hall 2012-11-28 15:52:41 -05:00
parent 2add60b4b1
commit 92285a9711
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/base/frameworks/metrics/cluster.bro
View file

@ -81,7 +81,7 @@ global index_requests: table[string, string, string, Index] of ResultVal &create
# an intermediate result has been received. The manager may optionally request
# the index again before data expires from here if too many workers are crossing
# the percentage threshold (not implemented yet!).
global recent_global_view_indexes: table[string, string, Index] of count &create_expire=5mins &default=0;
global recent_global_view_indexes: table[string, string, Index] of count &create_expire=1min &default=0;
# Add events to the cluster framework to make this work.
redef Cluster::manager2worker_events += /Metrics::cluster_(filter_request|index_request)/;
@ -217,10 +217,12 @@ event Metrics::cluster_index_intermediate_response(id: string, filter_name: stri
{
#print fmt("MANAGER: receiving intermediate index data from %s", get_event_peer()$descr);
#print fmt("MANAGER: requesting index data for %s", index2str(index));
++recent_global_view_indexes[id, filter_name, index];
if ( [id, filter_name, index] in recent_global_view_indexes )
return;
local uid = unique_id("");
event Metrics::cluster_index_request(uid, id, filter_name, index);
++recent_global_view_indexes[id, filter_name, index];
}
event Metrics::cluster_filter_response(uid: string, id: string, filter_name: string, data: MetricTable, done: bool)