ayurishchevandClaude Sonnet 5
93c79b63ea
The cloud is live: the address list submitted as "free" (bootstrap config
or POST /api/v1/admin/ips) can drift by the time the orchestrator claims
it, or an operator can queue an already-occupied address by mistake.
Neutron's floating-IP association is a blind "last write wins" PUT with
no conflict error to catch, so associateFIP now checks the FIP's PortID
(already fetched via GetFloatingIPByAddress) before associating, guarded
against the false-positive of the FIP already belonging to this same
validator's own port.
A match routes the address straight to a new terminal ip_queue.state
("occupied", distinct from failed/fail) via db.MarkFIPOccupied — no
retries, since Neutron won't free it on its own and requeuing would let
it be reclaimed again next tick, starving the rest of the queue — plus a
dedicated fip_occupied audit event. Resubmitting the address later (once
the conflict is resolved) resets it to queued via the existing
POST /api/v1/admin/ips resubmit path (CancelIP/ListExpiredLeases updated
to treat occupied as terminal too). admin-dashboard gets its own "занят"
badge, distinct from fail/partial/cancelled.
Rebuilt bin/{control-api,admin-dashboard,prober,validator-agent} and
bin/SHA256SUMS per docs/SETUP.md's documented build recipe, since
control-api and admin-dashboard source changed.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NeVbMVEiE7XQAkBd7HQgj6
86 lines
4.0 KiB
HTML
86 lines
4.0 KiB
HTML
{{define "ips_page"}}
|
|
<!doctype html>
|
|
<html lang="ru">
|
|
<head>{{template "html_head" .}}</head>
|
|
<body>
|
|
<div class="bg-grid"></div>
|
|
<input type="checkbox" id="nav-toggle" class="nav-toggle">
|
|
<div class="shell">
|
|
{{template "sidebar_nav" .}}
|
|
<div>
|
|
{{template "topbar_mobile" .}}
|
|
<main class="main">
|
|
<div id="error-banner">{{template "banner_inner" .Banner}}</div>
|
|
{{template "ips_content" .}}
|
|
</main>
|
|
</div>
|
|
</div>
|
|
</body>
|
|
</html>
|
|
{{end}}
|
|
|
|
{{define "ips_content"}}
|
|
<div class="topbar"><h1>Очередь IP</h1></div>
|
|
|
|
<div class="panel">
|
|
<div class="panel-body">
|
|
<form hx-post="/ips" hx-target="#ips-table-wrap" hx-swap="innerHTML" hx-on::after-request="this.reset()">
|
|
<div class="field-row">
|
|
<div class="field" style="flex: 1 1 420px;">
|
|
<label for="addresses">Адреса (по одному на строку или через запятую)</label>
|
|
<textarea id="addresses" name="addresses" rows="2" placeholder="203.0.113.10 203.0.113.11"></textarea>
|
|
</div>
|
|
<button type="submit" class="btn btn-primary">Добавить / перепроверить</button>
|
|
</div>
|
|
</form>
|
|
<p class="muted" style="margin-top:8px">Новый адрес встаёт в очередь; уже завершённый (done/failed) запускается заново
|
|
(тот же вызов); тот, что сейчас проверяется, не трогается.</p>
|
|
</div>
|
|
</div>
|
|
|
|
<div id="ips-table-wrap">
|
|
{{template "ips_table" .}}
|
|
</div>
|
|
{{end}}
|
|
|
|
{{define "ips_table"}}
|
|
<form id="ips-form">
|
|
<div class="panel">
|
|
<div class="panel-body" style="display:flex; gap:8px; align-items:center;">
|
|
<button type="button" class="btn btn-danger-ghost btn-sm" hx-post="/ips/delete" hx-target="#ips-table-wrap" hx-swap="innerHTML" hx-confirm="Удалить выбранные адреса без возможности восстановления?">Удалить выбранные</button>
|
|
<button type="button" class="btn btn-danger-ghost btn-sm" hx-post="/ips/clear" hx-target="#ips-table-wrap" hx-swap="innerHTML" hx-confirm="Удалить ВСЕ адреса из очереди, включая те, что сейчас проверяются? Действие необратимо.">Очистить всё</button>
|
|
</div>
|
|
<div class="table-scroll">
|
|
<table>
|
|
<thead><tr><th><input type="checkbox" onclick="this.closest('table').querySelectorAll('input[name=addresses]').forEach(cb => cb.checked = this.checked)"></th><th>Адрес</th><th>Состояние</th><th>Валидатор</th><th>Попытка</th><th>Обновлено</th><th></th></tr></thead>
|
|
<tbody>
|
|
{{range .Items}}
|
|
{{$b := ipBadge .State .OverallResult .FIPAssociatedAt $.FIPSettleSeconds}}
|
|
{{$terminal := or (eq .State "done") (eq .State "failed") (eq .State "occupied")}}
|
|
<tr>
|
|
<td data-label=""><input type="checkbox" name="addresses" value="{{.IPAddress}}"></td>
|
|
<td class="addr" data-label="Адрес"><a href="/ips/{{.IPAddress}}">{{.IPAddress}}</a></td>
|
|
<td data-label="Состояние"><span class="pill {{$b.Class}}">{{$b.Label}}</span></td>
|
|
<td data-label="Валидатор">{{deref .OwnerValidatorID}}</td>
|
|
<td class="num" data-label="Попытка">{{.AttemptNumber}}</td>
|
|
<td class="num" data-label="Обновлено">{{fmtTime .UpdatedAt}}</td>
|
|
<td data-label="">
|
|
<div class="actions">
|
|
{{if $terminal}}
|
|
<button class="btn btn-ghost btn-sm" hx-post="/ips/{{.IPAddress}}/recheck" hx-target="#ips-table-wrap" hx-swap="innerHTML">Перепроверить</button>
|
|
{{else}}
|
|
<button class="btn btn-danger-ghost btn-sm" hx-post="/ips/{{.IPAddress}}/cancel" hx-target="#ips-table-wrap" hx-swap="innerHTML" hx-confirm="Остановить проверку {{.IPAddress}}?">Отменить</button>
|
|
{{end}}
|
|
<button class="btn btn-danger-ghost btn-sm" hx-delete="/ips/{{.IPAddress}}" hx-target="#ips-table-wrap" hx-swap="innerHTML" hx-confirm="Удалить {{.IPAddress}} без возможности восстановления?">Удалить</button>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
{{if not .Items}}<p class="muted">Очередь пуста.</p>{{end}}
|
|
{{end}}
|