update
This commit is contained in:
@@ -58,6 +58,8 @@ class AssignIpToGuestJob implements ShouldQueue
|
||||
public readonly string $vmId,
|
||||
public readonly string $osFamily, // VmProvisionService::OS_LINUX | OS_WINDOWS
|
||||
public readonly string $guestPassword = VmProvisionService::TEMPLATE_PASSWORD,
|
||||
public readonly ?int $reservationId = null,
|
||||
public readonly ?int $reservedIpPoolId = null,
|
||||
) {}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────────
|
||||
@@ -103,16 +105,22 @@ class AssignIpToGuestJob implements ShouldQueue
|
||||
$guestUser = strtoupper($this->osFamily) === 'WINDOWS' ? 'Administrator' : 'root';
|
||||
|
||||
// ─── Attempt loop ────────────────────────────────────────────────────
|
||||
// If reservationId is supplied, the IP was reserved upstream (CreateVirtualMachineJob)
|
||||
// and baked into the VM name — we can't swap IPs on retry, so we run a single attempt.
|
||||
$maxAttempts = $this->reservationId ? 1 : self::MAX_ATTEMPTS;
|
||||
|
||||
for ($attempt = 1; $attempt <= self::MAX_ATTEMPTS; $attempt++) {
|
||||
for ($attempt = 1; $attempt <= $maxAttempts; $attempt++) {
|
||||
Log::info('AssignIpToGuestJob: attempt', [
|
||||
'attempt' => $attempt,
|
||||
'module_vmware_id' => $this->moduleVmwareId,
|
||||
'network_id' => $networkId,
|
||||
'preserved' => (bool) $this->reservationId,
|
||||
]);
|
||||
|
||||
// [3] Reserve a free IP with transaction + row lock
|
||||
$picked = $this->reserveIp($networkId, $hostId, $dns);
|
||||
// [3] Use upstream reservation if provided, else reserve a fresh IP.
|
||||
$picked = $this->reservationId
|
||||
? $this->loadReservation($this->reservationId, $this->reservedIpPoolId)
|
||||
: $this->reserveIp($networkId, $hostId, $dns);
|
||||
|
||||
if (!$picked) {
|
||||
Log::error('AssignIpToGuestJob: no free IPs in pool', [
|
||||
@@ -220,7 +228,7 @@ class AssignIpToGuestJob implements ShouldQueue
|
||||
Log::error('AssignIpToGuestJob: all attempts failed — marking VM inactive', [
|
||||
'module_vmware_id' => $this->moduleVmwareId,
|
||||
'vm_id' => $this->vmId,
|
||||
'attempts' => self::MAX_ATTEMPTS,
|
||||
'attempts' => $maxAttempts,
|
||||
]);
|
||||
|
||||
ModuleVmware::where('id', $this->moduleVmwareId)->update(['status' => 0]);
|
||||
@@ -336,6 +344,34 @@ class AssignIpToGuestJob implements ShouldQueue
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Load a reservation that was created upstream (e.g. by CreateVirtualMachineJob).
|
||||
* Returns the same shape as reserveIp() so the rest of the flow is identical.
|
||||
*
|
||||
* @return array{reservation:ModuleIpAddress,ip_pool_id:int,gateway:string,cidr:int}|null
|
||||
*/
|
||||
private function loadReservation(int $reservationId, ?int $ipPoolId): ?array
|
||||
{
|
||||
$reservation = ModuleIpAddress::find($reservationId);
|
||||
if (!$reservation) {
|
||||
Log::error('AssignIpToGuestJob: upstream reservation missing', [
|
||||
'reservation_id' => $reservationId,
|
||||
]);
|
||||
return null;
|
||||
}
|
||||
|
||||
$ipPool = $ipPoolId ? IpPool::find($ipPoolId) : null;
|
||||
$cidr = (int) ($ipPool->cidr ?? 24);
|
||||
$gateway = (string) ($reservation->gateway ?: ($ipPool->gateway ?? ''));
|
||||
|
||||
return [
|
||||
'reservation' => $reservation,
|
||||
'ip_pool_id' => $ipPoolId ?? 0,
|
||||
'gateway' => $gateway,
|
||||
'cidr' => $cidr ?: 24,
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Release a failed reservation by deleting the pending ModuleIpAddress row.
|
||||
* This returns the IP to the available pool.
|
||||
|
||||
Reference in New Issue
Block a user