MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:roomstrap: Remove redundant parallel key fetching subroutine.

Browse source
This commit is contained in:
Jason Volk 2020-09-16 04:04:48 -07:00
parent 03b6261dd8
commit d4677e2a29
1 changed files with 0 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
matrix/room_bootstrap.cc
View file

@ -16,7 +16,6 @@ namespace ircd::m::roomstrap
static event::id::buf make_join(const string_view &host, const room::id &, const user::id &, const mutable_buffer &); static event::id::buf make_join(const string_view &host, const room::id &, const user::id &, const mutable_buffer &);
static send_join_response send_join(const string_view &host, const room::id &, const event::id &, const json::object &event); static send_join_response send_join(const string_view &host, const room::id &, const event::id &, const json::object &event);
static void broadcast_join(const room &, const event &, const string_view &exclude); static void broadcast_join(const room &, const event &, const string_view &exclude);
static void fetch_keys(const json::array &events);
static void eval_auth_chain(const json::array &auth_chain, vm::opts); static void eval_auth_chain(const json::array &auth_chain, vm::opts);
static void eval_state(const json::array &state, vm::opts); static void eval_state(const json::array &state, vm::opts);
static void backfill(const string_view &host, const room::id &, const event::id &, vm::opts); static void backfill(const string_view &host, const room::id &, const event::id &, vm::opts);
@ -262,12 +261,8 @@ try
vmopts.phase.reset(m::vm::phase::FETCH_STATE); vmopts.phase.reset(m::vm::phase::FETCH_STATE);
vmopts.notify_servers = false; vmopts.notify_servers = false;
m::roomstrap::fetch_keys(auth_chain);
m::roomstrap::eval_auth_chain(auth_chain, vmopts); m::roomstrap::eval_auth_chain(auth_chain, vmopts);
m::roomstrap::fetch_keys(state);
m::roomstrap::eval_state(state, vmopts); m::roomstrap::eval_state(state, vmopts);
m::roomstrap::backfill(host, room_id, event_id, vmopts); m::roomstrap::backfill(host, room_id, event_id, vmopts);
// After we just received and processed all of this state with only a // After we just received and processed all of this state with only a
@ -565,56 +560,6 @@ catch(const std::exception &e)
throw; throw;
} }
void
ircd::m::roomstrap::fetch_keys(const json::array &events)
try
{
std::vector<m::fed::key::server_key> queries;
queries.reserve(events.size());
for(const json::object event : events)
for(const auto &[server_name, signatures] : json::object(event["signatures"]))
for(const auto &[key_id, signature] : json::object(signatures))
queries.emplace_back(unquote(event.at("origin")), key_id);
std::sort(begin(queries), end(queries));
queries.erase(std::unique(begin(queries), end(queries)), end(queries));
log::info
{
log, "Fetching %zu keys for %zu events...",
queries.size(),
events.size(),
};
const size_t fetched
{
m::keys::fetch(queries)
};
log::info
{
log, "Fetched %zu of %zu keys for %zu events",
fetched,
queries.size(),
events.size(),
};
}
catch(const std::exception &e)
{
log::error
{
log, "Error when fetching keys for %zu events :%s",
events.size(),
};
// All errors for the parallel key fetch are logged and then suppressed
// here. This operation is an optimization; if there's an unexpected
// failure here keys will just be fetched in the eval loop and bootstrap
// will just be really slow.
//throw;
}
ircd::m::roomstrap::send_join_response ircd::m::roomstrap::send_join_response
ircd::m::roomstrap::send_join(const string_view &host, ircd::m::roomstrap::send_join(const string_view &host,
const m::room::id &room_id, const m::room::id &room_id,