mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 14:48:21 +00:00
Remove old cluster start tests.
These tests should be redundant to the cluster_started tests found in policy/frameworks/cluster.
This commit is contained in:
Jan Grashoefer
parent
8f262df192
commit
4ddf7562b9
13 changed files with 0 additions and 240 deletions
|
|
@ -1,13 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
### NOTE: This file has been sorted with diff-sort.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
got fully_connected event from, manager-1
|
|
||||||
got fully_connected event from, proxy-1
|
|
||||||
got fully_connected event from, proxy-2
|
|
||||||
got fully_connected event from, worker-1
|
|
||||||
got fully_connected event from, worker-2
|
|
||||||
termination condition met: shutting down
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
sent fully_connected event
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
sent fully_connected event
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
sent fully_connected event
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
sent fully_connected event
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
sent fully_connected event
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
### NOTE: This file has been sorted with diff-sort.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Got fully_connected event
|
|
||||||
Got fully_connected event
|
|
||||||
Got fully_connected event
|
|
||||||
Got fully_connected event
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
Connected to a peer
|
|
||||||
|
|
@ -1,93 +0,0 @@
|
||||||
# @TEST-PORT: BROKER_PORT1
|
|
||||||
# @TEST-PORT: BROKER_PORT2
|
|
||||||
# @TEST-PORT: BROKER_PORT3
|
|
||||||
# @TEST-PORT: BROKER_PORT4
|
|
||||||
# @TEST-PORT: BROKER_PORT5
|
|
||||||
# @TEST-PORT: BROKER_PORT6
|
|
||||||
#
|
|
||||||
# @TEST-EXEC: btest-bg-run logger-1 CLUSTER_NODE=logger-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run manager-1 CLUSTER_NODE=manager-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run proxy-1 CLUSTER_NODE=proxy-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run proxy-2 CLUSTER_NODE=proxy-2 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run worker-1 CLUSTER_NODE=worker-1 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run worker-2 CLUSTER_NODE=worker-2 ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-wait 40
|
|
||||||
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff logger-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff manager-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff proxy-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff proxy-2/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff worker-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff worker-2/.stdout
|
|
||||||
|
|
||||||
@load base/frameworks/cluster
|
|
||||||
|
|
||||||
@TEST-START-FILE cluster-layout.zeek
|
|
||||||
redef Cluster::manager_is_logger = F;
|
|
||||||
redef Cluster::nodes = {
|
|
||||||
["logger-1"] = [$node_type=Cluster::LOGGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
|
|
||||||
["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))],
|
|
||||||
["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
|
|
||||||
["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1"],
|
|
||||||
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1", $interface="eth0"],
|
|
||||||
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT6")), $manager="manager-1", $interface="eth1"],
|
|
||||||
};
|
|
||||||
@TEST-END-FILE
|
|
||||||
|
|
||||||
global peer_count = 0;
|
|
||||||
|
|
||||||
global fully_connected_nodes = 0;
|
|
||||||
|
|
||||||
event fully_connected(n: string)
|
|
||||||
{
|
|
||||||
++fully_connected_nodes;
|
|
||||||
|
|
||||||
if ( Cluster::node == "logger-1" )
|
|
||||||
{
|
|
||||||
print "got fully_connected event from", n;
|
|
||||||
|
|
||||||
if ( peer_count == 5 && fully_connected_nodes == 5 )
|
|
||||||
{
|
|
||||||
print "termination condition met: shutting down";
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
print "sent fully_connected event";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event zeek_init()
|
|
||||||
{
|
|
||||||
Broker::auto_publish(Cluster::logger_topic, fully_connected);
|
|
||||||
}
|
|
||||||
|
|
||||||
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
|
|
||||||
{
|
|
||||||
print "Connected to a peer";
|
|
||||||
++peer_count;
|
|
||||||
|
|
||||||
if ( Cluster::node == "logger-1" )
|
|
||||||
{
|
|
||||||
if ( peer_count == 5 && fully_connected_nodes == 5 )
|
|
||||||
{
|
|
||||||
print "termination condition met: shutting down";
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if ( Cluster::node == "manager-1" )
|
|
||||||
{
|
|
||||||
if ( peer_count == 5 )
|
|
||||||
event fully_connected(Cluster::node);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( peer_count == 4 )
|
|
||||||
event fully_connected(Cluster::node);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
|
|
||||||
{
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
# @TEST-PORT: BROKER_PORT1
|
|
||||||
# @TEST-PORT: BROKER_PORT2
|
|
||||||
# @TEST-PORT: BROKER_PORT3
|
|
||||||
# @TEST-PORT: BROKER_PORT4
|
|
||||||
# @TEST-PORT: BROKER_PORT5
|
|
||||||
#
|
|
||||||
# @TEST-EXEC: btest-bg-run manager-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager-1 zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run proxy-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-1 zeek -b %INPUT
|
|
||||||
# @TEST-EXEC: btest-bg-run proxy-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=proxy-2 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 40
|
|
||||||
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff manager-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff proxy-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff proxy-2/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff worker-1/.stdout
|
|
||||||
# @TEST-EXEC: btest-diff worker-2/.stdout
|
|
||||||
|
|
||||||
@load base/frameworks/cluster
|
|
||||||
|
|
||||||
@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"))],
|
|
||||||
["proxy-1"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
|
|
||||||
["proxy-2"] = [$node_type=Cluster::PROXY, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
|
|
||||||
["worker-1"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager-1", $interface="eth0"],
|
|
||||||
["worker-2"] = [$node_type=Cluster::WORKER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT5")), $manager="manager-1", $interface="eth1"],
|
|
||||||
};
|
|
||||||
@TEST-END-FILE
|
|
||||||
|
|
||||||
global fully_connected: event();
|
|
||||||
|
|
||||||
global peer_count = 0;
|
|
||||||
|
|
||||||
global fully_connected_nodes = 0;
|
|
||||||
|
|
||||||
event fully_connected()
|
|
||||||
{
|
|
||||||
if ( ! is_remote_event() )
|
|
||||||
return;
|
|
||||||
|
|
||||||
print "Got fully_connected event";
|
|
||||||
fully_connected_nodes = fully_connected_nodes + 1;
|
|
||||||
|
|
||||||
if ( Cluster::node == "manager-1" )
|
|
||||||
{
|
|
||||||
if ( peer_count == 4 && fully_connected_nodes == 4 )
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event zeek_init()
|
|
||||||
{
|
|
||||||
Broker::auto_publish(Cluster::manager_topic, fully_connected);
|
|
||||||
}
|
|
||||||
|
|
||||||
event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
|
|
||||||
{
|
|
||||||
print "Connected to a peer";
|
|
||||||
peer_count = peer_count + 1;
|
|
||||||
|
|
||||||
if ( Cluster::node == "manager-1" )
|
|
||||||
{
|
|
||||||
if ( peer_count == 4 && fully_connected_nodes == 4 )
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ( peer_count == 3 )
|
|
||||||
event fully_connected();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
event Broker::peer_lost(endpoint: Broker::EndpointInfo, msg: string)
|
|
||||||
{
|
|
||||||
terminate();
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue