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

ircd:Ⓜ️:init::backfill: Only ask the server which provided the unknown head for the event.

Browse source
This commit is contained in:
Jason Volk 2019-09-16 12:30:44 -07:00
parent a9b86c5594
commit c7de8aec82
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/m_init_backfill.cc
View file

@ -12,7 +12,7 @@
/// this code should be portable for a future when m::init is unstructured. /// this code should be portable for a future when m::init is unstructured.
struct ircd::m::init::backfill struct ircd::m::init::backfill
{ {
static bool handle_event(const room::id &, const event::id &, const string_view &hint); static bool handle_event(const room::id &, const event::id &, const string_view &hint, const bool &ask_one);
static void handle_missing(const room::id &); static void handle_missing(const room::id &);
static void handle_room(const room::id &); static void handle_room(const room::id &);
static void worker(); static void worker();
@ -348,7 +348,7 @@ try
} }
++fetching; ++fetching;
if(!handle_event(room_id, event_id, result.origin)) if(!handle_event(room_id, event_id, result.origin, true))
{ {
errors.emplace(event_id); errors.emplace(event_id);
return true; return true;
@ -440,7 +440,7 @@ try
min_depth, min_depth,
}; };
if(!handle_event(room_id, event_id, string_view{})) if(!handle_event(room_id, event_id, string_view{}, false))
fail.emplace_hint(it, event_id); fail.emplace_hint(it, event_id);
} }
@ -474,7 +474,8 @@ catch(const std::exception &e)
bool bool
ircd::m::init::backfill::handle_event(const room::id &room_id, ircd::m::init::backfill::handle_event(const room::id &room_id,
const event::id &event_id, const event::id &event_id,
const string_view &hint) const string_view &hint,
const bool &ask_hint_only)
try try
{ {
fetch::opts opts; fetch::opts opts;
@ -483,6 +484,7 @@ try
opts.event_id = event_id; opts.event_id = event_id;
opts.backfill_limit = 1; opts.backfill_limit = 1;
opts.hint = hint; opts.hint = hint;
opts.attempt_limit = ask_hint_only;
auto future auto future
{ {
fetch::start(opts) fetch::start(opts)