Add tunable to use object map for xattrs

Defaults to true if using ext4, false otherwise, and can be explicitly
overridden if desired.

diff --git a/group_vars/all.sample b/group_vars/all.sample
index 9b6d4cdcbee5a015cd37239d094bd16c9f8240c8..7f2bb7f8744afc57fe966bd7dd760941bf6cfc90 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -186,6 +186,13 @@ dummy:
 # Object backend
 #osd_objectstore: filestore
 
+# xattrs. by default, 'filestore xattr use omap' is set to 'true' if
+# 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can
+# be set to 'true' or 'false' to explicitly override those
+# defaults. Leave it 'null' to use the default for your chosen mkfs
+# type.
+# filestore_xattr_use_omap: null
+
 # Performance tuning
 #filestore_merge_threshold: 40
 #filestore_split_multiple: 8

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index ecaf45d5995b89ee8d7df9ef017927abd5d0a1ce..df341e939b29d62913a817266425ede2b86d0b90 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -198,6 +198,13 @@ osd_crush_update_on_start: "true"
 # Object backend\r
 osd_objectstore: filestore\r
 \r
+# xattrs. by default, 'filestore xattr use omap' is set to 'true' if\r
+# 'osd_mkfs_type' is set to 'ext4'; otherwise it isn't set. This can\r
+# be set to 'true' or 'false' to explicitly override those\r
+# defaults. Leave it 'null' to use the default for your chosen mkfs\r
+# type.\r
+filestore_xattr_use_omap: null\r
+\r
 # Performance tuning\r
 filestore_merge_threshold: 40\r
 filestore_split_multiple: 8\r

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index c348acff0fce4197901e416fddbba9bf1f92722d..b0c148f0661c4842244c2d58f02c583a9b3fa59f 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -114,6 +114,12 @@ filestore split multiple = {{ filestore_split_multiple }}
 osd op threads = {{ osd_op_threads }}
 filestore op threads = {{ filestore_op_threads }}
 filestore max sync interval = {{ filestore_max_sync_interval }}
+{% if filestore_xattr_use_omap != None %}
+filestore xattr use omap = {{ filestore_xattr_use_omap }}
+{% elif osd_mkfs_type == "ext4" %}
+filestore xattr use omap = true
+{# else, default is false #}
+{% endif %}
 osd max scrubs = {{ osd_max_scrubs }}
 {% if ceph_stable_release not in ['argonaut','bobtail','cuttlefish','dumpling','emperor','firefly','giant'] %}
 osd scrub begin hour = {{ osd_scrub_begin_hour }}