MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-05-23 21:33:44 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:init::backfill: Improve info/errlog msg conditions.

Browse source
This commit is contained in:
Jason Volk 2020-06-12 19:24:18 -07:00
parent a948b5f00f
commit 356e2301e9
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
matrix/init_backfill.cc
View file

@ -14,6 +14,7 @@ namespace ircd::m::init::backfill
void handle_room(const room::id &);
void worker();
extern size_t count, complete;
extern ircd::run::changed handle_quit;
extern std::unique_ptr<context> worker_context;
extern ctx::pool *worker_pool;
@ -74,6 +75,12 @@ ircd::m::init::backfill::delay
{ "default", 15L },
};
decltype(ircd::m::init::backfill::count)
ircd::m::init::backfill::count;
decltype(ircd::m::init::backfill::complete)
ircd::m::init::backfill::complete;
decltype(ircd::m::init::backfill::worker_pool)
ircd::m::init::backfill::worker_pool;
@ -210,9 +217,8 @@ try
// worker; the submission blocks when all pool workers are busy, as per
// the pool::opts.
ctx::dock dock;
size_t count(0), complete(0);
const ctx::uninterruptible ui;
rooms::for_each(opts, [&pool, &count, &complete, &estimate, &dock]
rooms::for_each(opts, [&pool, &estimate, &dock]
(const room::id &room_id)
{
if(unlikely(ctx::interruption_requested()))
@ -221,7 +227,7 @@ try
++count;
pool([&, room_id(std::string(room_id))] // asynchronous
{
const unwind completed{[&complete, &dock]
const unwind completed{[&dock]
{
++complete;
dock.notify_one();
@ -253,32 +259,35 @@ try
// All rooms have been submitted to the pool but the pool workers might
// still be busy. If we unwind now the pool's dtor will kill the workers
// so we synchronize their completion here.
dock.wait([&complete, &count]
dock.wait([]
{
return complete >= count;
});
log::notice
{
log, "Initial resynchronization of %zu rooms completed.",
count,
};
if(count)
log::notice
{
log, "Initial resynchronization of %zu rooms completed.",
count,
};
}
catch(const ctx::interrupted &e)
{
log::derror
{
log, "Worker interrupted without completing resynchronization of all rooms."
};
if(count)
log::derror
{
log, "Worker interrupted without completing resynchronization of all rooms."
};
throw;
}
catch(const ctx::terminated &e)
{
log::error
{
log, "Worker terminated without completing resynchronization of all rooms."
};
if(count)
log::error
{
log, "Worker terminated without completing resynchronization of all rooms."
};
throw;
}