fix: discard the build record git:sync starts when nothing is built
cmd-git-sync calls dokku_setup_build_capture before the clone/fetch, because it cannot know whether there is anything to deploy until it has fetched. Both paths that then decline to build - a plain `git:sync` with no build flag, and a `--build-if-changes` poll that finds the remote unchanged - returned without ever finalizing that record. The record stayed at status=running forever, which has three consequences on an app polled on a timer: - PruneAppBuilds only runs from builds-record-finalize, so nothing prunes the ticks while the app is idle; they accumulate without bound, invisibly, because builds:list caps output at the retention count. - The next real deploy's ReapAbandonedBuilds finalizes each of them as status=failed, exit_code=-1, with finished_at stamped at the moment of reaping - indistinguishable on disk from a build that really failed, and with a duration that grew to the polling interval. - That same deploy's prune then keeps the newest records by started_at, which after an idle stretch are the ticks, deleting the last real deploy's record and log. Add a builds-record-discard trigger that removes a non-terminal record and its log, and call it from both no-op paths in cmd-git-sync. The trigger leaves missing and already-terminal records alone, so it can never delete real history. Fixes #9030 Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
aa39920cc7
commit
dc27668e09
10 files changed
+188
-1
No files matched your search
@@ -553,6 +553,72 @@ func TestRecordStartFinalizeIdempotency(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordDiscardRemovesRunningRecord(t *testing.T) {
|
||||
setupTestRoot(t)
|
||||
app := "discard"
|
||||
id := GenerateBuildID()
|
||||
|
||||
if err := TriggerBuildsRecordStart(app, id, strconv.Itoa(os.Getpid()), string(BuildSourceGitSync)); err != nil {
|
||||
t.Fatalf("record-start: %v", err)
|
||||
}
|
||||
if err := os.WriteFile(LogPathFor(app, id), []byte("fetch chatter\n"), 0644); err != nil {
|
||||
t.Fatalf("write log: %v", err)
|
||||
}
|
||||
|
||||
if err := TriggerBuildsRecordDiscard(app, id); err != nil {
|
||||
t.Fatalf("record-discard: %v", err)
|
||||
}
|
||||
|
||||
if _, err := os.Stat(RecordPath(app, id)); !os.IsNotExist(err) {
|
||||
t.Errorf("record still present after discard, stat err = %v", err)
|
||||
}
|
||||
if _, err := os.Stat(LogPathFor(app, id)); !os.IsNotExist(err) {
|
||||
t.Errorf("log still present after discard, stat err = %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordDiscardLeavesTerminalRecordsAlone(t *testing.T) {
|
||||
setupTestRoot(t)
|
||||
app := "discard-terminal"
|
||||
id := GenerateBuildID()
|
||||
|
||||
if err := TriggerBuildsRecordStart(app, id, strconv.Itoa(os.Getpid()), string(BuildSourceGitSync)); err != nil {
|
||||
t.Fatalf("record-start: %v", err)
|
||||
}
|
||||
if err := TriggerBuildsRecordFinalize(app, id, "0"); err != nil {
|
||||
t.Fatalf("finalize: %v", err)
|
||||
}
|
||||
|
||||
if err := TriggerBuildsRecordDiscard(app, id); err != nil {
|
||||
t.Fatalf("record-discard: %v", err)
|
||||
}
|
||||
|
||||
got, err := ReadBuild(app, id)
|
||||
if err != nil {
|
||||
t.Fatalf("read after discard: %v", err)
|
||||
}
|
||||
if got.Status != BuildStatusSucceeded {
|
||||
t.Errorf("Status = %v, want succeeded (discard must not touch finalized history)", got.Status)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordDiscardMissingRecordIsNoop(t *testing.T) {
|
||||
setupTestRoot(t)
|
||||
if err := TriggerBuildsRecordDiscard("discard-missing", GenerateBuildID()); err != nil {
|
||||
t.Errorf("discard of missing record = %v, want nil", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordDiscardValidatesArguments(t *testing.T) {
|
||||
setupTestRoot(t)
|
||||
if err := TriggerBuildsRecordDiscard("", "abc"); err == nil {
|
||||
t.Error("discard with empty app = nil, want error")
|
||||
}
|
||||
if err := TriggerBuildsRecordDiscard("app", ""); err == nil {
|
||||
t.Error("discard with empty build id = nil, want error")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRecordStartUnknownSourceCoercedToUnknown(t *testing.T) {
|
||||
setupTestRoot(t)
|
||||
app := "src"
|
||||
|
||||
Reference in new issue
Block a user