From d0a35638af2063a5e6ca8012504388d177429ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Fri, 30 Aug 2024 11:32:00 +0200 Subject: [PATCH 1/4] improve available_space check --- definitions/checks/disk/available_space.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/definitions/checks/disk/available_space.rb b/definitions/checks/disk/available_space.rb index 8445f32ed..3ab2e30e8 100644 --- a/definitions/checks/disk/available_space.rb +++ b/definitions/checks/disk/available_space.rb @@ -3,7 +3,7 @@ module Disk class AvailableSpace < ForemanMaintain::Check metadata do label :available_space - description 'Check to make sure root(/) partition has enough space' + description 'Check if /var/cache partition has enough space for dnf transaction:' tags :pre_upgrade end @@ -11,11 +11,12 @@ class AvailableSpace < ForemanMaintain::Check def run assert(enough_space?, "System has less than #{MIN_SPACE_IN_MB / 1024}GB space available"\ - ' on root(/) partition') + ' on /var/cache partition') end def enough_space? - io_obj = ForemanMaintain::Utils::Disk::IODevice.new('/') + device = ForemanMaintain::Utils::Disk::Device.new('/var/cache').name + io_obj = ForemanMaintain::Utils::Disk::IODevice.new(device) io_obj.available_space > MIN_SPACE_IN_MB end end From 2c2646b4753f12d5a2f82f9bd66c56911a6c0f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Fri, 30 Aug 2024 12:24:39 +0200 Subject: [PATCH 2/4] Fixes #37776 Improve available_space Check in foreman_maintain --- definitions/checks/disk/available_space.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/definitions/checks/disk/available_space.rb b/definitions/checks/disk/available_space.rb index 3ab2e30e8..5daa18662 100644 --- a/definitions/checks/disk/available_space.rb +++ b/definitions/checks/disk/available_space.rb @@ -3,7 +3,8 @@ module Disk class AvailableSpace < ForemanMaintain::Check metadata do label :available_space - description 'Check if /var/cache partition has enough space for dnf transaction:' + # /var/cache usually contains the cache for the most used package-managers (rpm, apt...) + description 'Check if /var/cache partition has enough space for transaction:' tags :pre_upgrade end From 1f2e6537a0f90f0e3185c571d8c4c70f390ac8f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Fri, 30 Aug 2024 14:15:57 +0200 Subject: [PATCH 3/4] Fixes #37776 Improve available_space Check in foreman_maintain --- definitions/checks/disk/available_space.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/checks/disk/available_space.rb b/definitions/checks/disk/available_space.rb index 5daa18662..2fc931919 100644 --- a/definitions/checks/disk/available_space.rb +++ b/definitions/checks/disk/available_space.rb @@ -4,7 +4,7 @@ class AvailableSpace < ForemanMaintain::Check metadata do label :available_space # /var/cache usually contains the cache for the most used package-managers (rpm, apt...) - description 'Check if /var/cache partition has enough space for transaction:' + description 'Check if /var/cache partition has enough space for transaction' tags :pre_upgrade end From b53d8788197a2ac9d48c9113e8f5c886b65b9e4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= <137275276+pafernanr@users.noreply.github.com> Date: Fri, 30 Aug 2024 14:18:38 +0200 Subject: [PATCH 4/4] Update definitions/checks/disk/available_space.rb Co-authored-by: Eric Helms --- definitions/checks/disk/available_space.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/definitions/checks/disk/available_space.rb b/definitions/checks/disk/available_space.rb index 2fc931919..7a3fa6f08 100644 --- a/definitions/checks/disk/available_space.rb +++ b/definitions/checks/disk/available_space.rb @@ -3,7 +3,6 @@ module Disk class AvailableSpace < ForemanMaintain::Check metadata do label :available_space - # /var/cache usually contains the cache for the most used package-managers (rpm, apt...) description 'Check if /var/cache partition has enough space for transaction' tags :pre_upgrade end