pgbus 0.20.0 → 0.21.0

data/app/views/pgbus/workflows/definitions/_step_card.html.erb

@@ -10,6 +10,9 @@
     </h3>
     <%= pgbus_insight_kind(step) %>
   </div>
+  <% if step[:wait_timeout] %>
+    <p class="mt-2 text-sm"><span class="text-gray-600 dark:text-gray-300"><%= t("pgbus.workflow_insights.show.pipeline.wait_timeout") %></span> <span class="font-mono text-gray-900 dark:text-white"><%= pgbus_insight_wait_timeout(step[:wait_timeout]) %></span></p>
+  <% end %>
   <ul class="mt-3 grid grid-cols-2 gap-x-3 gap-y-1 text-sm" aria-label="<%= t("pgbus.workflow_insights.show.pipeline.now_label") %>">
     <% Pgbus::WorkflowInsightsHelper::LIVE_STATUSES.each do |status| %>
       <% count = step[:counts][status.to_sym] %>

data/config/locales/da.yml

@@ -1167,6 +1167,8 @@ da:
           skipped: Sprunget over
           step_link: Igangværende kørsler ved %{step}
           title: Pipeline
+          wait_timeout: Ventetidsgrænse
+          wait_timeout_dynamic: dynamisk (pr. kørsel)
           window_label: Forsøg der sluttede i vinduet
         summary:
           attention: Kræver handling
@@ -1349,6 +1351,9 @@ da:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Venter på batch %{batch} (%{done} af %{total} jobs færdige).
         waiting_signal_html: Venter på signalet %{signal} siden %{ago}.
+        waiting_signal_late_html: Venter på signalet %{signal} siden %{ago} (forsinket siden %{late}). Næste forsinkelsesbesked sendes %{time}.
+        waiting_signal_late_no_deadline_html: Venter på signalet %{signal} siden %{ago} (forsinket siden %{late}). Der sendes ikke flere forsinkelsesbeskeder.
+        waiting_signal_notify_html: Venter på signalet %{signal} siden %{ago}. En forsinkelsesbesked sendes %{time}, og ventetiden fortsætter.
         waiting_signal_timeout_html: Venter på signalet %{signal} siden %{ago}. Ventetiden udløber %{time}.
         waiting_step_html: Venter på %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ da:
         ready: Klar
         waiting: Venter
       timeline:
-        caption: 'Hvert forsøg, ældste øverst: ventede (dets ventetid), i kø (forfalden, endnu ikke hentet), kørte (farvet efter udfald) og venter (på et signal eller sin batch), med pauserne i en egen række. Forsøgstabellen nedenfor viser de samme varigheder.'
+        caption: 'Hvert forsøg, ældste øverst: ventede (dets ventetid), i kø (forfalden, endnu ikke hentet), kørte (farvet efter udfald) og venter (på et signal eller sin batch), med pauserne i en egen række. Forsøgstabellen nedenfor viser de samme varigheder. En stiplet linje markerer hver gang en ventetid passerede sin frist.'
         empty: Ingen forsøg endnu.
         paused_period_html: Sat på pause %{from} i %{duration}
         paused_row: På pause
@@ -1465,3 +1470,4 @@ da:
           waited: Ventede
           waiting: Venter
         title: Tidslinje
+        wait_timeout_html: 'Ventetiden for %{step} passerede sin frist %{time} (on_timeout: %{action}).'

data/config/locales/de.yml

@@ -1167,6 +1167,8 @@ de:
           skipped: Übersprungen
           step_link: Laufende Läufe bei %{step}
           title: Pipeline
+          wait_timeout: Warte-Timeout
+          wait_timeout_dynamic: dynamisch (pro Lauf)
           window_label: Im Zeitfenster beendete Versuche
         summary:
           attention: Brauchen Aufmerksamkeit
@@ -1349,6 +1351,9 @@ de:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Wartet auf Stapel %{batch} (%{done} von %{total} Jobs erledigt).
         waiting_signal_html: Wartet auf Signal %{signal} seit %{ago}.
+        waiting_signal_late_html: Wartet auf Signal %{signal} seit %{ago} (verspätet seit %{late}). Die nächste Verspätungsmeldung folgt %{time}.
+        waiting_signal_late_no_deadline_html: Wartet auf Signal %{signal} seit %{ago} (verspätet seit %{late}). Es folgt keine weitere Verspätungsmeldung.
+        waiting_signal_notify_html: Wartet auf Signal %{signal} seit %{ago}. Eine Verspätungsmeldung folgt %{time}, und das Warten geht weiter.
         waiting_signal_timeout_html: Wartet auf Signal %{signal} seit %{ago}. Das Warten läuft ab %{time}.
         waiting_step_html: Wartet auf %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ de:
         ready: Bereit
         waiting: Wartend
       timeline:
-        caption: 'Jeder Versuch, der älteste oben: gewartet (seine Wartezeit), eingereiht (fällig, noch nicht abgeholt), gelaufen (nach Ausgang eingefärbt) und wartend (auf ein Signal oder seinen Stapel), die Pausen in einer eigenen Zeile. Die Versuchstabelle darunter listet dieselben Dauern.'
+        caption: 'Jeder Versuch, der älteste oben: gewartet (seine Wartezeit), eingereiht (fällig, noch nicht abgeholt), gelaufen (nach Ausgang eingefärbt) und wartend (auf ein Signal oder seinen Stapel), die Pausen in einer eigenen Zeile. Die Versuchstabelle darunter listet dieselben Dauern. Eine gestrichelte Linie markiert jedes Mal, wenn ein Warten seine Frist überschritt.'
         empty: Noch keine Versuche.
         paused_period_html: Pausiert ab %{from} für %{duration}
         paused_row: Pausiert
