Merge remote-tracking branch 'origin/topic/johanna/table-changes'

* origin/topic/johanna/table-changes: (26 commits)
  TableSync: try to make test more robust & add debug output
  Increase timeouts to see if FreeBSD will be happy with this.
  Try to make FreeBSD test happy with larger timeout.
  TableSync: refactor common functionality into function
  TableSync: don't raise &on_change, smaller fixes
  TableSync: rename auto_store -> table_store
  SyncTables: address feedback part 1 - naming (broker and zeek)
  BrokerStore <-> Zeek Tables: cleanup and bug workaround
  Zeek Table<->Brokerstore: cleanup, documentation, small fixes
  BrokerStore<->Zeek table: adopt to recent Zeek API changes
  BrokerStore<->Zeek Tables Fix a few small test failures.
  BrokerStore<->Zeek tables: allow setting storage location & tests
  BrokerStore<->Zeek tables: &backend works for in-memory stores.
  BrokerStore<->Zeek table - introdude &backend attribute
  BrokerStore<->Zeek tables: test for clones synchronizing to a master
  BrokerStore<->Zeek tables: load persistent tables on startup.
  Brokerstore<->Tables: attribute conflicts
  Zeek/Brokerstore updates: expiration
  Zeek/Brokerstore updates: add test that includes updates from clones
  Zeek/Brokerstore updates: first working end-to-end test
  ...

testing/btest/Baseline/broker.store.brokerstore-attr-clone/clonetwo.out

@@ -0,0 +1,19 @@
+Peer added
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-clone/master.out

@@ -0,0 +1,38 @@
+Peer added 
+Peer added 
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-expire/clone.out

@@ -0,0 +1,19 @@
+Peer added
+Expiring s: expire_first
+Expiring t: b
+Expiring t: whatever
+Expiring t: a
+Expiring r: recb
+Expiring s: expire_later
+Expiring t: expire_later_in_t_not_with_a
+Expiring r: reca
+{
+
+}
+{
+
+}
+{
+
+}
+terminating

testing/btest/Baseline/broker.store.brokerstore-attr-persistence-clone/output1

