Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-11 19:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed a problem with metrics aggregation on clusters (thanks Jon!).

Browse source
This commit is contained in:
Seth Hall 2012-11-26 16:17:35 -05:00
parent ebacb80d1c
commit 6bdcdcecf9
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,15 +189,16 @@ function data_added(filter: Filter, index: Index, val: ResultVal)
event Metrics::cluster_index_response(uid: string, id: string, filter_name: string, index: Index, val: ResultVal)
{
#print fmt("%0.6f MANAGER: receiving index data from %s - %s=%s", network_time(), get_event_peer()$descr, index2str(index), val);
if ( [uid, id, filter_name, index] in index_requests )
index_requests[uid, id, filter_name, index] = merge_result_vals(index_requests[uid, id, filter_name, index], val);
else
index_requests[uid, id, filter_name, index] = val;
local merged_val = merge_result_vals(index_requests[uid, id, filter_name, index], val);
index_requests[uid, id, filter_name, index] = merged_val;
local ir = index_requests[uid, id, filter_name, index];
# Mark that this worker is done.
++done_with[uid];
#print ir;
#print fmt("worker_count:%d :: done_with:%d", Cluster::worker_count, done_with[uid]);
if ( Cluster::worker_count == done_with[uid] )