Merge pull request #423 from traylenator/fat

Allow CPUQuota to be greater than 100%
voxpupuli · Mar 5, 2024 · 259896e · 259896e
2 parents e1ca9c5 + cc32f4d
commit 259896e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2632,7 +2632,7 @@ Struct[{
     Optional['CPUAccounting']             => Boolean,
     Optional['CPUShares']                 => Integer[2,262144],
     Optional['StartupCPUShares']          => Integer[2,262144],
-    Optional['CPUQuota']                  => Systemd::Unit::Percent,
+    Optional['CPUQuota']                  => Pattern['^([1-9][0-9]*)%$'], # bigger than 100% is okay.
     Optional['MemoryAccounting']          => Boolean,
     Optional['MemoryLow']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMin']                 => Systemd::Unit::AmountOrPercent,
@@ -2737,7 +2737,7 @@ Alias of
 ```puppet
 Struct[{
     Optional['CPUAccounting']       => Boolean,
-    Optional['CPUQuota']            => Systemd::Unit::Percent,
+    Optional['CPUQuota']            => Pattern['^([1-9][0-9]*)%$'], # bigger than 100% is okay.
     Optional['CPUShares']           => Integer[2,262144],
     Optional['CPUWeight']           => Variant[Enum['idle'],Integer[1,10000]],
     Optional['Delegate']            => Boolean,

diff --git a/spec/type_aliases/systemd_unit_service_spec.rb b/spec/type_aliases/systemd_unit_service_spec.rb
@@ -88,6 +88,9 @@
 
   it { is_expected.to allow_value({ 'MemoryAccounting' => true }) }
 
+  it { is_expected.to allow_value({ 'CPUQuota' => '1%' }) }
+  it { is_expected.to allow_value({ 'CPUQuota' => '110%' }) }
+
   it {
     is_expected.to allow_value(
       {
@@ -100,5 +103,7 @@
     )
   }
 
+  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' }) }
 end
diff --git a/spec/type_aliases/systemd_unit_slice_spec.rb b/spec/type_aliases/systemd_unit_slice_spec.rb
@@ -5,6 +5,8 @@
 describe 'Systemd::Unit::Slice' do
   it { is_expected.to allow_value({ 'MemoryAccounting' => true }) }
   it { is_expected.to allow_value({ 'CPUWeight' => 100 }) }
+  it { is_expected.to allow_value({ 'CPUQuota' => '1%' }) }
+  it { is_expected.to allow_value({ 'CPUQuota' => '110%' }) }
   it { is_expected.to allow_value({ 'CPUWeight' => 'idle' }) }
   it { is_expected.to allow_value({ 'IPAccounting' => true }) }
   it { is_expected.to allow_value({ 'IOAccounting' => false }) }
@@ -26,5 +28,7 @@
     )
   }
 
+  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' }) }
 end
diff --git a/types/unit/service.pp b/types/unit/service.pp
@@ -50,7 +50,7 @@
     Optional['CPUAccounting']             => Boolean,
     Optional['CPUShares']                 => Integer[2,262144],
     Optional['StartupCPUShares']          => Integer[2,262144],
-    Optional['CPUQuota']                  => Systemd::Unit::Percent,
+    Optional['CPUQuota']                  => Pattern['^([1-9][0-9]*)%$'], # bigger than 100% is okay.
     Optional['MemoryAccounting']          => Boolean,
     Optional['MemoryLow']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMin']                 => Systemd::Unit::AmountOrPercent,

diff --git a/types/unit/slice.pp b/types/unit/slice.pp
@@ -5,7 +5,7 @@
 type Systemd::Unit::Slice = Struct[
   {
     Optional['CPUAccounting']       => Boolean,
-    Optional['CPUQuota']            => Systemd::Unit::Percent,
+    Optional['CPUQuota']            => Pattern['^([1-9][0-9]*)%$'], # bigger than 100% is okay.
     Optional['CPUShares']           => Integer[2,262144],
     Optional['CPUWeight']           => Variant[Enum['idle'],Integer[1,10000]],
     Optional['Delegate']            => Boolean,