@@ -0,0 +1,20 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 5
+}
+{
+I am really a set!,
+Believe me - I am a set,
+I am a set!
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-persistence-clone/output2

@@ -0,0 +1,20 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 5
+}
+{
+I am really a set!,
+Believe me - I am a set,
+I am a set!
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-persistence-clone/output3

@@ -0,0 +1,20 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 5
+}
+{
+I am really a set!,
+Believe me - I am a set,
+I am a set!
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-persistence/output1

@@ -0,0 +1,20 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 5
+}
+{
+I am really a set!,
+Believe me - I am a set,
+I am a set!
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-persistence/output2

@@ -0,0 +1,20 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 5
+}
+{
+I am really a set!,
+Believe me - I am a set,
+I am a set!
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-attr-simple/clone.out

@@ -0,0 +1,19 @@
+Peer added
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-invalid/.stderr

@@ -0,0 +1,5 @@
+error in /this/is/a/path/brokerstore-backend-invalid.zeek, line 12: &backend only supports one-element set/table indexes (&backend=Broker::MEMORY)
+error in /this/is/a/path/broker.store.brokerstore-backend-invalid/brokerstore-backend-invalid.zeek, line 13: &backend only supports atomic types as table value (&backend=Broker::MEMORY)
+error in /this/is/a/path/broker.store.brokerstore-backend-invalid/brokerstore-backend-invalid.zeek, line 14: &backend and &read_expire cannot be used simultaneously (&read_expire=5.0 secs, &backend=Broker::MEMORY)
+error in /this/is/a/path/broker.store.brokerstore-backend-invalid/brokerstore-backend-invalid.zeek, line 15: &backend and &broker_store cannot be used simultaneously (&broker_store=store, &backend=Broker::MEMORY)
+error in /this/is/a/path/broker.store.brokerstore-backend-invalid/brokerstore-backend-invalid.zeek, line 16: &backend only applicable to global sets/tables (&backend=Broker::MEMORY)

testing/btest/Baseline/broker.store.brokerstore-backend-simple-incompatible/worker-1..stderr

@@ -0,0 +1,3 @@
+error: ProcessStoreEvent Insert: could not convert value "b" for key "a" in store "___sync_store_TestModule::s" while receiving remote data. This probably means the tables have different types on different nodes.
+error: ProcessStoreEvent Insert: could not convert key "a" for store "___sync_store_TestModule::t" while receiving remote data. This probably means the tables have different types on different nodes.
+received termination signal

testing/btest/Baseline/broker.store.brokerstore-backend-simple-reverse/clone.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-simple-reverse/master.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-simple/clone.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-simple/master.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-sqlite-incompatible/.stderr

@@ -0,0 +1 @@
+error: Failed to convert key "a" while importing broker store to table for store "___sync_store_TestModule::t". Aborting import.

testing/btest/Baseline/broker.store.brokerstore-backend-sqlite/clone.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/broker.store.brokerstore-backend-sqlite/master.out

@@ -0,0 +1,18 @@
+{
+[b] = 3,
+[whatever] = 5,
+[a] = 3
+}
+{
+hi
+}
+{
+[b] = [a=2, b=d, c={
+elem1,
+elem2
+}],
+[a] = [a=1, b=c, c={
+elem1,
+elem2
+}]
+}

testing/btest/Baseline/coverage.init-default/missing_loads

@@ -1,3 +1,4 @@
+-./frameworks/cluster/broker-stores.zeek
 -./frameworks/cluster/nodes/logger.zeek
 -./frameworks/cluster/nodes/manager.zeek
 -./frameworks/cluster/nodes/proxy.zeek

testing/btest/broker/store/brokerstore-attr-clone.zeek

@@ -0,0 +1,159 @@
+# Start master and two clones. One clone changes table and the change ends up in master + other clone.
+
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: btest-bg-run master "zeek -B broker -b ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run cloneone "zeek -B broker -b ../cloneone.zeek >../cloneone.out"
+# @TEST-EXEC: btest-bg-run clonetwo "zeek -B broker -b ../clonetwo.zeek >../clonetwo.out"
+# @TEST-EXEC: btest-bg-wait 15
+#
+# @TEST-EXEC: btest-diff master.out
+# @TEST-EXEC: btest-diff clonetwo.out
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	tablestore = Broker::create_master("table");
+	setstore = Broker::create_master("set");
+	recordstore = Broker::create_master("rec");
+	}
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added ";
+  schedule 5secs { dump_tables() };
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+@TEST-END-FILE
+
+@TEST-START-FILE cloneone.zeek
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	}
+
+event send_stuff_over()
+	{
+	print "Inserting stuff";
+	t["a"] = 5;
+	delete t["a"];
+	add s["hi"];
+	t["a"] = 2;
+	t["a"] = 3;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+event killmeplease()
+	{
+	terminate();
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added", endpoint;
+	tablestore = Broker::create_clone("table");
+	setstore = Broker::create_clone("set");
+	recordstore = Broker::create_clone("rec");
+	schedule 2secs { send_stuff_over() };
+	schedule 5secs { killmeplease() };
+	}
+@TEST-END-FILE
+
+@TEST-START-FILE clonetwo.zeek
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	}
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added";
+	tablestore = Broker::create_clone("table");
+	setstore = Broker::create_clone("set");
+	recordstore = Broker::create_clone("rec");
+	schedule 5secs { dump_tables() };
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-attr-expire.zeek