@@ -1465,3 +1470,4 @@ de:
           waited: Gewartet
           waiting: Wartend
         title: Zeitachse
+        wait_timeout_html: 'Das Warten von %{step} überschritt um %{time} seine Frist (on_timeout: %{action}).'

data/config/locales/en.yml

@@ -1167,6 +1167,8 @@ en:
           skipped: Skipped
           step_link: Ongoing runs at %{step}
           title: Pipeline
+          wait_timeout: Wait timeout
+          wait_timeout_dynamic: dynamic (per run)
           window_label: Attempts that finished in the window
         summary:
           attention: Need attention
@@ -1349,6 +1351,9 @@ en:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Waiting for batch %{batch} (%{done} of %{total} jobs done).
         waiting_signal_html: Waiting for signal %{signal} since %{ago}.
+        waiting_signal_late_html: Waiting for signal %{signal} since %{ago} (late since %{late}). The next late notice goes out %{time}.
+        waiting_signal_late_no_deadline_html: Waiting for signal %{signal} since %{ago} (late since %{late}). No further late notice is due.
+        waiting_signal_notify_html: Waiting for signal %{signal} since %{ago}. A late notice goes out %{time}, and the wait goes on.
         waiting_signal_timeout_html: Waiting for signal %{signal} since %{ago}. The wait times out %{time}.
         waiting_step_html: Waiting on %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ en:
         ready: Ready
         waiting: Waiting
       timeline:
-        caption: 'Each attempt, oldest at the top: waited (its wait), queued (due, not yet picked up), ran (coloured by how it ended) and waiting (for a signal or its batch), with the pauses on their own row. The attempts table below lists the same durations.'
+        caption: 'Each attempt, oldest at the top: waited (its wait), queued (due, not yet picked up), ran (coloured by how it ended) and waiting (for a signal or its batch), with the pauses on their own row. The attempts table below lists the same durations. A dashed line marks each time a wait passed its deadline.'
         empty: No attempts yet.
         paused_period_html: Paused at %{from} for %{duration}
         paused_row: Paused
@@ -1465,3 +1470,4 @@ en:
           waited: Waited
           waiting: Waiting
         title: Timeline
+        wait_timeout_html: "%{step}'s wait passed its deadline at %{time} (on_timeout: %{action})."

data/config/locales/es.yml

@@ -1167,6 +1167,8 @@ es:
           skipped: Omitidos
           step_link: Ejecuciones en curso en %{step}
           title: Pipeline
+          wait_timeout: Tiempo de espera
+          wait_timeout_dynamic: dinámico (por ejecución)
           window_label: Intentos terminados en la ventana
         summary:
           attention: Requieren atención
@@ -1349,6 +1351,9 @@ es:
         unknown_html: 'Estado: %{status}.'
         waiting_batch_html: Esperando el lote %{batch} (%{done} de %{total} trabajos terminados).
         waiting_signal_html: Esperando la señal %{signal} desde %{ago}.
+        waiting_signal_late_html: Esperando la señal %{signal} desde %{ago} (con retraso desde %{late}). El próximo aviso de retraso sale %{time}.
+        waiting_signal_late_no_deadline_html: Esperando la señal %{signal} desde %{ago} (con retraso desde %{late}). No sale ningún otro aviso de retraso.
+        waiting_signal_notify_html: Esperando la señal %{signal} desde %{ago}. Un aviso de retraso sale %{time} y la espera continúa.
         waiting_signal_timeout_html: Esperando la señal %{signal} desde %{ago}. La espera caduca %{time}.
         waiting_step_html: Esperando a %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ es:
         ready: Listos
         waiting: En espera
       timeline:
-        caption: 'Cada intento, el más antiguo arriba: esperó (su espera), en cola (vencido, aún sin tomar), se ejecutó (coloreado según cómo terminó) y en espera (de una señal o de su lote), con las pausas en su propia fila. La tabla de intentos de abajo muestra las mismas duraciones.'
+        caption: 'Cada intento, el más antiguo arriba: esperó (su espera), en cola (vencido, aún sin tomar), se ejecutó (coloreado según cómo terminó) y en espera (de una señal o de su lote), con las pausas en su propia fila. La tabla de intentos de abajo muestra las mismas duraciones. Una línea discontinua marca cada vez que una espera superó su plazo.'
         empty: Aún no hay intentos.
         paused_period_html: En pausa desde %{from} durante %{duration}
         paused_row: En pausa
@@ -1465,3 +1470,4 @@ es:
           waited: Esperó
           waiting: En espera
         title: Cronología
+        wait_timeout_html: 'La espera de %{step} superó su plazo en %{time} (on_timeout: %{action}).'

data/config/locales/fi.yml

@@ -1167,6 +1167,8 @@ fi:
           skipped: Ohitettu
           step_link: Käynnissä olevat ajot vaiheessa %{step}
           title: Putki
