summaryrefslogtreecommitdiffstats
path: root/src/librbd/Journal.cc
diff options
context:
space:
mode:
authorMykola Golub <mgolub@mirantis.com>2016-07-27 13:06:42 +0200
committerMykola Golub <mgolub@mirantis.com>2016-09-05 07:51:54 +0200
commitb8eafefba9f2221a0ce927568795cb1c3ac0fa9c (patch)
treef277341cc84423d0d10b71002e093bb2840b0562 /src/librbd/Journal.cc
parentjournal: allow to trim journal for "laggy" clients (diff)
downloadceph-b8eafefba9f2221a0ce927568795cb1c3ac0fa9c.tar.xz
ceph-b8eafefba9f2221a0ce927568795cb1c3ac0fa9c.zip
librbd: optionally flag "laggy" journal clients disconnected
Fixes: http://tracker.ceph.com/issues/14738 Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Diffstat (limited to 'src/librbd/Journal.cc')
-rw-r--r--src/librbd/Journal.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/librbd/Journal.cc b/src/librbd/Journal.cc
index a82e84578c3..b6738c9ee99 100644
--- a/src/librbd/Journal.cc
+++ b/src/librbd/Journal.cc
@@ -1141,6 +1141,11 @@ void Journal<I>::create_journaler() {
::journal::Settings settings;
settings.commit_interval = m_image_ctx.journal_commit_age;
settings.max_payload_bytes = m_image_ctx.journal_max_payload_bytes;
+ settings.max_concurrent_object_sets =
+ m_image_ctx.journal_max_concurrent_object_sets;
+ // TODO: a configurable filter to exclude certain peers from being
+ // disconnected.
+ settings.whitelisted_laggy_clients = {IMAGE_CLIENT_ID};
m_journaler = new Journaler(m_work_queue, m_timer, m_timer_lock,
m_image_ctx.md_ctx, m_image_ctx.id,