diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-1..stdout index 33644c6261..75adea5b51 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-1..stdout @@ -1,4 +1,6 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. -worker-1, put result, [code=Storage::SUCCESS, error_str=, value=] +worker-1, put result 1, [code=Storage::SUCCESS, error_str=, value=] +worker-1, put result 2, [code=Storage::SUCCESS, error_str=, value=] sqlite_data_written -worker-1, [code=Storage::SUCCESS, error_str=, value=5678] +worker-1, get result 1 after expiration, [code=Storage::SUCCESS, error_str=, value=value1234] +worker-1, get result 2 after expiration, [code=Storage::KEY_NOT_FOUND, error_str=, value=] diff --git a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-2..stdout b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-2..stdout index fbd008b81b..a7988331a2 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-2..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.storage.sqlite-cluster/worker-2..stdout @@ -1,3 +1,4 @@ ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. sqlite_data_written -worker-2, [code=Storage::SUCCESS, error_str=, value=5678] +worker-2, get result 1 after expiration, [code=Storage::SUCCESS, error_str=, value=value1234] +worker-2, get result 2 after expiration, [code=Storage::KEY_NOT_FOUND, error_str=, value=] diff --git a/testing/btest/scripts/base/frameworks/storage/sqlite-cluster.zeek b/testing/btest/scripts/base/frameworks/storage/sqlite-cluster.zeek index 7d4f5db5e4..f06c536a24 100644 --- a/testing/btest/scripts/base/frameworks/storage/sqlite-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/storage/sqlite-cluster.zeek @@ -10,7 +10,7 @@ # @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -b %INPUT # @TEST-EXEC: btest-bg-run worker-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -b %INPUT -# @TEST-EXEC: btest-bg-wait -k 5 +# @TEST-EXEC: btest-bg-wait -k 10 # @TEST-EXEC: btest-diff worker-1/.stdout # @TEST-EXEC: btest-diff worker-2/.stdout # @TEST-EXEC: @@ -20,11 +20,18 @@ @load policy/frameworks/storage/backend/sqlite @load policy/frameworks/cluster/experimental +redef Storage::expire_interval = 2 secs; + global sqlite_data_written: event() &is_used; @if ( Cluster::local_node_type() == Cluster::WORKER ) global backend: opaque of Storage::BackendHandle; +global key1: string = "key1234"; +global value1: string = "value1234"; + +global key2: string = "key2345"; +global value2: string = "value2345"; event zeek_init() { @@ -40,13 +47,22 @@ event zeek_init() backend = open_res$value; } +event check_removed() + { + local res = Storage::Sync::get(backend, key1); + print Cluster::node, "get result 1 after expiration", res; + + res = Storage::Sync::get(backend, key2); + print Cluster::node, "get result 2 after expiration", res; + + Storage::Sync::close_backend(backend); + terminate(); + } + event sqlite_data_written() { print "sqlite_data_written"; - local res = Storage::Sync::get(backend, "1234"); - print Cluster::node, res; - Storage::Sync::close_backend(backend); - terminate(); + schedule 5secs { check_removed() }; } @else @@ -72,8 +88,11 @@ event sqlite_data_written() event Cluster::Experimental::cluster_started() { - local res = Storage::Sync::put(backend, [ $key="1234", $value="5678" ]); - print Cluster::node, "put result", res; + local res = Storage::Sync::put(backend, [ $key=key1, $value=value1 ]); + print Cluster::node, "put result 1", res; + + res = Storage::Sync::put(backend, [ $key=key2, $value=value2, $expire_time=2 sec ]); + print Cluster::node, "put result 2", res; local e = Cluster::make_event(sqlite_data_written); Cluster::publish(Cluster::manager_topic, e);