+          wait_timeout: Odotuksen aikaraja
+          wait_timeout_dynamic: dynaaminen (ajokohtainen)
           window_label: Ikkunassa päättyneet yritykset
         summary:
           attention: Vaatii toimia
@@ -1349,6 +1351,9 @@ fi:
         unknown_html: 'Tila: %{status}.'
         waiting_batch_html: Odottaa erää %{batch} (%{done} / %{total} tehtävää valmis).
         waiting_signal_html: Odottaa signaalia %{signal}, alkoi %{ago}.
+        waiting_signal_late_html: Odottaa signaalia %{signal}, alkoi %{ago} (myöhässä alkaen %{late}). Seuraava myöhästymisilmoitus lähtee %{time}.
+        waiting_signal_late_no_deadline_html: Odottaa signaalia %{signal}, alkoi %{ago} (myöhässä alkaen %{late}). Uusia myöhästymisilmoituksia ei lähde.
+        waiting_signal_notify_html: Odottaa signaalia %{signal}, alkoi %{ago}. Myöhästymisilmoitus lähtee %{time}, ja odotus jatkuu.
         waiting_signal_timeout_html: Odottaa signaalia %{signal}, alkoi %{ago}. Odotus aikakatkaistaan %{time}.
         waiting_step_html: Odottaa vaihetta %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ fi:
         ready: Valmiina
         waiting: Odottaa
       timeline:
-        caption: 'Jokainen yritys, vanhin ylimpänä: odotettu (sen odotus), jonossa (erääntynyt, ei vielä otettu), ajettu (väri kertoo lopputuloksen) ja odottaa (signaalia tai erää), keskeytykset omalla rivillään. Alla oleva yritystaulukko listaa samat kestot.'
+        caption: 'Jokainen yritys, vanhin ylimpänä: odotettu (sen odotus), jonossa (erääntynyt, ei vielä otettu), ajettu (väri kertoo lopputuloksen) ja odottaa (signaalia tai erää), keskeytykset omalla rivillään. Alla oleva yritystaulukko listaa samat kestot. Katkoviiva merkitsee jokaista kertaa, kun odotus ylitti määräaikansa.'
         empty: Ei vielä yrityksiä.
         paused_period_html: Keskeytetty %{from} ajaksi %{duration}
         paused_row: Keskeytetty
@@ -1465,3 +1470,4 @@ fi:
           waited: Odotettu
           waiting: Odottaa
         title: Aikajana
+        wait_timeout_html: 'Vaiheen %{step} odotus ylitti määräaikansa %{time} (on_timeout: %{action}).'

data/config/locales/fr.yml

@@ -1167,6 +1167,8 @@ fr:
           skipped: Ignorées
           step_link: Exécutions en cours à %{step}
           title: Pipeline
+          wait_timeout: Délai d'attente
+          wait_timeout_dynamic: dynamique (par exécution)
           window_label: Tentatives terminées dans la fenêtre
         summary:
           attention: À traiter
@@ -1349,6 +1351,9 @@ fr:
         unknown_html: 'Statut : %{status}.'
         waiting_batch_html: En attente du lot %{batch} (%{done} travaux sur %{total} terminés).
         waiting_signal_html: En attente du signal %{signal} depuis %{ago}.
+        waiting_signal_late_html: En attente du signal %{signal} depuis %{ago} (en retard depuis %{late}). Le prochain avis de retard part %{time}.
+        waiting_signal_late_no_deadline_html: En attente du signal %{signal} depuis %{ago} (en retard depuis %{late}). Aucun autre avis de retard ne part.
+        waiting_signal_notify_html: En attente du signal %{signal} depuis %{ago}. Un avis de retard part %{time} et l'attente continue.
         waiting_signal_timeout_html: En attente du signal %{signal} depuis %{ago}. L'attente expire %{time}.
         waiting_step_html: En attente de %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ fr:
         ready: Prêts
         waiting: En attente
       timeline:
-        caption: 'Chaque tentative, la plus ancienne en haut : attente (son délai), en file (due, pas encore prise), exécution (colorée selon son issue) et en attente (d''un signal ou de son lot), avec les pauses sur leur propre ligne. Le tableau des tentatives ci-dessous donne les mêmes durées.'
+        caption: 'Chaque tentative, la plus ancienne en haut : attente (son délai), en file (due, pas encore prise), exécution (colorée selon son issue) et en attente (d''un signal ou de son lot), avec les pauses sur leur propre ligne. Le tableau des tentatives ci-dessous donne les mêmes durées. Une ligne pointillée marque chaque fois qu''une attente a dépassé son échéance.'
         empty: Aucune tentative pour l'instant.
         paused_period_html: En pause à %{from} pendant %{duration}
         paused_row: En pause
@@ -1465,3 +1470,4 @@ fr:
           waited: Attendu
           waiting: En attente
         title: Chronologie
+        wait_timeout_html: 'L''attente de %{step} a dépassé son échéance à %{time} (on_timeout: %{action}).'

data/config/locales/it.yml

@@ -1167,6 +1167,8 @@ it:
           skipped: Saltati
           step_link: Esecuzioni in corso a %{step}
           title: Pipeline
+          wait_timeout: Timeout di attesa
+          wait_timeout_dynamic: dinamico (per esecuzione)
           window_label: Tentativi terminati nella finestra
         summary:
           attention: Richiedono attenzione
