From b8287a3375abcb2d964699414b577e5e43b79898 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 8 May 2020 15:38:17 -0700 Subject: [PATCH] Fix issue with sumstats script and fix baselines that were crashing previously --- scripts/base/frameworks/sumstats/cluster.zeek | 11 +++++++---- .../manager-1..stdout | 2 +- .../manager-1..stdout | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/base/frameworks/sumstats/cluster.zeek b/scripts/base/frameworks/sumstats/cluster.zeek index d2633afd87..86125884a5 100644 --- a/scripts/base/frameworks/sumstats/cluster.zeek +++ b/scripts/base/frameworks/sumstats/cluster.zeek @@ -328,13 +328,16 @@ function request_all_current_keys(uid: string, ss_name: string, cleanup: bool) if ( uid in stats_keys && |stats_keys[uid]| > 0 ) { #print fmt(" -- %d remaining keys here", |stats_keys[uid]|); - for ( key in stats_keys[uid] ) + local key: Key; + for ( k in stats_keys[uid] ) { - done_with[uid] = 0; - event SumStats::cluster_get_result(uid, ss_name, key, cleanup); - delete stats_keys[uid][key]; + key = k; break; # only a single key } + + done_with[uid] = 0; + event SumStats::cluster_get_result(uid, ss_name, key, cleanup); + delete stats_keys[uid][key]; } else { diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout index 778ab98cf5..76f7847ce3 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.sumstats.basic-cluster/manager-1..stdout @@ -1,4 +1,4 @@ Host: 1.2.3.4 - num:9 - sum:437.0 - avg:48.6 - max:95.0 - min:3.0 - var:758.8 - std_dev:27.5 - unique:8 - hllunique:8 +Host: 10.10.10.10 - num:1 - sum:5.0 - avg:5.0 - max:5.0 - min:5.0 - var:0.0 - std_dev:0.0 - unique:1 - hllunique:1 Host: 6.5.4.3 - num:2 - sum:6.0 - avg:3.0 - max:5.0 - min:1.0 - var:8.0 - std_dev:2.8 - unique:2 - hllunique:2 Host: 7.2.1.5 - num:2 - sum:145.0 - avg:72.5 - max:91.0 - min:54.0 - var:684.5 - std_dev:26.2 - unique:2 - hllunique:2 -Host: 10.10.10.10 - num:1 - sum:5.0 - avg:5.0 - max:5.0 - min:5.0 - var:0.0 - std_dev:0.0 - unique:1 - hllunique:1 diff --git a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout index ea454d179e..8424d5df20 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.sumstats.sample-cluster/manager-1..stdout @@ -2,7 +2,7 @@ Host: 1.2.3.4 Sampled observations: 34 [52, 61, 95, 95, 181] Host: 6.5.4.3 Sampled observations: 2 [2, 5] -Host: 7.2.1.5 Sampled observations: 2 - [1, 91] Host: 10.10.10.10 Sampled observations: 1 [5] +Host: 7.2.1.5 Sampled observations: 2 + [1, 91]