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

Redis: Fix thread-contention issues with Expire(), add more tests

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-02-27 16:39:41 -07:00
parent b81e876ec8
commit cca1d4f988
7 changed files with 200 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

36
testing/btest/scripts/base/frameworks/storage/redis-expiration.zeek
View file

@ -19,13 +19,19 @@ redef exit_only_after_terminate = T;
type str: string;
global b: opaque of Storage::BackendHandle;
global key: string = "key1234";
global value: string = "value7890";
global key1: string = "key1234";
global value1: string = "value1234";
global key2: string = "key2345";
global value2: string = "value2345";
event check_removed()
{
local res2 = Storage::Sync::get(b, key);
print "get result after expiration", res2;
local res = Storage::Sync::get(b, key1);
print "get result 1 after expiration", res;
res = Storage::Sync::get(b, key2);
print "get result 2 after expiration", res;
Storage::Sync::close_backend(b);
terminate();
@ -42,13 +48,23 @@ event setup_test()
b = open_res$value;
local res = Storage::Sync::put(b, [ $key=key, $value=value, $expire_time=2secs ]);
print "put result", res;
# Insert a key that will expire in the time allotted
local res = Storage::Sync::put(b, [ $key=key1, $value=value1, $expire_time=2secs ]);
print "put result 1", res;
local res2 = Storage::Sync::get(b, key);
print "get result", res2;
if ( res2$code == Storage::SUCCESS && res2?$value )
print "get result same as inserted", value == ( res2$value as string );
# Insert a key that won't expire
res = Storage::Sync::put(b, [ $key=key2, $value=value2, $expire_time=20secs ]);
print "put result 2", res;
res = Storage::Sync::get(b, key1);
print "get result", res;
if ( res$code == Storage::SUCCESS && res?$value )
print "get result same as inserted", value1 == ( res$value as string );
res = Storage::Sync::get(b, key2);
print "get result 2", res;
if ( res$code == Storage::SUCCESS && res?$value )
print "get result 2 same as inserted", value2 == ( res$value as string );
schedule 5secs { check_removed() };
}

78
testing/btest/scripts/base/frameworks/storage/redis-native-expiration.zeek Normal file
View file

@ -0,0 +1,78 @@
# @TEST-DOC: Tests expiration of data from Redis when reading a pcap
# @TEST-REQUIRES: have-redis
# @TEST-PORT: REDIS_PORT
# @TEST-EXEC: btest-bg-run redis-server run-redis-server ${REDIS_PORT%/tcp}
# @TEST-EXEC: zeek -B storage -b %INPUT > out
# @TEST-EXEC: btest-bg-wait -k 1
# @TEST-EXEC: btest-diff out
@load base/frameworks/storage/sync
@load policy/frameworks/storage/backend/redis
redef Storage::expire_interval = 2secs;
redef exit_only_after_terminate = T;
# Create a typename here that can be passed down into open_backend()
type str: string;
global b: opaque of Storage::BackendHandle;
global key1: string = "key1234";
global value1: string = "value1234";
global key2: string = "key2345";
global value2: string = "value2345";
event check_removed()
{
local res = Storage::Sync::get(b, key1);
print "get result 1 after expiration", res;
res = Storage::Sync::get(b, key2);
print "get result 2 after expiration", res;
Storage::Sync::close_backend(b);
terminate();
}
event setup_test()
{
local opts: Storage::BackendOptions;
opts$redis = [ $server_host="127.0.0.1", $server_port=to_port(getenv(
"REDIS_PORT")), $key_prefix="testing" ];
local open_res = Storage::Sync::open_backend(Storage::REDIS, opts, str, str);
print "open result", open_res;
b = open_res$value;
# Insert a key that will expire in the time allotted
local res = Storage::Sync::put(b, [ $key=key1, $value=value1, $expire_time=2secs ]);
print "put result 1", res;
# Insert a key that won't expire
res = Storage::Sync::put(b, [ $key=key2, $value=value2, $expire_time=20secs ]);
print "put result 2", res;
res = Storage::Sync::get(b, key1);
print "get result", res;
if ( res$code == Storage::SUCCESS && res?$value )
print "get result same as inserted", value1 == ( res$value as string );
res = Storage::Sync::get(b, key2);
print "get result 2", res;
if ( res$code == Storage::SUCCESS && res?$value )
print "get result 2 same as inserted", value2 == ( res$value as string );
schedule 5secs { check_removed() };
}
event zeek_init()
{
# We need network time to be set to something other than zero for the
# expiration time to be set correctly. Schedule an event on a short
# timer so packets start getting read and do the setup there.
schedule 100msecs { setup_test() };
}