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

Make &broker_store take argument of type string.

Browse source 
It turns out that directly passing a Broker::Store is not really a
bright idea. Because - if we do that - we have to later try to intercept
when the master/clone is generated to figure out what the actual name of
the backing store is.

Turns out that it is much easier to just use the name directly - and
check if a store with that name exists when we want to insert something.

I might want to reconsider this in the future in any case. At the moment
this approach just stores one table into an entire store. In theory, one
store should be able to handle several tables, but... that's more
complex. So let's start with this for now.
This commit is contained in:
Johanna Amann 2020-05-28 12:26:58 -07:00
parent 031f0cac05
commit 8db83a5ed2
8 changed files with 88 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/broker/Manager.cc
View file

@ -212,6 +212,8 @@ void Manager::InitPostScript()
reporter->FatalError("Failed to register broker subscriber with iosource_mgr");
if ( ! iosource_mgr->RegisterFd(bstate->status_subscriber.fd(), this) )
reporter->FatalError("Failed to register broker status subscriber with iosource_mgr");
bstate->subscriber.add_topic(broker::topics::store_events, true);
}
void Manager::Terminate()
@ -905,6 +907,20 @@ void Manager::Process()
auto& topic = broker::get_topic(message);
auto& msg = broker::get_data(message);
if ( topic == broker::topics::store_events )
{
if (auto insert = broker::store_event::insert::make(msg))
{
reporter->Warning("It is an insert!");
reporter->Warning("Key/Data (endpoint): %s/%s (%s)", to_string(insert.key()).c_str(), to_string(insert.value()).c_str(), to_string(insert.publisher()).c_str());
}
else
{
reporter->Warning("Unhandled event type");
}
continue;
}
try
{
DispatchMessage(topic, std::move(msg));
@ -1449,6 +1465,7 @@ StoreHandleVal* Manager::MakeMaster(const string& name, broker::backend type,
data_stores.emplace(name, handle);
iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this);
CheckForwarding(name);
if ( bstate->endpoint.use_real_time() )
return handle;
@ -1486,7 +1503,7 @@ StoreHandleVal* Manager::MakeClone(const string& name, double resync_interval,
data_stores.emplace(name, handle);
iosource_mgr->RegisterFd(handle->proxy.mailbox().descriptor(), this);
CheckForwarding(name);
return handle;
}
@ -1504,6 +1521,9 @@ bool Manager::CloseStore(const string& name)
if ( s == data_stores.end() )
return false;
auto pubid = s->second->store.frontend_id();
forwarded_ids.erase(pubid);
iosource_mgr->UnregisterFd(s->second->proxy.mailbox().descriptor(), this);
for ( auto i = pending_queries.begin(); i != pending_queries.end(); )
@ -1546,4 +1566,34 @@ const Stats& Manager::GetStatistics()
return statistics;
}
bool Manager::AddForwardedStore(const std::string& name, IntrusivePtr<TableVal> table)
{
if ( forwarded_stores.find(name) != forwarded_stores.end() )
{
reporter->Error("same &broker_store %s specified for two different variables", name.c_str());
return false;
}
DBG_LOG(DBG_BROKER, "Adding table forward for data store %s", name.c_str());
forwarded_stores.emplace(name, table);
CheckForwarding(name);
return true;
}
void Manager::CheckForwarding(const std::string &name)
{
auto handle = LookupStore(name);
if ( ! handle )
return;
if ( forwarded_stores.find(name) == forwarded_stores.end() )
return;
auto pubid = handle->store.frontend_id();
DBG_LOG(DBG_BROKER, "Resolved publishder %s for table forward for data store %s", to_string(pubid).c_str(), name.c_str());
forwarded_ids.emplace(pubid, forwarded_stores.at(name));
}
} // namespace bro_broker