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

cluster/zeromq: Fix node_topic() and nodeid_topic()

Browse source 
Due to prefix matching, worker-1's node_topic() also matched worker-10,
worker-11, etc. Suffix the node topic with a `.`. The original implementation
came from NATS, where subjects are separated by `.`.

Adapt nodeid_topic() for consistency.
This commit is contained in:
Arne Welzel 2025-03-16 14:56:27 +01:00
parent 26441e0c24
commit 2963c49f27
8 changed files with 168 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/policy/frameworks/cluster/backend/zeromq/main.zeek
View file

@ -226,11 +226,11 @@ redef Cluster::backend = Cluster::CLUSTER_BACKEND_ZEROMQ;
redef run_proxy_thread = Cluster::local_node_type() == Cluster::MANAGER;
function zeromq_node_topic(name: string): string {
return node_topic_prefix + "." + name;
return node_topic_prefix + "." + name + ".";
}
function zeromq_nodeid_topic(id: string): string {
return nodeid_topic_prefix + "." + id;
return nodeid_topic_prefix + "." + id + ".";
}
# Unique identifier for this node with some debug information.
@ -345,7 +345,7 @@ event Cluster::Backend::ZeroMQ::subscription(topic: string)
if ( ! starts_with(topic, prefix) )
return;
local nodeid = topic[|prefix|:];
local nodeid = topic[|prefix|:][:-1];
# Do not say hello to ourselves - we won't see it anyhow.
if ( nodeid == Cluster::node_id() )
@ -417,7 +417,7 @@ event Cluster::Backend::ZeroMQ::unsubscription(topic: string)
if ( ! starts_with(topic, prefix) )
return;
local gone_node_id = topic[|prefix|:];
local gone_node_id = topic[|prefix|:][:-1];
local name = "";
for ( node_name, n in Cluster::nodes ) {
if ( n?$id && n$id == gone_node_id ) {