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

Adjust a few btests that were unstable due to time-sensitivity

Browse source
This commit is contained in:
Jon Siwek 2020-08-06 22:23:29 -07:00 • committed by Tim Wojtulewicz
parent fef4fda2f7
commit 48a243069c
3 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

40
testing/btest/scripts/base/frameworks/intel/read-file-dist-cluster.zeek
View file

@ -5,7 +5,7 @@
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
# @TEST-EXEC: btest-bg-wait 30 # @TEST-EXEC: btest-bg-wait 40
# @TEST-EXEC: btest-diff manager-1/.stdout # @TEST-EXEC: btest-diff manager-1/.stdout
# @TEST-EXEC: btest-diff manager-1/intel.log # @TEST-EXEC: btest-diff manager-1/intel.log
# @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-1/.stdout
@ -41,16 +41,44 @@ redef enum Intel::Where += {
event do_it() event do_it()
{ {
if ( Cluster::node == "manager-1" )
{
Broker::publish(Cluster::node_topic("worker-2"), do_it);
return;
}
Intel::seen([$host=1.2.3.4, $where=Intel::IN_A_TEST]); Intel::seen([$host=1.2.3.4, $where=Intel::IN_A_TEST]);
Intel::seen([$indicator="e@mail.com", $indicator_type=Intel::EMAIL, $where=Intel::IN_A_TEST]); Intel::seen([$indicator="e@mail.com", $indicator_type=Intel::EMAIL, $where=Intel::IN_A_TEST]);
if ( Cluster::node == "worker-1" )
Broker::publish(Cluster::node_topic("manager-1"), do_it);
} }
event zeek_init() global hi_count = 0;
event start_it()
{ {
# Delay the workers searching for hits briefly to allow for the data distribution Broker::publish(Cluster::node_topic("worker-1"), do_it);
# mechanism to distribute the data to the workers. }
if ( Cluster::local_node_type() == Cluster::WORKER )
schedule 4sec { do_it() }; event hi()
{
if ( Cluster::node == "manager-1" )
{
++hi_count;
if ( hi_count == 2 )
# Give more time for intel distribution.
schedule 1sec { start_it() };
}
else
Broker::publish(Cluster::node_topic("manager-1"), hi);
}
event Cluster::node_up(name: string, id: string) &priority=-100
{
if ( Cluster::node == "manager-1" )
Broker::publish(Cluster::node_topic(name), hi);
} }
event do_terminate() event do_terminate()

2
testing/btest/scripts/base/frameworks/sumstats/basic-cluster.zeek
View file

@ -5,7 +5,7 @@
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT # @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek %INPUT
# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek %INPUT
# @TEST-EXEC: btest-bg-wait 15 # @TEST-EXEC: btest-bg-wait 30
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout

4
testing/btest/scripts/base/frameworks/sumstats/cluster-intermediate-update.zeek
View file

@ -22,7 +22,7 @@ event zeek_init() &priority=5
{ {
local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SUM)]; local r1: SumStats::Reducer = [$stream="test.metric", $apply=set(SumStats::SUM)];
SumStats::create([$name="test", SumStats::create([$name="test",
$epoch=10secs, $epoch=15secs,
$reducers=set(r1), $reducers=set(r1),
$epoch_result(ts: time, key: SumStats::Key, result: SumStats::Result) = $epoch_result(ts: time, key: SumStats::Key, result: SumStats::Result) =
{ {
@ -64,7 +64,7 @@ event Cluster::node_up(name: string, id: string)
if ( Cluster::node == "worker-1" ) if ( Cluster::node == "worker-1" )
{ {
schedule 0.1sec { do_stats(1) }; schedule 0.1sec { do_stats(1) };
schedule 5secs { do_stats(60) }; schedule 1secs { do_stats(60) };
} }
if ( Cluster::node == "worker-2" ) if ( Cluster::node == "worker-2" )
schedule 0.5sec { do_stats(40) }; schedule 0.5sec { do_stats(40) };