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

Merge remote-tracking branch 'origin/topic/awelzel/3013-btest-core-network-time-broker'

Browse source 
* origin/topic/awelzel/3013-btest-core-network-time-broker:
  core.network_time.broker: Test reliability improvement
This commit is contained in:
Tim Wojtulewicz 2023-05-09 13:38:37 -07:00
commit 04d23a8b5b
5 changed files with 31 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CHANGES
View file

@ -1,3 +1,16 @@
6.0.0-dev.533 | 2023-05-09 13:38:37 -0700
* core.network_time.broker: Test reliability improvement (Arne Welzel, Corelight)
I wasn't able to reproduce this locally, but after looking at
-B main-loop,tm for a bit it dawned that if the manager is sending
ticks too fast, the Broker IO source may consume two ticks in one go
before expiring timers and that would explain the observed baseline
differences.
Solve this by removing the reliance on realtime delays and switch to
a request-reply pattern instead.
6.0.0-dev.531 | 2023-05-09 13:38:15 -0700 6.0.0-dev.531 | 2023-05-09 13:38:15 -0700
* ci: Add public-ecr-vacuum.sh (Arne Welzel, Corelight) * ci: Add public-ecr-vacuum.sh (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
6.0.0-dev.531 6.0.0-dev.533

2
testing/btest/Baseline/core.network_time.broker/manager..stdout
View file

@ -1,4 +1,4 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
manager: listening manager: listening
manager: peer added, publishing do_continue_processing manager: peer added, publishing timer_tick() events
manager: peer lost, terminating manager: peer lost, terminating

2
testing/btest/Baseline/core.network_time.broker/worker..stdout
View file

@ -17,7 +17,7 @@
44.750, timer_tick, 13, 45.0 44.750, timer_tick, 13, 45.0
45.000, timer, second timer (3 sec) 45.000, timer, second timer (3 sec)
45.000, timer_tick, 14, 45.25 45.000, timer_tick, 14, 45.25
45.250, timer, third timer (3.5 sec) 45.250, timer, third timer (3.25 sec)
45.250, timer_tick, 15, 45.5 45.250, timer_tick, 15, 45.5
45.500, timer_tick, 16, 45.75 45.500, timer_tick, 16, 45.75
45.750, timer_tick, 17, 46.0 45.750, timer_tick, 17, 46.0

20
testing/btest/core/network_time/broker.zeek
View file

@ -11,6 +11,8 @@
redef allow_network_time_forward = F; redef allow_network_time_forward = F;
global timer_tock: event();
event zeek_init() event zeek_init()
{ {
print network_time(), "zeek_init: broker peering"; print network_time(), "zeek_init: broker peering";
@ -34,7 +36,8 @@ event timer(s: string)
print fmt("%.3f", network_time()), "timer", s; print fmt("%.3f", network_time()), "timer", s;
} }
# The manager tells us our network_time. # The manager sends timer_tick() with the network time to the worker which
# replies back with a timer_tock().
global received_ticks = 0; global received_ticks = 0;
event timer_tick(ts: time) &is_used event timer_tick(ts: time) &is_used
{ {
@ -48,10 +51,12 @@ event timer_tick(ts: time) &is_used
{ {
schedule 0.5sec { timer("first timer (1 sec)") }; schedule 0.5sec { timer("first timer (1 sec)") };
schedule 3sec { timer("second timer (3 sec)") }; schedule 3sec { timer("second timer (3 sec)") };
schedule 3.25sec { timer("third timer (3.5 sec)") }; schedule 3.25sec { timer("third timer (3.25 sec)") };
schedule 5sec { timer("fourth timer (10 sec)") }; schedule 5sec { timer("fourth timer (10 sec)") };
} }
Broker::publish("zeek/event/my_topic", timer_tock);
if ( received_ticks == 30 ) if ( received_ticks == 30 )
terminate(); terminate();
} }
@ -74,19 +79,20 @@ event zeek_init()
{ {
print "manager: listening"; print "manager: listening";
Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT"))); Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
Broker::subscribe("zeek/event/my_topic");
} }
event local_tick() { # Received from the worker once it has processed the tick.
event timer_tock() &is_used
{
fake_network_time = fake_network_time + double_to_interval(0.25); fake_network_time = fake_network_time + double_to_interval(0.25);
Broker::publish("zeek/event/my_topic", timer_tick, fake_network_time); Broker::publish("zeek/event/my_topic", timer_tick, fake_network_time);
schedule 0.05 sec { local_tick() }; }
}
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
{ {
print "manager: peer added, publishing do_continue_processing"; print "manager: peer added, publishing timer_tick() events";
Broker::publish("zeek/event/my_topic", timer_tick, fake_network_time); Broker::publish("zeek/event/my_topic", timer_tick, fake_network_time);
schedule 0.05 sec { local_tick() };
} }
event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string) event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)