Adds configurable osd-journal-size option
Fixes: bug 1259919
This commit is contained in:
parent
0b11d065cb
commit
1b469dc0fa
11
config.yaml
11
config.yaml
|
@ -17,6 +17,17 @@ options:
|
||||||
no journal device will be used.
|
no journal device will be used.
|
||||||
.
|
.
|
||||||
Only supported with ceph >= 0.48.3.
|
Only supported with ceph >= 0.48.3.
|
||||||
|
osd-journal-size:
|
||||||
|
type: int
|
||||||
|
default: 1024
|
||||||
|
description: |
|
||||||
|
Ceph osd journal size. The journal size should be at least twice the
|
||||||
|
product of the expected drive speed multiplied by filestore max sync
|
||||||
|
interval. However, the most common practice is to partition the journal
|
||||||
|
drive (often an SSD), and mount it such that Ceph uses the entire
|
||||||
|
partition for the journal.
|
||||||
|
.
|
||||||
|
Only supported with ceph >= 0.48.3.
|
||||||
osd-format:
|
osd-format:
|
||||||
type: string
|
type: string
|
||||||
default: xfs
|
default: xfs
|
||||||
|
|
|
@ -70,7 +70,8 @@ def emit_cephconf():
|
||||||
'auth_supported': get_auth(),
|
'auth_supported': get_auth(),
|
||||||
'mon_hosts': ' '.join(mon_hosts),
|
'mon_hosts': ' '.join(mon_hosts),
|
||||||
'fsid': get_fsid(),
|
'fsid': get_fsid(),
|
||||||
'version': ceph.get_ceph_version()
|
'version': ceph.get_ceph_version(),
|
||||||
|
'osd_journal_size': config('osd-journal-size')
|
||||||
}
|
}
|
||||||
# Install ceph.conf as an alternative to support
|
# Install ceph.conf as an alternative to support
|
||||||
# co-existence with other charms that write this file
|
# co-existence with other charms that write this file
|
||||||
|
|
|
@ -18,6 +18,6 @@
|
||||||
|
|
||||||
[osd]
|
[osd]
|
||||||
keyring = /var/lib/ceph/osd/$cluster-$id/keyring
|
keyring = /var/lib/ceph/osd/$cluster-$id/keyring
|
||||||
osd journal size = 1000
|
osd journal size = {{ osd_journal_size }}
|
||||||
filestore xattr use omap = true
|
filestore xattr use omap = true
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue