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

Improve stability of config/cluster_resend btest

Browse source
This commit is contained in:
Jon Siwek 2020-08-20 16:26:06 -07:00
parent 903191e568
commit 038fb1c08e
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.3.0-dev.142 | 2020-08-20 16:26:06 -0700
* Improve stability of config/cluster_resend btest (Jon Siwek, Corelight)
3.3.0-dev.141 | 2020-08-20 14:56:15 -0700
* Mark FileAssembler destructor as default, remove implementation (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
3.3.0-dev.141
3.3.0-dev.142

23
testing/btest/scripts/base/frameworks/config/cluster_resend.zeek
View file

@ -4,6 +4,7 @@
#
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT
# @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT
# @TEST-EXEC: $SCRIPTS/wait-for-file manager-1/ready 30 || (btest-bg-wait -k 1 && false)
# @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT
# @TEST-EXEC: btest-bg-wait 60
# @TEST-EXEC: btest-diff manager-1/.stdout
@ -35,27 +36,17 @@ export {
global n = 0;
global ready_for_data: event();
event zeek_init()
event ready_for_data()
{
Broker::auto_publish(Cluster::worker_topic, ready_for_data);
}
@if ( Cluster::node == "manager-1" )
Config::set_value("testcount", 1);
@endif
@if ( Cluster::node == "worker-1" )
event ready_for_data()
{
Config::set_value("testport", 44/tcp);
Config::set_value("teststring", "b", "comment");
}
@endif
@if ( Cluster::node == "manager-1" )
event ready_for_data()
{
Config::set_value("testcount", 1);
}
@endif
global option_changed_count = 0;
@ -64,6 +55,9 @@ function option_changed(ID: string, new_value: any, location: string): any
++option_changed_count;
print "option changed", ID, new_value, location;
if ( Cluster::node == "manager-1" && option_changed_count == 3 )
system("touch ready");
if ( Cluster::node == "worker-2" && option_changed_count == 3 )
terminate();
@ -72,6 +66,7 @@ function option_changed(ID: string, new_value: any, location: string): any
event zeek_init() &priority=5
{
Broker::auto_publish(Cluster::worker_topic, ready_for_data);
Option::set_change_handler("testport", option_changed, -100);
Option::set_change_handler("teststring", option_changed, -100);
Option::set_change_handler("testcount", option_changed, -100);