From 0dc9e97fc7caa629c60929d199d6cc9ed3c1f933 Mon Sep 17 00:00:00 2001 From: Robert Church Date: Tue, 25 Sep 2018 03:34:10 -0400 Subject: [PATCH] Fix in-service re-sizing of docker-lv docker-lv is an XFS file system. Add support for re-sizing XFS filesystems by using blkid to query the file system type and call xfs_growfs for XFS filesystems. Maintain the current behavior by calling resize2fs for all non-XFS file systems. Change-Id: If5de15d232c66e99f7f5c752d96ef92674dafb1d Story: 2002876 Task: 26864 Signed-off-by: Robert Church --- puppet-manifests/centos/build_srpm.data | 2 +- .../src/modules/platform/manifests/filesystem.pp | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 0728693ed3..ff50ef13b2 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=65 +TIS_PATCH_VER=66 diff --git a/puppet-manifests/src/modules/platform/manifests/filesystem.pp b/puppet-manifests/src/modules/platform/manifests/filesystem.pp index f972a2ebea..e691f49218 100644 --- a/puppet-manifests/src/modules/platform/manifests/filesystem.pp +++ b/puppet-manifests/src/modules/platform/manifests/filesystem.pp @@ -91,7 +91,12 @@ define platform::filesystem::resize( onlyif => "blkid ${device} | grep TYPE=\\\"drbd\\\"", } -> exec { "resize2fs $devmapper": - command => "resize2fs $devmapper" + command => "resize2fs $devmapper", + onlyif => "blkid -s TYPE -o value $devmapper | grep -v xfs", + } -> + exec { "xfs_growfs $devmapper": + command => "xfs_growfs $devmapper", + onlyif => "blkid -s TYPE -o value $devmapper | grep xfs", } }