MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 11:18:51 +02:00
Code Issues Releases Wiki Activity

ircd::db: Lower the global write mutex to database instance member.

Browse source
This commit is contained in:
Jason Volk 2020-12-20 21:55:57 -08:00
parent 7bacbe82c7
commit 78cbd244c4
4 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/ircd/db/database.h
View file

@ -122,6 +122,7 @@ struct ircd::db::database
std::unique_ptr<rocksdb::DBOptions> opts;
std::unordered_map<string_view, std::shared_ptr<column>> column_names;
std::unique_ptr<rocksdb::DB> d;
ctx::mutex write_mutex;
std::vector<std::shared_ptr<column>> column_index; // indexed by cfid
std::list<std::shared_ptr<column>> columns; // active only
std::string uuid;

27
ircd/db.cc
View file

@ -96,14 +96,6 @@ ircd::db::request
"db req", request_pool_opts
};
/// This mutex is necessary to serialize entry into rocksdb's write impl
/// otherwise there's a risk of a deadlock if their internal pthread
/// mutexes are contended. This is because a few parts of rocksdb are
/// incorrectly using std::mutex directly when they ought to be using their
/// rocksdb::port wrapper.
decltype(ircd::db::write_mutex)
ircd::db::write_mutex;
///////////////////////////////////////////////////////////////////////////////
//
// init
@ -2582,7 +2574,11 @@ ircd::db::sort(column &column,
opts.allow_write_stall = now;
const ctx::uninterruptible::nothrow ui;
const std::lock_guard lock{write_mutex};
const std::lock_guard lock
{
d.write_mutex
};
log::debug
{
log, "[%s]'%s' @%lu FLUSH (sort) %s %s",
@ -2623,7 +2619,7 @@ ircd::db::compact(column &column,
const ctx::uninterruptible ui;
const std::lock_guard lock
{
write_mutex
d.write_mutex
};
const auto &to_level
@ -2770,13 +2766,12 @@ ircd::db::ingest(column &column,
// data which did actually exist but was physically removed.
const auto &copts{d.d->GetOptions(c)};
opts.ingest_behind = copts.allow_ingest_behind;
const std::vector<std::string> files
{
{ std::string{path} }
};
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible::nothrow ui;
throw_on_error
{
@ -2793,7 +2788,7 @@ ircd::db::del(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible::nothrow ui;
const ctx::stack_usage_assertion sua;
log::debug
@ -2819,7 +2814,7 @@ ircd::db::del(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible::nothrow ui;
const ctx::stack_usage_assertion sua;
log::debug
@ -2847,7 +2842,7 @@ ircd::db::write(column &column,
database::column &c(column);
auto opts(make_opts(sopts));
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible::nothrow ui;
const ctx::stack_usage_assertion sua;
log::debug
@ -4506,7 +4501,7 @@ ircd::db::commit(database &d,
ircd::timer timer;
#endif
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible ui;
const ctx::stack_usage_assertion sua;
throw_on_error

1
ircd/db.h
View file

@ -77,7 +77,6 @@ namespace ircd::db
extern conf::item<size_t> request_pool_stack_size;
extern ctx::pool::opts request_pool_opts;
extern ctx::pool request;
extern ctx::mutex write_mutex;
// reflections
string_view reflect(const rocksdb::Status::Code &);

14
ircd/db_database.cc
View file

@ -245,7 +245,11 @@ ircd::db::resume(database &d)
{
assert(d.d);
const ctx::uninterruptible::nothrow ui;
const std::lock_guard lock{write_mutex};
const std::lock_guard lock
{
d.write_mutex
};
const auto errors
{
db::errors(d)
@ -399,7 +403,7 @@ ircd::db::checkpoint(database &d)
name(d)
};
const std::lock_guard lock{write_mutex};
const std::lock_guard lock{d.write_mutex};
const ctx::uninterruptible::nothrow ui;
const auto seqnum
{
@ -1289,7 +1293,11 @@ ircd::db::database::~database()
noexcept try
{
const ctx::uninterruptible::nothrow ui;
const std::unique_lock lock{write_mutex};
const std::unique_lock lock
{
write_mutex
};
log::info
{
log, "[%s] closing database @ `%s'...",