@@ -0,0 +1,189 @@
+# So - this test currently is not really that great. The goal was to test expiration after
+# syncing values with Broker. However, it turns out that the delays introduced by Broker seem
+# a bit random - and too high to really test this without the test taking forever.
+#
+# so - instead we just check that expiries do indeed happen - however the ordering is not as
+# guaranteed as I would have liked to have it.
+
+
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: btest-bg-run master "zeek -B broker -b ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run clone "zeek -B broker -b ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-wait 20
+#
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff clone.out
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+redef table_expire_interval = 0.5sec;
+
+module TestModule;
+
+global start_time: time;
+
+function time_past(): interval
+	{
+	return network_time() - start_time;
+	}
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+function change_t(tbl: any, tpe: TableChange, idx: string, idxb: count)
+	{
+	if ( tpe == TABLE_ELEMENT_EXPIRED )
+		print fmt("Expiring t: %s", idx);
+	}
+
+function change_s(tbl: any, tpe: TableChange, idx: string, idbx: count)
+	{
+	if ( tpe == TABLE_ELEMENT_EXPIRED )
+		print fmt("Expiring s: %s", idx);
+	}
+
+function change_r(tbl: any, tpe: TableChange, idx: string, idxb: testrec)
+	{
+		if ( tpe == TABLE_ELEMENT_EXPIRED )
+			print fmt("Expiring r: %s", idx);
+	}
+
+function print_keys()
+	{
+	print "Printing keys";
+	when ( local s = Broker::keys(tablestore) )
+		{
+		print "keys", s;
+		}
+	timeout 2sec
+		{
+		print fmt("<timeout for print keys>");
+		}
+	}
+
+global t: table[string] of count &broker_store="table" &create_expire=4sec &on_change=change_t;
+global s: table[string] of count &broker_store="set" &write_expire=3sec &on_change=change_s;
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec" &write_expire=5sec &on_change=change_r;
+
+event zeek_init()
+	{
+	Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	tablestore = Broker::create_master("table");
+	setstore = Broker::create_master("set");
+	recordstore = Broker::create_master("rec");
+	}
+
+event update_stuff()
+	{
+	t["a"] = 3;
+	t["expire_later_in_t_not_with_a"] = 4;
+	s["expire_later"] = 2;
+	r["reca"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	}
+
+event insert_stuff()
+	{
+	print "Inserting stuff";
+	start_time = network_time();
+	t["a"] = 5;
+	delete t["a"];
+	s["expire_first"] = 0;
+	s["expire_later"] = 1;
+	t["a"] = 2;
+	t["b"] = 3;
+	t["whatever"] = 5;
+	r["reca"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["recb"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	schedule 1.5sec { update_stuff() };
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added ", endpoint;
+  schedule 3secs { insert_stuff() };
+	}
+
+event terminate_me()
+	{
+	print "Terminating";
+	terminate();
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print_keys();
+	schedule 3secs { terminate_me() };
+	}
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+redef table_expire_interval = 0.5sec;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+function change_t(tbl: any, tpe: TableChange, idx: string, idxb: count)
+	{
+	if ( tpe == TABLE_ELEMENT_EXPIRED )
+		print fmt("Expiring t: %s", idx);
+	}
+
+function change_s(tbl: any, tpe: TableChange, idx: string, idbx: count)
+	{
+	if ( tpe == TABLE_ELEMENT_EXPIRED )
+		print fmt("Expiring s: %s", idx);
+	}
+
+function change_r(tbl: any, tpe: TableChange, idx: string, idxb: testrec)
+	{
+		if ( tpe == TABLE_ELEMENT_EXPIRED )
+			print fmt("Expiring r: %s", idx);
+	}
+
+global t: table[string] of count &broker_store="table" &create_expire=4sec &on_change=change_t;
+global s: table[string] of count &broker_store="set" &write_expire=3sec &on_change=change_s;
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec" &write_expire=5sec &on_change=change_r;
+
+event zeek_init()
+	{
+	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	}
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	print "terminating";
+	terminate();
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added";
+	tablestore = Broker::create_clone("table");
+	setstore = Broker::create_clone("set");
+	recordstore = Broker::create_clone("rec");
+	schedule 15secs { dump_tables() };
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek

@@ -0,0 +1,141 @@
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: zeek -B broker -b one.zeek > output1
+# @TEST-EXEC: btest-bg-run master "cp ../*.sqlite . && zeek -B broker -b ../two.zeek >../output2"
+# @TEST-EXEC: btest-bg-run clone "zeek -B broker -b ../three.zeek >../output3"
+# @TEST-EXEC: btest-bg-wait 15
+
+# @TEST-EXEC: btest-diff output1
+# @TEST-EXEC: btest-diff output2
+# @TEST-EXEC: btest-diff output3
+# @TEST-EXEC: diff output1 output2
+# @TEST-EXEC: diff output2 output3
+
+# the first test writes out the sqlite files...
+
+@TEST-START-FILE one.zeek
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	tablestore = Broker::create_master("table", Broker::SQLITE);
+	setstore = Broker::create_master("set", Broker::SQLITE);
+	recordstore = Broker::create_master("rec", Broker::SQLITE);
+	t["a"] = 5;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	add s["I am a set!"];
+	add s["I am really a set!"];
+	add s["Believe me - I am a set"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+@TEST-END-FILE
+@TEST-START-FILE two.zeek
+
+# read in again - and serve to clones
+
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	tablestore = Broker::create_master("table", Broker::SQLITE);
+	setstore = Broker::create_master("set", Broker::SQLITE);
+	recordstore = Broker::create_master("rec", Broker::SQLITE);
+	print t;
+	print s;
+	print r;
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE three.zeek
+
+# get copy from master
+
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	}
+
+event print_me()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	tablestore = Broker::create_clone("table");
+	setstore = Broker::create_clone("set");
+	recordstore = Broker::create_clone("rec");
+	schedule 2sec { print_me() };
+	}
+
+
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-attr-persistence.zeek

@@ -0,0 +1,80 @@
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: zeek -B broker -b one.zeek > output1
+# @TEST-EXEC: zeek -B broker -b two.zeek > output2
+# @TEST-EXEC: btest-diff output1
+# @TEST-EXEC: btest-diff output2
+# @TEST-EXEC: diff output1 output2
+
+# the first test writes out the sqlite files...
+
+@TEST-START-FILE one.zeek
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	tablestore = Broker::create_master("table", Broker::SQLITE);
+	setstore = Broker::create_master("set", Broker::SQLITE);
+	recordstore = Broker::create_master("rec", Broker::SQLITE);
+	t["a"] = 5;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	add s["I am a set!"];
+	add s["I am really a set!"];
+	add s["Believe me - I am a set"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+@TEST-END-FILE
+@TEST-START-FILE two.zeek
+
+# the second one reads them in again
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	tablestore = Broker::create_master("table", Broker::SQLITE);
+	setstore = Broker::create_master("set", Broker::SQLITE);
+	recordstore = Broker::create_master("rec", Broker::SQLITE);
+	print t;
+	print s;
+	print r;
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-attr-simple.zeek

@@ -0,0 +1,109 @@
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: btest-bg-run master "zeek -B broker -b ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run clone "zeek -B broker -b ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-wait 15
+#
+# @TEST-EXEC: btest-diff clone.out
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::listen("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	tablestore = Broker::create_master("table");
+	setstore = Broker::create_master("set");
+	recordstore = Broker::create_master("rec");
+	}
+
+event insert_stuff()
+	{
+	print "Inserting stuff";
+	t["a"] = 5;
+	delete t["a"];
+	add s["hi"];
+	t["a"] = 2;
+	t["a"] = 3;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added ", endpoint;
+  schedule 3secs { insert_stuff() };
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+
+module TestModule;
+
+global tablestore: opaque of Broker::Store;
+global setstore: opaque of Broker::Store;
+global recordstore: opaque of Broker::Store;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &broker_store="table";
+global s: set[string] &broker_store="set";
+global r: table[string] of testrec &broker_allow_complex_type &broker_store="rec";
+
+event zeek_init()
+	{
+	Broker::peer("127.0.0.1", to_port(getenv("BROKER_PORT")));
+	}
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	print "Peer added";
+	tablestore = Broker::create_clone("table");
+	setstore = Broker::create_clone("set");
+	recordstore = Broker::create_clone("rec");
+	schedule 5secs { dump_tables() };
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-backend-invalid.zeek

@@ -0,0 +1,16 @@
+# @TEST-EXEC-FAIL: zeek -B broker %INPUT
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global a: table[string, count] of count &backend=Broker::MEMORY;
+global b: table[string] of testrec &backend=Broker::MEMORY;
+global c: table[string] of count &read_expire=5sec &backend=Broker::MEMORY;
+global d: table[string] of count &broker_store="store" &backend=Broker::MEMORY;
+global f: count &backend=Broker::MEMORY;

testing/btest/broker/store/brokerstore-backend-simple-incompatible.zeek

@@ -0,0 +1,67 @@
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: BROKER_PORT2
+# @TEST-PORT: BROKER_PORT3
+
+# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -B broker ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -B broker ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -B broker ../clone.zeek >../clone2.out"
+# @TEST-EXEC: btest-bg-wait 15
+#
+# @TEST-EXEC: btest-diff worker-1/.stderr
+
+@TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $interface="eth0"],
+};
+@TEST-END-FILE
+
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: table[string] of string &backend=Broker::MEMORY;
+
+event zeek_init()
+	{
+	t["a"] = 5;
+	s["a"] = "b";
+	print t;
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+global t: table[count] of count &backend=Broker::MEMORY;
+global s: table[string] of count &backend=Broker::MEMORY;
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	terminate();
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	#print "node up", name;
+	schedule 4secs { dump_tables() };
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-backend-simple-reverse.zeek

@@ -0,0 +1,158 @@
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: BROKER_PORT2
+# @TEST-PORT: BROKER_PORT3
+
+# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -B broker ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -B broker ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -B broker ../clone2.zeek >../clone2.out"
+# @TEST-EXEC: btest-bg-wait 40
+#
+# @TEST-EXEC: btest-diff master.out
+# @TEST-EXEC: btest-diff clone.out
+# @TEST-EXEC: diff master.out clone.out
+# @TEST-EXEC: diff master.out clone2.out
+
+@TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $interface="eth0"],
+};
+@TEST-END-FILE
+
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+global terminate_count = 0;
+
+event zeek_init()
+	{
+	}
+
+event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string) &priority=1
+	{
+	Reporter::info(fmt("Peer added: %s", cat(endpoint)));
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	Reporter::info(fmt("Peer lost: %s", cat(endpoint)));
+	terminate_count += 1;
+	if ( terminate_count == 2)
+		{
+		terminate();
+		print t;
+		print s;
+		print r;
+		}
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+event terminate_me()
+	{
+	terminate();
+	}
+
+event dump_tables()
+	{
+	t["a"] = 5;
+	delete t["a"];
+	add s["hi"];
+	t["a"] = 2;
+	t["a"] = 3;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	schedule 10sec { terminate_me() };
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	Reporter::info(fmt("Node Up: %s", name));
+	schedule 5secs { dump_tables() };
+	}
+
+event Broker::announce_masters(masters: set[string])
+	{
+	Reporter::info(fmt("Received announce_masters: %s", cat(masters)));
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone2.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Broker::announce_masters(masters: set[string])
+	{
+	Reporter::info(fmt("Received announce_masters: %s", cat(masters)));
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	Reporter::info(fmt("Node Up: %s", name));
+	schedule 20secs { dump_tables() };
+	}
+@TEST-END-FILE
+

testing/btest/broker/store/brokerstore-backend-simple.zeek

@@ -0,0 +1,98 @@
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: BROKER_PORT2
+# @TEST-PORT: BROKER_PORT3
+
+# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -B broker ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -B broker ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -B broker ../clone.zeek >../clone2.out"
+# @TEST-EXEC: btest-bg-wait 15
+#
+# @TEST-EXEC: btest-diff master.out
+# @TEST-EXEC: btest-diff clone.out
+# @TEST-EXEC: diff master.out clone.out
+# @TEST-EXEC: diff master.out clone2.out
+
+@TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $interface="eth0"],
+};
+@TEST-END-FILE
+
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+event zeek_init()
+	{
+	t["a"] = 5;
+	delete t["a"];
+	add s["hi"];
+	t["a"] = 2;
+	t["a"] = 3;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	#print "node up", name;
+	schedule 4secs { dump_tables() };
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-backend-sqlite-incompatible.zeek

@@ -0,0 +1,38 @@
+# @TEST-PORT: BROKER_PORT
+
+# @TEST-EXEC: zeek -B broker -b one.zeek > output1
+# @TEST-EXEC-FAIL: zeek -B broker -b two.zeek > output2
+# @TEST-EXEC: btest-diff .stderr
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+
+# the first test writes out the sqlite files...
+
+@TEST-START-FILE one.zeek
+
+module TestModule;
+
+global t: table[string] of string &backend=Broker::SQLITE;
+
+event zeek_init()
+	{
+	t["a"] = "a";
+	t["b"] = "b";
+	t["c"] = "c";
+	print t;
+	}
+
+@TEST-END-FILE
+@TEST-START-FILE two.zeek
+
+# the second one reads them in again. Or not because the types are incompatible.
+
+module TestModule;
+
+global t: table[count] of count &backend=Broker::SQLITE;
+
+
+event zeek_init()
+	{
+	print t;
+	}
+@TEST-END-FILE

testing/btest/broker/store/brokerstore-backend-sqlite.zeek

@@ -0,0 +1,129 @@
+# @TEST-PORT: BROKER_PORT1
+# @TEST-PORT: BROKER_PORT2
+# @TEST-PORT: BROKER_PORT3
+
+# @TEST-EXEC: zeek preseed-sqlite.zeek;
+# @TEST-EXEC: btest-bg-run manager-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -B broker ../master.zeek >../master.out"
+# @TEST-EXEC: btest-bg-run worker-1 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek -B broker ../clone.zeek >../clone.out"
+# @TEST-EXEC: btest-bg-run worker-2 "ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-2 zeek -B broker ../clone.zeek >../clone2.out"
+# @TEST-EXEC: btest-bg-wait 40
+#
+# @TEST-EXEC: btest-diff master.out
+# @TEST-EXEC: btest-diff clone.out
+# @TEST-EXEC: diff master.out clone.out
+# @TEST-EXEC: diff master.out clone2.out
+
+@TEST-START-FILE cluster-layout.zeek
+redef Cluster::nodes = {
+	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
+	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1", $interface="eth0"],
+	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1", $interface="eth0"],
+};
+@TEST-END-FILE
+
+@TEST-START-FILE preseed-sqlite.zeek
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::SQLITE;
+global s: set[string] &backend=Broker::SQLITE;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::SQLITE;
+
+event zeek_init()
+	{
+	t["a"] = 5;
+	delete t["a"];
+	add s["hi"];
+	t["a"] = 2;
+	t["a"] = 3;
+	t["b"] = 3;
+	t["c"] = 4;
+	t["whatever"] = 5;
+	delete t["c"];
+	r["a"] = testrec($a=1, $b="b", $c=set("elem1", "elem2"));
+	r["a"] = testrec($a=1, $b="c", $c=set("elem1", "elem2"));
+	r["b"] = testrec($a=2, $b="d", $c=set("elem1", "elem2"));
+	print t;
+	print s;
+	print r;
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE master.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+function change_function(t: table[string] of count, tpe: TableChange, idxa: string, val: count)
+	{
+	print "This should not print";
+	print "change_function", idxa, val, tpe;
+	}
+
+global t: table[string] of count &backend=Broker::SQLITE &on_change=change_function;
+global s: set[string] &backend=Broker::SQLITE;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::SQLITE;
+
+redef Broker::table_store_db_directory = "..";
+
+event zeek_init()
+	{
+	print t;
+	print s;
+	print r;
+	}
+
+event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
+	{
+	terminate();
+	}
+
+@TEST-END-FILE
+
+@TEST-START-FILE clone.zeek
+redef exit_only_after_terminate = T;
+redef Log::enable_local_logging = T;
+redef Log::default_rotation_interval = 0secs;
+
+module TestModule;
+
+type testrec: record {
+	a: count;
+	b: string;
+	c: set[string];
+};
+
+global t: table[string] of count &backend=Broker::MEMORY;
+global s: set[string] &backend=Broker::MEMORY;
+global r: table[string] of testrec &broker_allow_complex_type &backend=Broker::MEMORY;
+
+
+event dump_tables()
+	{
+	print t;
+	print s;
+	print r;
+	terminate();
+	}
+
+event Cluster::node_up(name: string, id: string)
+	{
+	#print "node up", name;
+	schedule 15secs { dump_tables() };
+	}
+@TEST-END-FILE