Skip to content

Fix node sums for isViable checks #2479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Boy132 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

Fix node sums for isViable checks #2479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/Models/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@
* @property-read int|null $servers_count
* @property-read Collection<int, BackupHost> $backupHosts
* @property-read int|null $backup_hosts_count
* @property-read int|null $servers_sum_memory
* @property-read int|null $servers_sum_disk
* @property-read int|null $servers_sum_cpu
*
* @method static \Database\Factories\NodeFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder<static>|Node newModelQuery()
Expand Down Expand Up @@ -190,12 +193,6 @@ protected function casts(): array
];
}

public int $servers_sum_memory = 0;

public int $servers_sum_disk = 0;

public int $servers_sum_cpu = 0;

protected static function booted(): void
{
static::creating(function (self $node) {
Expand Down Expand Up @@ -334,22 +331,25 @@ public function roles(): HasManyThrough
public function isViable(int $memory, int $disk, int $cpu): bool
{
if ($this->memory > 0 && $this->memory_overallocate >= 0) {
$memorySum = $this->servers_sum_memory ?? $this->servers()->sum('memory');
$memoryLimit = $this->memory * (1 + ($this->memory_overallocate / 100));
if ($this->servers_sum_memory + $memory > $memoryLimit) {
if ($memorySum + $memory > $memoryLimit) {
return false;
}
}

if ($this->disk > 0 && $this->disk_overallocate >= 0) {
$diskSum = $this->servers_sum_disk ?? $this->servers()->sum('disk');
$diskLimit = $this->disk * (1 + ($this->disk_overallocate / 100));
if ($this->servers_sum_disk + $disk > $diskLimit) {
if ($diskSum + $disk > $diskLimit) {
return false;
}
}

if ($this->cpu > 0 && $this->cpu_overallocate >= 0) {
$cpuSum = $this->servers_sum_cpu ?? $this->servers()->sum('cpu');
$cpuLimit = $this->cpu * (1 + ($this->cpu_overallocate / 100));
if ($this->servers_sum_cpu + $cpu > $cpuLimit) {
if ($cpuSum + $cpu > $cpuLimit) {
return false;
}
}
Expand Down
Loading