@@ -1349,6 +1351,9 @@ it:
         unknown_html: 'Stato: %{status}.'
         waiting_batch_html: In attesa del lotto %{batch} (%{done} lavori su %{total} completati).
         waiting_signal_html: In attesa del segnale %{signal} da %{ago}.
+        waiting_signal_late_html: In attesa del segnale %{signal} da %{ago} (in ritardo da %{late}). Il prossimo avviso di ritardo parte %{time}.
+        waiting_signal_late_no_deadline_html: In attesa del segnale %{signal} da %{ago} (in ritardo da %{late}). Non parte nessun altro avviso di ritardo.
+        waiting_signal_notify_html: In attesa del segnale %{signal} da %{ago}. Un avviso di ritardo parte %{time} e l'attesa continua.
         waiting_signal_timeout_html: In attesa del segnale %{signal} da %{ago}. L'attesa scade %{time}.
         waiting_step_html: In attesa di %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ it:
         ready: Pronti
         waiting: In attesa
       timeline:
-        caption: 'Ogni tentativo, il più vecchio in alto: atteso (la sua attesa), in coda (previsto, non ancora preso), eseguito (colorato in base a come è finito) e in attesa (di un segnale o del suo lotto), con le pause su una riga a parte. La tabella dei tentativi qui sotto riporta le stesse durate.'
+        caption: 'Ogni tentativo, il più vecchio in alto: atteso (la sua attesa), in coda (previsto, non ancora preso), eseguito (colorato in base a come è finito) e in attesa (di un segnale o del suo lotto), con le pause su una riga a parte. La tabella dei tentativi qui sotto riporta le stesse durate. Una linea tratteggiata segna ogni volta che un''attesa ha superato la scadenza.'
         empty: Ancora nessun tentativo.
         paused_period_html: In pausa dalle %{from} per %{duration}
         paused_row: In pausa
@@ -1465,3 +1470,4 @@ it:
           waited: Atteso
           waiting: In attesa
         title: Cronologia
+        wait_timeout_html: 'L''attesa di %{step} ha superato la scadenza alle %{time} (on_timeout: %{action}).'

data/config/locales/ja.yml

@@ -1167,6 +1167,8 @@ ja:
           skipped: スキップ
           step_link: "%{step} の進行中の実行"
           title: パイプライン
+          wait_timeout: 待機タイムアウト
+          wait_timeout_dynamic: 動的（実行ごと）
           window_label: 期間内に終了した試行
         summary:
           attention: 要対応
@@ -1349,6 +1351,9 @@ ja:
         unknown_html: 'ステータス: %{status}。'
         waiting_batch_html: バッチ %{batch} を待機中です（%{total} 件中 %{done} 件のジョブが完了）。
         waiting_signal_html: シグナル %{signal} を %{ago} から待機中です。
+        waiting_signal_late_html: シグナル %{signal} を %{ago} から待機中です（%{late} から遅延）。次の遅延通知は %{time} に送られます。
+        waiting_signal_late_no_deadline_html: シグナル %{signal} を %{ago} から待機中です（%{late} から遅延）。これ以上の遅延通知は送られません。
+        waiting_signal_notify_html: シグナル %{signal} を %{ago} から待機中です。遅延通知は %{time} に送られ、待機は続きます。
         waiting_signal_timeout_html: シグナル %{signal} を %{ago} から待機中です。待機は %{time} にタイムアウトします。
         waiting_step_html: "%{step} を待機中です。"
       not_found:
@@ -1451,7 +1456,7 @@ ja:
         ready: 実行待ち
         waiting: 待機中
       timeline:
-        caption: 各試行を古い順に表示します。待機（待ち時間）、キュー（期限到来、未取得）、実行（終了状態で色分け）、待機中（シグナルまたはバッチ待ち）で、一時停止は別の行に表示します。下の試行テーブルにも同じ時間が載っています。
+        caption: 各試行を古い順に表示します。待機（待ち時間）、キュー（期限到来、未取得）、実行（終了状態で色分け）、待機中（シグナルまたはバッチ待ち）で、一時停止は別の行に表示します。下の試行テーブルにも同じ時間が載っています。破線は待機が期限を過ぎた時点を示します。
         empty: 試行はまだありません。
         paused_period_html: "%{from} から %{duration} 一時停止"
         paused_row: 一時停止
@@ -1465,3 +1470,4 @@ ja:
           waited: 待機済み
           waiting: 待機中
         title: タイムライン
+        wait_timeout_html: "%{step} の待機が %{time} に期限を過ぎました（on_timeout: %{action}）。"

data/config/locales/nb.yml

@@ -1167,6 +1167,8 @@ nb:
           skipped: Hoppet over
           step_link: Pågående kjøringer ved %{step}
           title: Pipeline
+          wait_timeout: Tidsgrense for venting
+          wait_timeout_dynamic: dynamisk (per kjøring)
           window_label: Forsøk som ble avsluttet i vinduet
         summary:
           attention: Trenger tiltak
@@ -1349,6 +1351,9 @@ nb:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Venter på gruppen %{batch} (%{done} av %{total} jobber ferdige).
         waiting_signal_html: Venter på signalet %{signal} siden %{ago}.
+        waiting_signal_late_html: Venter på signalet %{signal} siden %{ago} (forsinket siden %{late}). Neste forsinkelsesvarsel sendes %{time}.
+        waiting_signal_late_no_deadline_html: Venter på signalet %{signal} siden %{ago} (forsinket siden %{late}). Det sendes ingen flere forsinkelsesvarsler.
+        waiting_signal_notify_html: Venter på signalet %{signal} siden %{ago}. Et forsinkelsesvarsel sendes %{time}, og ventingen fortsetter.
         waiting_signal_timeout_html: Venter på signalet %{signal} siden %{ago}. Ventetiden utløper %{time}.
         waiting_step_html: Venter på %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ nb:
         ready: Klare
         waiting: Venter
       timeline:
-        caption: 'Hvert forsøk, eldst øverst: ventet (ventetiden), i kø (forfalt, ikke hentet ennå), kjørte (farget etter utfall) og venter (på et signal eller sin gruppe), med pausene på en egen rad. Forsøkstabellen under viser de samme varighetene.'
+        caption: 'Hvert forsøk, eldst øverst: ventet (ventetiden), i kø (forfalt, ikke hentet ennå), kjørte (farget etter utfall) og venter (på et signal eller sin gruppe), med pausene på en egen rad. Forsøkstabellen under viser de samme varighetene. En stiplet linje markerer hver gang en ventetid passerte fristen.'
         empty: Ingen forsøk ennå.
         paused_period_html: Satt på pause %{from} i %{duration}
         paused_row: På pause
@@ -1465,3 +1470,4 @@ nb:
           waited: Ventet
           waiting: Venter
         title: Tidslinje
+        wait_timeout_html: 'Ventetiden for %{step} passerte fristen %{time} (on_timeout: %{action}).'

data/config/locales/nl.yml

@@ -1167,6 +1167,8 @@ nl:
           skipped: Overgeslagen
           step_link: Lopende runs bij %{step}
           title: Pipeline
+          wait_timeout: Wachttime-out
+          wait_timeout_dynamic: dynamisch (per run)
           window_label: Pogingen die in het venster eindigden
         summary:
           attention: Aandacht nodig
@@ -1349,6 +1351,9 @@ nl:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Wacht op groep %{batch} (%{done} van %{total} taken klaar).
         waiting_signal_html: Wacht op signaal %{signal}, gestart %{ago}.
+        waiting_signal_late_html: Wacht op signaal %{signal}, gestart %{ago} (te laat sinds %{late}). De volgende melding over de vertraging gaat %{time} uit.
+        waiting_signal_late_no_deadline_html: Wacht op signaal %{signal}, gestart %{ago} (te laat sinds %{late}). Er gaat geen nieuwe melding over de vertraging meer uit.
+        waiting_signal_notify_html: Wacht op signaal %{signal}, gestart %{ago}. Een melding over de vertraging gaat %{time} uit, en het wachten gaat door.
         waiting_signal_timeout_html: Wacht op signaal %{signal}, gestart %{ago}. De wachttijd verloopt %{time}.
         waiting_step_html: Wacht op %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ nl:
         ready: Klaar
         waiting: Wachtend
       timeline:
-        caption: 'Elke poging, oudste bovenaan: gewacht (de wachttijd), in wachtrij (aan de beurt, nog niet opgepakt), uitgevoerd (gekleurd naar hoe het afliep) en wachtend (op een signaal of de groep), met de pauzes op een eigen rij. De pogingentabel hieronder toont dezelfde duren.'
+        caption: 'Elke poging, oudste bovenaan: gewacht (de wachttijd), in wachtrij (aan de beurt, nog niet opgepakt), uitgevoerd (gekleurd naar hoe het afliep) en wachtend (op een signaal of de groep), met de pauzes op een eigen rij. De pogingentabel hieronder toont dezelfde duren. Een stippellijn markeert elke keer dat een wachttijd zijn deadline passeerde.'
         empty: Nog geen pogingen.
         paused_period_html: Gepauzeerd op %{from} gedurende %{duration}
         paused_row: Gepauzeerd
@@ -1465,3 +1470,4 @@ nl:
           waited: Gewacht
           waiting: Wachtend
         title: Tijdlijn
+        wait_timeout_html: 'De wachttijd van %{step} verstreek op %{time} (on_timeout: %{action}).'

data/config/locales/pt.yml

@@ -1167,6 +1167,8 @@ pt:
           skipped: Ignoradas
           step_link: Execuções em curso em %{step}
           title: Pipeline
+          wait_timeout: Tempo limite de espera
+          wait_timeout_dynamic: dinâmico (por execução)
           window_label: Tentativas terminadas na janela
         summary:
           attention: Precisam de atenção
@@ -1349,6 +1351,9 @@ pt:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Aguardando o lote %{batch} (%{done} de %{total} trabalhos concluídos).
         waiting_signal_html: Aguardando o sinal %{signal} desde %{ago}.
+        waiting_signal_late_html: Aguardando o sinal %{signal} desde %{ago} (atrasado desde %{late}). O próximo aviso de atraso sai %{time}.
+        waiting_signal_late_no_deadline_html: Aguardando o sinal %{signal} desde %{ago} (atrasado desde %{late}). Não sai mais nenhum aviso de atraso.
+        waiting_signal_notify_html: Aguardando o sinal %{signal} desde %{ago}. Um aviso de atraso sai %{time} e a espera continua.
         waiting_signal_timeout_html: Aguardando o sinal %{signal} desde %{ago}. A espera expira %{time}.
         waiting_step_html: Aguardando %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ pt:
         ready: Prontos
         waiting: Aguardando
       timeline:
