banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-20 20:24:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix isViable for Nodes with "unlimited" resources (#559)

Browse Source
This commit is contained in:
Boy132 2024-08-22 22:19:56 +02:00 committed by GitHub
parent 05477c711f
commit 818781ca66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Models/Node.php
View File

@ -244,21 +244,21 @@ class Node extends Model
*/ */
public function isViable(int $memory, int $disk, int $cpu): bool public function isViable(int $memory, int $disk, int $cpu): bool
{ {
if ($this->memory_overallocate >= 0) { if ($this->memory > 0 && $this->memory_overallocate >= 0) {
$memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100)); $memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
if ($this->servers_sum_memory + $memory > $memoryLimit) { if ($this->servers_sum_memory + $memory > $memoryLimit) {
return false; return false;
} }
} }
if ($this->disk_overallocate >= 0) { if ($this->disk > 0 && $this->disk_overallocate >= 0) {
$diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100)); $diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
if ($this->servers_sum_disk + $disk > $diskLimit) { if ($this->servers_sum_disk + $disk > $diskLimit) {
return false; return false;
} }
} }
if ($this->cpu_overallocate >= 0) { if ($this->cpu > 0 && $this->cpu_overallocate >= 0) {
$cpuLimit = $this->cpu * (1 + ($this->cpu_overallocate / 100)); $cpuLimit = $this->cpu * (1 + ($this->cpu_overallocate / 100));
if ($this->servers_sum_cpu + $cpu > $cpuLimit) { if ($this->servers_sum_cpu + $cpu > $cpuLimit) {
return false; return false;