RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd-nbd: don't abuse rbd_cache_writethrough_until_flush

Browse Source 
If rbd_cache and rbd_cache_writethrough_until_flush options are
set, do not use flush for internal purposes unless the user
issued flush, so it won't unintentionally enable writeback cache
when it is still unsafe.

Signed-off-by: Mykola Golub <mgolub@suse.com>
This commit is contained in:
Mykola Golub 2020-05-13 13:15:39 +01:00
parent a834e7115e
commit 2f700460fb
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tools/rbd_nbd/rbd-nbd.cc
View File

@ -168,13 +168,25 @@ public:
, writer_thread(*this, &NBDServer::writer_entry)
, quiesce_thread(*this, &NBDServer::quiesce_entry)
, started(false)
{}
{
std::vector<librbd::config_option_t> options;
image.config_list(&options);
for (auto &option : options) {
if ((option.name == std::string("rbd_cache") ||
option.name == std::string("rbd_cache_writethrough_until_flush")) &&
option.value == "false") {
allow_internal_flush = true;
break;
}
}
}
private:
ceph::mutex disconnect_lock =
ceph::make_mutex("NBDServer::DisconnectLocker");
ceph::condition_variable disconnect_cond;
std::atomic<bool> terminated = { false };
std::atomic<bool> allow_internal_flush = { false };
void shutdown()
{
@ -346,6 +358,7 @@ private:
break;
case NBD_CMD_FLUSH:
image.aio_flush(c);
allow_internal_flush = true;
break;
case NBD_CMD_TRIM:
image.aio_discard(pctx->request.from, pctx->request.len, c);
@ -418,6 +431,10 @@ signal:
}
void wait_inflight_io() {
if (!allow_internal_flush) {
return;
}
uint64_t features = 0;
image.features(&features);
if ((features & RBD_FEATURE_EXCLUSIVE_LOCK) != 0) {