RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 14:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-disk: fix mount options passed to move_mount

Browse Source 
Commit 6cbe0f021f added a mount_options but
in certain cases it may be blank.  Fill in with the defaults, just as we
do in mount().

Backport: cuttlefish
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-08-09 18:02:32 -07:00
parent b66a3d6029
commit cb50b5a7f1
1 changed files with 6 additions and 0 deletions

6
src/ceph-disk
View File

@ -1345,6 +1345,7 @@ def move_mount(
path,
cluster,
osd_id,
fstype,
mount_options,
):
LOG.debug('Moving mount to final location...')
@ -1355,6 +1356,10 @@ def move_mount(
)
maybe_mkdir(osd_data)
# pick best-of-breed mount options based on fs type
if mount_options is None:
mount_options = MOUNT_OPTIONS.get(fstype, '')
# we really want to mount --move, but that is not supported when
# the parent mount is shared, as it is by default on RH, Fedora,
# and probably others. Also, --bind doesn't properly manipulate
@ -1528,6 +1533,7 @@ def mount_activate(
path=path,
cluster=cluster,
osd_id=osd_id,
fstype=fstype,
mount_options=mount_options,
)
return (cluster, osd_id)