From 62053e66e28560726d5502ed55c8d5baa79ae083 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 30 Nov 2018 17:40:19 -0800 Subject: [PATCH] ircd::db: Minor interruption point tweaks. --- ircd/db.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ircd/db.cc b/ircd/db.cc index 19e249614..2040ec9b7 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -442,8 +442,8 @@ ircd::db::checkpoint(database &d) name(d) }; - const ctx::uninterruptible::nothrow ui; const std::lock_guard lock{write_mutex}; + const ctx::uninterruptible::nothrow ui; const auto seqnum { sequence(d) @@ -9773,7 +9773,7 @@ ircd::db::seek(database::column &c, const rocksdb::ReadOptions &opts, std::unique_ptr &it) { - const ctx::uninterruptible ui; + const ctx::uninterruptible::nothrow ui; if(!it) { @@ -9966,7 +9966,6 @@ ircd::db::insert(rocksdb::Cache &cache, const string_view &key, unique_buffer value) { - const ctx::uninterruptible ui; const size_t value_size { size(value) @@ -10153,7 +10152,8 @@ ircd::db::column_names(const std::string &path, const rocksdb::DBOptions &opts) try { - const ctx::uninterruptible ui; + const ctx::uninterruptible::nothrow ui; + std::vector ret; throw_on_error {