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

update AllocationSelectionService

Browse Source
This commit is contained in:
Boy132 2024-04-30 00:00:03 +02:00
parent 9761c3762d
commit e82a3b838c
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Services/Deployment/AllocationSelectionService.php
View File

@ -6,6 +6,7 @@ use App\Models\Allocation;
use App\Exceptions\DisplayException;
use App\Services\Allocations\AssignmentService;
use App\Exceptions\Service\Deployment\NoViableAllocationException;
use Illuminate\Support\Facades\DB;
class AllocationSelectionService
{
@ -121,10 +122,17 @@ class AllocationSelectionService
$discard = $this->getDiscardableDedicatedAllocations($nodes);
if (!empty($discard)) {
$query->whereNotIn(
Allocation::query()->raw('CONCAT_WS("-", node_id, ip)'),
$discard
);
if (DB::getDriverName() === 'sqlite') {
$query->whereNotIn(
Allocation::query()->raw('node_id || "-" || ip'),
$discard
);
} else {
$query->whereNotIn(
Allocation::query()->raw('CONCAT_WS("-", node_id, ip)'),
$discard
);
}
}
}
@ -141,6 +149,20 @@ class AllocationSelectionService
*/
private function getDiscardableDedicatedAllocations(array $nodes = []): array
{
if (DB::getDriverName() === 'sqlite') {
$query = Allocation::query()->selectRaw('(node_id || "-" || ip) as result');
if (!empty($nodes)) {
$query->whereIn('node_id', $nodes);
}
return $query->whereNotNull('server_id')
->groupByRaw('node_id || ip')
->get()
->pluck('result')
->toArray();
}
$query = Allocation::query()->selectRaw('CONCAT_WS("-", node_id, ip) as result');
if (!empty($nodes)) {