Use df instead of findmnt in cephstorage upgrade scripts
There are scenarios in which findmnt will return a list of all
mounted filesystems, which causes the upgrade script to fail in
recognizing if the Ceph OSD is backed by ext4.
Change-Id: Iadebdc32b523c05216202b782ceb54bec4389413
Closes-Bug: #1649407
(cherry picked from commit 623c249782
)
This commit is contained in:
parent
7240998433
commit
1ef9187463
@ -76,7 +76,7 @@ elif [[ "$UPDATED_VERSION" =~ ^10\.2.* ]]; then
|
||||
# If on ext4, we need to enforce lower values for name and namespace len
|
||||
# or ceph-osd will refuse to start, see: http://tracker.ceph.com/issues/16187
|
||||
for OSD_ID in $OSD_IDS; do
|
||||
OSD_FS=$(findmnt -n -o FSTYPE -T /var/lib/ceph/osd/ceph-${OSD_ID})
|
||||
OSD_FS=$(df -l --output=fstype /var/lib/ceph/osd/ceph-${OSD_ID} | tail -n +2)
|
||||
if [ ${OSD_FS} = ext4 ]; then
|
||||
crudini --set /etc/ceph/ceph.conf global osd_max_object_name_len 256
|
||||
crudini --set /etc/ceph/ceph.conf global osd_max_object_namespace_len 64
|
||||
|
Loading…
Reference in New Issue
Block a user