openstack/swift
Code Issues Proposed changes

Remove nobarrier option

Browse Source 
XFS no longer supports nobarrier mount option.
It has been deprecated for a long time[1] and removed in
recent kernel versions resulting in an error when trying to
mount: "kernel: XFS (loop0): unknown mount option [nobarrier]."

[1] - https://patchwork.kernel.org/patch/9486549/

Change-Id: Iaa9208fb20545ae9ac990f0e180899108d983123
This commit is contained in:
Thiago da Silva 2019-06-18 14:47:39 +01:00
parent 761a16acba
commit 4ab3706b75
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/deployment_guide.rst
View File

@ -2336,7 +2336,7 @@ headroom.
The following example mount options are recommended when using XFS:: The following example mount options are recommended when using XFS::
mount -t xfs -o noatime,nodiratime,nobarrier,logbufs=8 -L D1 /srv/node/d1 mount -t xfs -o noatime,nodiratime,logbufs=8 -L D1 /srv/node/d1
We do not recommend running Swift on RAID, but if you are using We do not recommend running Swift on RAID, but if you are using
RAID it is also important to make sure that the proper sunit and swidth RAID it is also important to make sure that the proper sunit and swidth

4
doc/source/development_saio.rst
View File

@ -98,7 +98,7 @@ another device when creating the VM, and follow these instructions:
#. Edit ``/etc/fstab`` and add:: #. Edit ``/etc/fstab`` and add::
/dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,nobarrier,logbufs=8 0 0 /dev/sdb1 /mnt/sdb1 xfs noatime,nodiratime,logbufs=8 0 0
#. Create the mount point and the individualized links:: #. Create the mount point and the individualized links::
@ -158,7 +158,7 @@ these instructions:
#. Edit `/etc/fstab` and add:: #. Edit `/etc/fstab` and add::
/srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,nobarrier,logbufs=8 0 0 /srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,logbufs=8 0 0
#. Create the mount point and the individualized links:: #. Create the mount point and the individualized links::

4
doc/source/install/storage-install-obs.rst
View File

@ -53,8 +53,8 @@ storage nodes, you must prepare the storage devices.
.. code-block:: none .. code-block:: none
/dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
/dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
#. Mount the devices: #. Mount the devices:

4
doc/source/install/storage-install-rdo.rst
View File

@ -52,8 +52,8 @@ storage nodes, you must prepare the storage devices.
.. code-block:: none .. code-block:: none
/dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
/dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
#. Mount the devices: #. Mount the devices:

4
doc/source/install/storage-install-ubuntu-debian.rst
View File

@ -52,8 +52,8 @@ storage nodes, you must prepare the storage devices.
.. code-block:: none .. code-block:: none
/dev/sdb /srv/node/sdb xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdb /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2
/dev/sdc /srv/node/sdc xfs noatime,nodiratime,nobarrier,logbufs=8 0 2 /dev/sdc /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2
#. Mount the devices: #. Mount the devices:

2
test/unit/common/middleware/test_recon.py
View File

@ -514,7 +514,7 @@ class TestReconSuccess(TestCase):
'none /var/run tmpfs rw,nosuid,relatime,mode=755 0 0', 'none /var/run tmpfs rw,nosuid,relatime,mode=755 0 0',
'none /var/lock tmpfs rw,nosuid,nodev,noexec,relatime 0 0', 'none /var/lock tmpfs rw,nosuid,nodev,noexec,relatime 0 0',
'none /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0', 'none /lib/init/rw tmpfs rw,nosuid,relatime,mode=755 0 0',
'/dev/loop0 /mnt/sdb1 xfs rw,noatime,nodiratime,attr2,nobarrier,' '/dev/loop0 /mnt/sdb1 xfs rw,noatime,nodiratime,attr2,'
'logbufs=8,noquota 0 0', 'logbufs=8,noquota 0 0',
'rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0', 'rpc_pipefs /var/lib/nfs/rpc_pipefs rpc_pipefs rw,relatime 0 0',
'nfsd /proc/fs/nfsd nfsd rw,relatime 0 0', 'nfsd /proc/fs/nfsd nfsd rw,relatime 0 0',

2
tools/playbooks/multinode_setup/configure_loopback.yaml
View File

@ -31,7 +31,7 @@
state: directory state: directory
- name: mount /mnt/sdb1 - name: mount /mnt/sdb1
mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,nobarrier,logbufs=8" dump=0 passno=0 state=mounted mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted
- name: create sub-partitions - name: create sub-partitions
file: file:

2
tools/playbooks/saio_single_node_setup/setup_saio.yaml
View File

@ -29,7 +29,7 @@
file: path=/mnt/sdb1 state=directory file: path=/mnt/sdb1 state=directory
- name: mount /mnt/sdb1 - name: mount /mnt/sdb1
mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,nobarrier,logbufs=8" dump=0 passno=0 state=mounted mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted
- name: create sub-partitions - name: create sub-partitions
file: > file: >