From: Bjørnar Ness <bjornar.ness@gmail.com>
Date: Mon, 8 Jun 2015 22:42:01 +0000 (+0200)
Subject: Add rbd_concurrent_management_ops
X-Git-Tag: v1.0.0~211^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5ed377e4e7cdc3d595c4b9698ecc30ab64187b7;p=ceph-ansible.git

Add rbd_concurrent_management_ops
---

diff --git a/group_vars/all b/group_vars/all
index 8746d1ca3..c7edf2957 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -59,6 +59,10 @@ dummy:
 #max_open_files: 131072
 #disable_in_memory_logs: true
 
+## Client options
+#
+rbd_concurrent_management_ops: 20
+
 ## Monitor options
 #
 #monitor_interface: interface
diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index c0f21cf8d..05b3b482f 100644
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -70,6 +70,10 @@ debug_osd_level: 20
 enable_debug_mds: false
 debug_mds_level: 20
 
+## Client options
+#
+rbd_concurrent_management_ops: 20
+
 ## Monitor options
 #
 monitor_interface: interface
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index f576e3968..4082d634b 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -64,6 +64,7 @@
 [client]
   rbd cache = true
   rbd cache writethrough until flush = true
+  rbd concurrent management ops = {{ rbd_concurrent_management_ops }}
   admin socket = /var/run/ceph/$cluster-$type.$id.$pid.$cctid.asok # must be writable by QEMU and allowed by SELinux or AppArmor
   log file = {{ rbd_client_log_file }} # must be writable by QEMU and allowed by SELinux or AppArmor