Skip to content

Bind retry recovery to the current queue schema #387

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

Merged
rldyourmnd merged 1 commit into from
Sep 3, 2026
Merged

Bind retry recovery to the current queue schema #387

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion internal/providerretry/recovery_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import (
"strings"
"syscall"
"time"

"github.com/NDDev-OpenNetwork/github-actions/internal/queueintent"
)

const minimumTerminalRecoveryAge = time.Minute
Expand Down Expand Up @@ -323,7 +325,7 @@ func requireActiveQueueJob(path, jobID string, now time.Time) error {
ExpiresAt time.Time `json:"expires_at"`
} `json:"intents"`
}
if err := json.Unmarshal(data, &queue); err != nil || queue.SchemaVersion != 4 || queue.Intents == nil {
if err := json.Unmarshal(data, &queue); err != nil || queue.SchemaVersion != queueintent.SchemaVersion || queue.Intents == nil {
return errors.New("queue journal identity is invalid")
}
for _, intent := range queue.Intents {
Expand Down
10 changes: 6 additions & 4 deletions internal/providerretry/recovery_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import (
"strings"
"testing"
"time"

"github.com/NDDev-OpenNetwork/github-actions/internal/queueintent"
)

func TestRecoverTerminalUsesExactCASAndGeneration(t *testing.T) {
Expand Down Expand Up @@ -114,8 +116,8 @@ func TestRecoverExactJobTerminalRequiresLiveQueueProofAndCAS(t *testing.T) {
if err := os.WriteFile(journalPath, content, 0o600); err != nil {
t.Fatal(err)
}
queue := fmt.Sprintf(`{"schema_version":4,"intents":{"github-scale-set-job:v2:3:job-one":{"job_id":"job-one","state":"assigned","expires_at":%q}}}`,
time.Now().UTC().Add(time.Hour).Format(time.RFC3339Nano))
queue := fmt.Sprintf(`{"schema_version":%d,"intents":{"github-scale-set-job:v2:3:job-one":{"job_id":"job-one","state":"assigned","expires_at":%q}}}`,
queueintent.SchemaVersion, time.Now().UTC().Add(time.Hour).Format(time.RFC3339Nano))
if err := os.WriteFile(queuePath, []byte(queue), 0o600); err != nil {
t.Fatal(err)
}
Expand All @@ -142,8 +144,8 @@ func TestRecoverExactJobTerminalRejectsMissingOrInvalidQueueProof(t *testing.T)
name string
queue string
}{
{name: "job absent", queue: `{"schema_version":4,"intents":{}}`},
{name: "job running", queue: `{"schema_version":4,"intents":{"job":{"job_id":"job-one","state":"running","expires_at":"2099-01-01T00:00:00Z"}}}`},
{name: "job absent", queue: fmt.Sprintf(`{"schema_version":%d,"intents":{}}`, queueintent.SchemaVersion)},
{name: "job running", queue: fmt.Sprintf(`{"schema_version":%d,"intents":{"job":{"job_id":"job-one","state":"running","expires_at":"2099-01-01T00:00:00Z"}}}`, queueintent.SchemaVersion)},
{name: "wrong schema", queue: `{"schema_version":3,"intents":{"job":{"job_id":"job-one","state":"assigned","expires_at":"2099-01-01T00:00:00Z"}}}`},
} {
t.Run(test.name, func(t *testing.T) {
Expand Down