Merge pull request #472 from traylenator/swapmaxpercent

Allow `MemorySwapMax` be specified as a percentage
voxpupuli · Jul 4, 2024 · 3317560 · 3317560
2 parents aea425a + c3965db
commit 3317560
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2888,7 +2888,7 @@ Struct[{
     Optional['MemoryHigh']                => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMax']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryLimit']               => Systemd::Unit::Amount,
-    Optional['MemorySwapMax']             => Systemd::Unit::Amount,
+    Optional['MemorySwapMax']             => Systemd::Unit::AmountOrPercent,
     Optional['TasksAccounting']           => Boolean,
     Optional['TasksMax']                  => Systemd::Unit::AmountOrPercent,
     Optional['IOAccounting']              => Boolean,

diff --git a/spec/type_aliases/systemd_unit_service_spec.rb b/spec/type_aliases/systemd_unit_service_spec.rb
@@ -103,6 +103,8 @@
     )
   }
 
+  it { is_expected.to allow_value({ 'MemorySwapMax' => '80%' }) }
+
   it { is_expected.not_to allow_value({ 'CPUQuota' => 50 }) }
   it { is_expected.not_to allow_value({ 'CPUQuota' => '0%' }) }
   it { is_expected.not_to allow_value({ 'MemoryHigh' => '1Y' }) }

diff --git a/types/unit/service.pp b/types/unit/service.pp
@@ -57,7 +57,7 @@
     Optional['MemoryHigh']                => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMax']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryLimit']               => Systemd::Unit::Amount,
-    Optional['MemorySwapMax']             => Systemd::Unit::Amount,
+    Optional['MemorySwapMax']             => Systemd::Unit::AmountOrPercent,
     Optional['TasksAccounting']           => Boolean,
     Optional['TasksMax']                  => Systemd::Unit::AmountOrPercent,
     Optional['IOAccounting']              => Boolean,