diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst index c2a90ae052..3a558f370a 100644 --- a/doc/source/deployment_guide.rst +++ b/doc/source/deployment_guide.rst @@ -2331,7 +2331,7 @@ headroom. The following example mount options are recommended when using XFS:: - mount -t xfs -o noatime,nodiratime,logbufs=8 -L D1 /srv/node/d1 + mount -t xfs -o noatime -L D1 /srv/node/d1 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 diff --git a/doc/source/development_saio.rst b/doc/source/development_saio.rst index efb6e01231..61f6159459 100644 --- a/doc/source/development_saio.rst +++ b/doc/source/development_saio.rst @@ -141,7 +141,7 @@ another device when creating the VM, and follow these instructions: #. Edit ``/etc/fstab`` and add:: - UUID="" /mnt/sdb1 xfs noatime,nodiratime,logbufs=8 0 0 + UUID="" /mnt/sdb1 xfs noatime 0 0 #. Create the Swift data mount point and test that mounting works:: @@ -169,7 +169,7 @@ these instructions: #. Edit `/etc/fstab` and add:: - /srv/swift-disk /mnt/sdb1 xfs loop,noatime,nodiratime,logbufs=8 0 0 + /srv/swift-disk /mnt/sdb1 xfs loop,noatime 0 0 #. Create the Swift data mount point and test that mounting works:: @@ -258,23 +258,23 @@ environment variable. * To mount the tmp loopback device at ``/tmp``, do the following:: - sudo mount -o loop,noatime,nodiratime /srv/swift-tmp /tmp + sudo mount -o loop,noatime /srv/swift-tmp /tmp sudo chmod -R 1777 /tmp * To persist this, edit and add the following to ``/etc/fstab``:: - /srv/swift-tmp /tmp xfs rw,noatime,nodiratime,attr2,inode64,noquota 0 0 + /srv/swift-tmp /tmp xfs rw,noatime,attr2,inode64,noquota 0 0 * To mount the tmp loopback at an alternate location (for example, ``/mnt/tmp``), do the following:: sudo mkdir -p /mnt/tmp - sudo mount -o loop,noatime,nodiratime /srv/swift-tmp /mnt/tmp + sudo mount -o loop,noatime /srv/swift-tmp /mnt/tmp sudo chown ${USER}:${USER} /mnt/tmp * To persist this, edit and add the following to ``/etc/fstab``:: - /srv/swift-tmp /mnt/tmp xfs rw,noatime,nodiratime,attr2,inode64,noquota 0 0 + /srv/swift-tmp /mnt/tmp xfs rw,noatime,attr2,inode64,noquota 0 0 * Set your ``TMPDIR`` environment dir so that Swift looks in the right location:: diff --git a/doc/source/install/storage-install-obs.rst b/doc/source/install/storage-install-obs.rst index b2a43c72be..91da18c3ae 100644 --- a/doc/source/install/storage-install-obs.rst +++ b/doc/source/install/storage-install-obs.rst @@ -59,8 +59,8 @@ storage nodes, you must prepare the storage devices. .. code-block:: none - UUID="" /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2 - UUID="" /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2 + UUID="" /srv/node/sdb xfs noatime 0 2 + UUID="" /srv/node/sdc xfs noatime 0 2 #. Mount the devices: diff --git a/doc/source/install/storage-install-rdo.rst b/doc/source/install/storage-install-rdo.rst index c2bd0543be..344e43a953 100644 --- a/doc/source/install/storage-install-rdo.rst +++ b/doc/source/install/storage-install-rdo.rst @@ -58,8 +58,8 @@ storage nodes, you must prepare the storage devices. .. code-block:: none - UUID="" /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2 - UUID="" /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2 + UUID="" /srv/node/sdb xfs noatime 0 2 + UUID="" /srv/node/sdc xfs noatime 0 2 #. Mount the devices: diff --git a/doc/source/install/storage-install-ubuntu-debian.rst b/doc/source/install/storage-install-ubuntu-debian.rst index 7082cfd657..2464844370 100644 --- a/doc/source/install/storage-install-ubuntu-debian.rst +++ b/doc/source/install/storage-install-ubuntu-debian.rst @@ -58,8 +58,8 @@ storage nodes, you must prepare the storage devices. .. code-block:: none - UUID="" /srv/node/sdb xfs noatime,nodiratime,logbufs=8 0 2 - UUID="" /srv/node/sdc xfs noatime,nodiratime,logbufs=8 0 2 + UUID="" /srv/node/sdb xfs noatime 0 2 + UUID="" /srv/node/sdc xfs noatime 0 2 #. Mount the devices: diff --git a/docker/rootfs/etc/swift_build/build_devices b/docker/rootfs/etc/swift_build/build_devices index 90f1c9e6af..7588377dd1 100755 --- a/docker/rootfs/etc/swift_build/build_devices +++ b/docker/rootfs/etc/swift_build/build_devices @@ -56,7 +56,7 @@ if [[ $MY_STORAGE_TYPE == "internal_devices" ]] || [[ $MY_STORAGE_TYPE == "exter # echo "created storage device /dev/swift-d$i of $DEV_SIZE"; mkfs.xfs -f -L D$i -i size=512 /dev/$device; echo " created XFS file system on device /dev/$device"; - mount -t xfs -o noatime,nodiratime,logbufs=8 /dev/$device /srv/node/$device; + mount -t xfs -o noatime /dev/$device /srv/node/$device; echo " mounted /dev/$device as /srv/node/$device"; done fi diff --git a/tools/playbooks/multinode_setup/configure_loopback.yaml b/tools/playbooks/multinode_setup/configure_loopback.yaml index 5234393e93..f1b134e8d7 100644 --- a/tools/playbooks/multinode_setup/configure_loopback.yaml +++ b/tools/playbooks/multinode_setup/configure_loopback.yaml @@ -31,7 +31,7 @@ state: directory - name: mount /mnt/sdb1 - mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted + mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime" dump=0 passno=0 state=mounted - name: create sub-partitions file: diff --git a/tools/playbooks/saio_single_node_setup/setup_saio.yaml b/tools/playbooks/saio_single_node_setup/setup_saio.yaml index 539b89e24e..60d39c5f30 100644 --- a/tools/playbooks/saio_single_node_setup/setup_saio.yaml +++ b/tools/playbooks/saio_single_node_setup/setup_saio.yaml @@ -29,7 +29,7 @@ file: path=/mnt/sdb1 state=directory - name: mount /mnt/sdb1 - mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime,nodiratime,logbufs=8" dump=0 passno=0 state=mounted + mount: name=/mnt/sdb1 src=/srv/swift-disk fstype=xfs opts="loop,noatime" dump=0 passno=0 state=mounted - name: create sub-partitions file: >