-        caption: 'Cada tentativa, a mais antiga no topo: esperou (sua espera), na fila (vencida, ainda não pega), executou (colorida conforme terminou) e aguardando (um sinal ou seu lote), com as pausas em linha própria. A tabela de tentativas abaixo lista as mesmas durações.'
+        caption: 'Cada tentativa, a mais antiga no topo: esperou (sua espera), na fila (vencida, ainda não pega), executou (colorida conforme terminou) e aguardando (um sinal ou seu lote), com as pausas em linha própria. A tabela de tentativas abaixo lista as mesmas durações. Uma linha tracejada marca cada vez que uma espera passou do prazo.'
         empty: Ainda não há tentativas.
         paused_period_html: Em pausa desde %{from} durante %{duration}
         paused_row: Em pausa
@@ -1465,3 +1470,4 @@ pt:
           waited: Esperou
           waiting: Aguardando
         title: Linha do tempo
+        wait_timeout_html: 'A espera de %{step} passou do prazo em %{time} (on_timeout: %{action}).'

data/config/locales/sv.yml

@@ -1167,6 +1167,8 @@ sv:
           skipped: Överhoppade
           step_link: Pågående körningar vid %{step}
           title: Pipeline
+          wait_timeout: Väntetidsgräns
+          wait_timeout_dynamic: dynamisk (per körning)
           window_label: Försök som avslutades i fönstret
         summary:
           attention: Behöver åtgärd
@@ -1349,6 +1351,9 @@ sv:
         unknown_html: 'Status: %{status}.'
         waiting_batch_html: Väntar på gruppen %{batch} (%{done} av %{total} jobb klara).
         waiting_signal_html: Väntar på signalen %{signal} sedan %{ago}.
+        waiting_signal_late_html: Väntar på signalen %{signal} sedan %{ago} (sen sedan %{late}). Nästa förseningsavisering går ut %{time}.
+        waiting_signal_late_no_deadline_html: Väntar på signalen %{signal} sedan %{ago} (sen sedan %{late}). Ingen fler förseningsavisering går ut.
+        waiting_signal_notify_html: Väntar på signalen %{signal} sedan %{ago}. En förseningsavisering går ut %{time}, och väntan fortsätter.
         waiting_signal_timeout_html: Väntar på signalen %{signal} sedan %{ago}. Väntan tar slut %{time}.
         waiting_step_html: Väntar på %{step}.
       not_found:
@@ -1451,7 +1456,7 @@ sv:
         ready: Redo
         waiting: Väntar
       timeline:
-        caption: 'Varje försök, äldst överst: väntade (dess väntetid), köad (förfallen, ännu inte hämtad), körde (färgad efter utfall) och väntar (på en signal eller sin grupp), med pauserna på en egen rad. Försökstabellen nedan visar samma tider.'
+        caption: 'Varje försök, äldst överst: väntade (dess väntetid), köad (förfallen, ännu inte hämtad), körde (färgad efter utfall) och väntar (på en signal eller sin grupp), med pauserna på en egen rad. Försökstabellen nedan visar samma tider. En streckad linje markerar varje gång en väntan passerade sin tidsgräns.'
         empty: Inga försök ännu.
         paused_period_html: Pausad %{from} i %{duration}
         paused_row: Pausad
@@ -1465,3 +1470,4 @@ sv:
           waited: Väntade
           waiting: Väntar
         title: Tidslinje
+        wait_timeout_html: 'Väntan för %{step} passerade sin tidsgräns %{time} (on_timeout: %{action}).'

data/lib/generators/pgbus/templates/add_workflows.rb.erb

@@ -32,8 +32,10 @@ class AddPgbusWorkflows < ActiveRecord::Migration<%= migration_version %>
 
     add_index :pgbus_workflows, :workflow_id,
       unique: true, name: "idx_pgbus_workflows_workflow_id", if_not_exists: true
+    # status::text keeps the predicate stable in schema.rb: without the cast, a
+    # migrated and a schema-loaded database dump it differently (issue #573).
     add_index :pgbus_workflows, [:workflow_class, :subject_type, :subject_id],
-      unique: true, where: "status IN ('ready','performing','waiting','paused')",
+      unique: true, where: "status::text IN ('ready','performing','waiting','paused')",
       name: "idx_pgbus_workflows_one_ongoing", if_not_exists: true
     add_index :pgbus_workflows, [:workflow_class, :idempotency_key],
       unique: true, where: "idempotency_key IS NOT NULL",

data/lib/generators/pgbus/templates/migration.rb.erb

@@ -238,8 +238,10 @@ class CreatePgbusTables < ActiveRecord::Migration<%= migration_version %>
 
     add_index :pgbus_workflows, :workflow_id,
       unique: true, name: "idx_pgbus_workflows_workflow_id"
+    # status::text keeps the predicate stable in schema.rb: without the cast, a
+    # migrated and a schema-loaded database dump it differently (issue #573).
     add_index :pgbus_workflows, [:workflow_class, :subject_type, :subject_id],
