Fixes 4735: snapshot repos even if last task was deleted (#824)

Author: jlsherrill

db/migrations.latest

@@ -1 +1 @@
-20240814145645
+20240917101025

db/migrations/20240917101025_AddLastSnapshotTaskConstraint.down.sql

@@ -0,0 +1,6 @@
+BEGIN;
+
+ALTER TABLE repository_configurations
+DROP CONSTRAINT IF EXISTS fk_last_snapshot_task;
+
+COMMIT;

db/migrations/20240917101025_AddLastSnapshotTaskConstraint.up.sql

@@ -0,0 +1,12 @@
+BEGIN;
+
+update repository_configurations set last_snapshot_task_uuid = null where last_snapshot_task_uuid not in (select id from tasks);
+
+ALTER TABLE repository_configurations
+DROP CONSTRAINT IF EXISTS fk_last_snapshot_task,
+ADD CONSTRAINT fk_last_snapshot_task
+FOREIGN KEY (last_snapshot_task_uuid)
+REFERENCES tasks(id)
+ON DELETE SET NULL;
+	
+COMMIT;

pkg/dao/repository_configs.go

@@ -261,7 +261,7 @@ func (r repositoryConfigDaoImpl) extraReposToSnapshot(pdb *gorm.DB, notIn *gorm.
 		Joins("LEFT JOIN tasks on last_snapshot_task_uuid = tasks.id").
 		Where("repository_configurations.uuid not in (?)", notIn.Select("repository_configurations.uuid")).
 		Where(pdb.Or("tasks.status NOT IN ?", []string{config.TaskStatusPending, config.TaskStatusRunning})).
-		Order("tasks.finished_at ASC").Limit(count).Find(&extra)
+		Order("tasks.finished_at ASC NULLS FIRST").Limit(count).Find(&extra)
 	return extra, query.Error
 }
 

pkg/dao/repository_configs_test.go

@@ -1782,7 +1782,10 @@ func (suite *RepositoryConfigSuite) TestUpdateLastSnapshotTask() {
 	assert.NoError(t, err)
 	assert.Len(t, uuids, repoConfigCount)
 
-	taskUUID := uuid.NewString()
+	tasks, err := seeds.SeedTasks(suite.tx, 1, seeds.TaskSeedOptions{Status: "finished"})
+	require.NoError(t, err)
+
+	taskUUID := tasks[0].Id.String()
 
 	err = dao.UpdateLastSnapshotTask(context.Background(), taskUUID, orgID, uuids[0])
 	assert.Nil(t, err)

pkg/dao/task_info_test.go

@@ -790,3 +790,19 @@ func (suite *TaskInfoSuite) createTemplateTask(orgID string) (models.TaskInfo, a
 
 	return task, template
 }
+
+func (suite *TaskInfoSuite) TestDeleteTask() {
+	t := suite.T()
+	tasks, err := seeds.SeedTasks(suite.tx, 1, seeds.TaskSeedOptions{Status: "finished"})
+	require.NoError(t, err)
+	taskUUID := tasks[0].Id.String()
+
+	repos, err := seeds.SeedRepositoryConfigurations(suite.tx, 1, seeds.SeedOptions{OrgID: "someOrg", TaskID: taskUUID})
+	assert.NoError(t, err)
+	assert.NoError(t, suite.tx.Model(&models.TaskInfo{}).Where("id = ?", taskUUID).Delete(tasks[0]).Error)
+
+	rc := models.RepositoryConfiguration{}
+	assert.NoError(t, suite.tx.Where("uuid = ?", repos[0].UUID).First(&rc).Error)
+	assert.Equal(t, repos[0].UUID, rc.UUID)
+	assert.Empty(t, rc.LastSnapshotTaskUUID)
+}

pkg/tasks/queue/pgqueue.go

@@ -118,7 +118,7 @@ const (
                 DELETE FROM task_heartbeats
                 WHERE id = $1`
 	sqlDeleteAllTasks = `
-                TRUNCATE tasks, task_heartbeats, task_dependencies`
+                TRUNCATE task_heartbeats, task_dependencies; DELETE FROM TASKS;`
 )
 
 // These interfaces represent all the interactions with pgxpool that are needed for the pgqueue
@@ -821,7 +821,7 @@ func (p *PgQueue) IdFromToken(token uuid.UUID) (id uuid.UUID, isRunning bool, er
 func (p *PgQueue) RemoveAllTasks() error {
 	_, err := p.Pool.Exec(context.Background(), sqlDeleteAllTasks)
 	if err != nil {
-		return fmt.Errorf("error removing all tasks")
+		return fmt.Errorf("error removing all tasks: %w", err)
 	}
 	return nil
 }