-      unique: true, where: "status IN ('ready','performing','waiting','paused')",
+      unique: true, where: "status::text IN ('ready','performing','waiting','paused')",
       name: "idx_pgbus_workflows_one_ongoing"
     add_index :pgbus_workflows, [:workflow_class, :idempotency_key],
       unique: true, where: "idempotency_key IS NOT NULL",

data/lib/pgbus/active_job/adapter.rb

@@ -80,6 +80,7 @@ module Pgbus
         # reset: once the send returns, msg_id is set and the rescue routes
         # on that instead.
         sending = false
+        retry_lock = hand_lock_to_retry(active_job, payload_hash, queue)
 
         if key && concurrency
           # The check and the park commit together, under the semaphore row
@@ -115,6 +116,9 @@ module Pgbus
         # Bind before backfill so a live message is never left with an unbound
         # uniqueness row if execution-row bookkeeping raises.
         bind_acquired_uniqueness_lock(queue, msg_id) if msg_id
+        bind_retry_lock(retry_lock, queue, msg_id) if msg_id
+        # Dropped by its concurrency limit: no retry will run, the attempt does.
+        return_retry_lock(retry_lock) unless msg_id || blocked
         Batch.backfill_execution(payload_hash, msg_id, physical_queue(queue, priority)) if msg_id
         # A retry re-enqueue that is now live (sent, or parked as a blocked
         # execution) must stop the original attempt from signalling completion.
@@ -135,6 +139,7 @@ module Pgbus
         # database error from the slot upsert or the park is not ambiguous.
         if msg_id.nil? && !(sending && ambiguous_delivery?(e))
           rollback_acquired_uniqueness_lock
+          return_retry_lock(retry_lock)
           uncount_batch_job(payload_hash, active_job)
         else
           # Drop the thread-local so a later discard on this thread cannot
@@ -247,9 +252,10 @@ module Pgbus
         # the executor still holds the key (it releases only on success/DLQ). So
         # a re-enqueue with executions > 0 would otherwise hit its own held key,
         # be rejected as a duplicate (JobNotUnique), and dead-letter the original
-        # while losing the retry. Let the retry through; the existing key row
-        # correctly stays held until the job finally succeeds or dead-letters.
-        # See issue #333.
+        # while losing the retry. Let the retry through (issue #333); the key
+        # row is handed to it (hand_lock_to_retry, then bind_retry_lock once
+        # sent), so the attempt's release leaves it held until the job finally
+        # succeeds or dead-letters (issue #564).
         return false if active_job.executions.to_i.positive?
 
         result = Uniqueness.acquire_enqueue_lock(uniqueness_key, active_job, queue_name: queue)
@@ -285,6 +291,78 @@ module Pgbus
         Pgbus.logger.warn { "[Pgbus] Uniqueness bind failed: #{e.message}" }
       end
 
+      # The job's :until_executed key and the delivery of the attempt running
+      # it, when this enqueue is that attempt's retry: the retry is let
+      # through the key the attempt holds and never acquires one, so the key
+      # row has to follow it. nil for a first attempt (it acquired its own
+      # row), a retry enqueued outside the executor (no attempt to take it
+      # from), or a job run inline inside another job, whose delivery it sees.
+      def retry_uniqueness_lock(active_job, payload_hash)
+        key = Uniqueness.extract_key(payload_hash)
+        return unless key && Uniqueness.extract_strategy(payload_hash) == :until_executed
+        return unless active_job.executions.to_i.positive?
+
+        delivery = Delivery.current
+        [key, delivery] if delivery && delivery[:job_id] == active_job.job_id
+      end
+
+      # Take the attempt's row for its retry before the retry exists — sent or
+      # parked — the way a first enqueue acquires before its send (see
+      # UniquenessKey.unbind!). Returns [key, delivery, stamp] for
+      # bind_retry_lock / return_retry_lock, or nil when there is nothing to
+      # hand over. A failure is logged and the retry goes out without the row,
+      # which then stays with the attempt.
+      def hand_lock_to_retry(active_job, payload_hash, queue)
+        key, delivery = retry_uniqueness_lock(active_job, payload_hash)
+        return unless key
+
+        stamp = UniquenessKey.unbind!(key, from_queue_name: Uniqueness.lock_queue_name(delivery[:queue_name]),
+                                           from_msg_id: delivery[:msg_id], from_enqueued_at: delivery[:enqueued_at],
+                                           queue_name: Uniqueness.lock_queue_name(queue))
+        return [key, delivery, stamp] if stamp
+
+        warn_retry_lock_not_held(key)
+        nil
+      rescue StandardError => e
+        Pgbus.logger.warn { "[Pgbus] Uniqueness handoff to retry failed for #{key}: #{e.message}" }
+        nil
+      end
+
+      # Point the handed-over row at the sent retry. The retry is live, so a
+      # failure is logged, not raised: the row stays unbound and stamped
+      # before the send, and the retry's own release takes it.
+      def bind_retry_lock(retry_lock, queue, msg_id)
+        return unless retry_lock
+
+        key, _delivery, stamp = retry_lock
+        UniquenessKey.bind!(key, queue_name: Uniqueness.lock_queue_name(queue), msg_id: msg_id, acquired_at: stamp)
+      rescue StandardError => e
+        Pgbus.logger.warn { "[Pgbus] Uniqueness bind to retry failed for #{key}: #{e.message}" }
+      end
+
+      # No retry came of it (dropped by its concurrency limit, or the send
+      # failed before any message existed): bind the row back to the attempt,
+      # which runs on and releases it when it finishes.
+      def return_retry_lock(retry_lock)
+        return unless retry_lock
+
+        key, delivery, stamp = retry_lock
+        UniquenessKey.bind!(key, queue_name: Uniqueness.lock_queue_name(delivery[:queue_name]),
+                                 msg_id: delivery[:msg_id], acquired_at: stamp)
+      rescue StandardError => e
+        Pgbus.logger.warn { "[Pgbus] Uniqueness return to the attempt failed for #{key}: #{e.message}" }
+      end
+
+      # The row is gone (released by an operator, reaped) or a successor's:
+      # the retry runs without the key, and a fresh enqueue is not deduped
+      # against it.
+      def warn_retry_lock_not_held(key)
+        Pgbus.logger.warn do
+          "[Pgbus] Uniqueness key #{key} is no longer held by the attempt that enqueued its retry; " \
+            "the retry runs without it"
+        end
+      end
+
       # Reverses inject_batch_metadata for a job discarded at enqueue time
       # (uniqueness duplicate or concurrency :discard conflict): the message is
       # never sent, so it can never signal completion. Only applies to a job

data/lib/pgbus/active_job/delivery.rb

@@ -4,23 +4,30 @@ module Pgbus
   module ActiveJob
     # The PGMQ delivery of the job running in this fiber:
     #
-    #   Pgbus::ActiveJob::Delivery.current # => { msg_id: 42, read_ct: 2, queue_name: "default" }
+    #   Pgbus::ActiveJob::Delivery.current
+    #   # => { msg_id: 42, read_ct: 2, queue_name: "default",
+    #   #      enqueued_at: "2026-10-18 10:30:00+00", job_id: "8f0c…" }
     #
     # Set by Executor#execute around perform_now and cleared after, also when
     # the job raises; nil outside the executor (perform_now in a test, a
     # top-level inline-adapter job). A job run inline from inside an executing
     # job sees the enclosing job's delivery; StepJob only acts on it when the
-    # step row's msg_id matches, so that is harmless. Fiber-local (Thread.current[]), so concurrent jobs under
+    # step row's msg_id matches, and the adapter only when job_id is its own,
+    # so that is harmless. Fiber-local (Thread.current[]), so concurrent jobs under
     # execution_mode: :async each see their own. Pgbus::Workflow::StepJob reads
-    # read_ct to tell a redelivery after a worker died from a first delivery.
+    # read_ct to tell a redelivery after a worker died from a first delivery;
+    # the adapter reads the message identity and enqueued_at to move the
+    # job's uniqueness lock onto a retry the job enqueues (issue #564).
     #
-    # The three values sit in three fiber-locals and the Hash is built only
+    # The values sit in one fiber-local each and the Hash is built only
     # when read: setting them allocates nothing, which keeps the executor's
     # per-job allocation budget (spec/pgbus/active_job/executor_allocation_budget_spec.rb).
     module Delivery
       MSG_ID_KEY = :pgbus_delivery_msg_id
       READ_CT_KEY = :pgbus_delivery_read_ct
       QUEUE_NAME_KEY = :pgbus_delivery_queue_name
+      ENQUEUED_AT_KEY = :pgbus_delivery_enqueued_at
+      JOB_ID_KEY = :pgbus_delivery_job_id
 
       module_function
 
@@ -28,21 +35,28 @@ module Pgbus
         msg_id = Thread.current[MSG_ID_KEY]
         return nil if msg_id.nil?
 
-        { msg_id: msg_id, read_ct: Thread.current[READ_CT_KEY], queue_name: Thread.current[QUEUE_NAME_KEY] }
+        { msg_id: msg_id, read_ct: Thread.current[READ_CT_KEY], queue_name: Thread.current[QUEUE_NAME_KEY],
+          enqueued_at: Thread.current[ENQUEUED_AT_KEY], job_id: Thread.current[JOB_ID_KEY] }
       end
 
-      def with(msg_id:, read_ct:, queue_name:)
+      def with(msg_id:, read_ct:, queue_name:, enqueued_at: nil, job_id: nil)
         previous_msg_id = Thread.current[MSG_ID_KEY]
         previous_read_ct = Thread.current[READ_CT_KEY]
         previous_queue_name = Thread.current[QUEUE_NAME_KEY]
+        previous_enqueued_at = Thread.current[ENQUEUED_AT_KEY]
+        previous_job_id = Thread.current[JOB_ID_KEY]
         Thread.current[MSG_ID_KEY] = msg_id
         Thread.current[READ_CT_KEY] = read_ct
         Thread.current[QUEUE_NAME_KEY] = queue_name
+        Thread.current[ENQUEUED_AT_KEY] = enqueued_at
+        Thread.current[JOB_ID_KEY] = job_id
         yield
       ensure
         Thread.current[MSG_ID_KEY] = previous_msg_id
         Thread.current[READ_CT_KEY] = previous_read_ct
         Thread.current[QUEUE_NAME_KEY] = previous_queue_name
+        Thread.current[ENQUEUED_AT_KEY] = previous_enqueued_at
+        Thread.current[JOB_ID_KEY] = previous_job_id
       end
     end
   end