add cron task to delete need-delete artifacts

Author: fuxiaohei

models/actions/artifact.go

@@ -164,6 +164,13 @@ func ListNeedExpiredArtifacts(ctx context.Context) ([]*ActionArtifact, error) {
 		Where("expired_unix < ? AND status = ?", timeutil.TimeStamp(time.Now().Unix()), ArtifactStatusUploadConfirmed).Find(&arts)
 }
 
+// ListNeedDeleteArtifacts returns all need delete artifacts but not deleted
+func ListNeedDeleteArtifacts(ctx context.Context) ([]*ActionArtifact, error) {
+	arts := make([]*ActionArtifact, 0, 10)
+	return arts, db.GetEngine(ctx).
+		Where("status = ?", ArtifactStatusNeedDelete).Find(&arts)
+}
+
 // SetArtifactExpired sets an artifact to expired
 func SetArtifactExpired(ctx context.Context, artifactID int64) error {
 	_, err := db.GetEngine(ctx).Where("id=? AND status = ?", artifactID, ArtifactStatusUploadConfirmed).Cols("status").Update(&ActionArtifact{Status: int64(ArtifactStatusExpired)})
@@ -175,3 +182,9 @@ func SetArtifactNeedDelete(ctx context.Context, runID int64, name string) error
 	_, err := db.GetEngine(ctx).Where("run_id=? AND artifact_name=? AND status = ?", runID, name, ArtifactStatusUploadConfirmed).Cols("status").Update(&ActionArtifact{Status: int64(ArtifactStatusNeedDelete)})
 	return err
 }
+
+// SetArtifactDeleted sets an artifact to deleted
+func SetArtifactDeleted(ctx context.Context, artifactID int64) error {
+	_, err := db.GetEngine(ctx).Where("id=?", artifactID).Cols("status").Update(&ActionArtifact{Status: int64(ArtifactStatusDeleted)})
+	return err
+}

services/actions/cleanup.go

@@ -20,8 +20,18 @@ func Cleanup(taskCtx context.Context, olderThan time.Duration) error {
 	return CleanupArtifacts(taskCtx)
 }
 
-// CleanupArtifacts removes expired artifacts and set records expired status
+// CleanupArtifacts removes expired add need-deleted artifacts and set records expired status
 func CleanupArtifacts(taskCtx context.Context) error {
+	if err := cleanExpiredArtifacts(taskCtx); err != nil {
+		return err
+	}
+	if err := cleanNeedDeleteArtifacts(taskCtx); err != nil {
+		return err
+	}
+	return nil
+}
+
+func cleanExpiredArtifacts(taskCtx context.Context) error {
 	artifacts, err := actions.ListNeedExpiredArtifacts(taskCtx)
 	if err != nil {
 		return err
@@ -40,3 +50,23 @@ func CleanupArtifacts(taskCtx context.Context) error {
 	}
 	return nil
 }
+
+func cleanNeedDeleteArtifacts(taskCtx context.Context) error {
+	artifacts, err := actions.ListNeedDeleteArtifacts(taskCtx)
+	if err != nil {
+		return err
+	}
+	log.Info("Found %d need-deleted artifacts", len(artifacts))
+	for _, artifact := range artifacts {
+		if err := storage.ActionsArtifacts.Delete(artifact.StoragePath); err != nil {
+			log.Error("Cannot delete artifact %d: %v", artifact.ID, err)
+			continue
+		}
+		if err := actions.SetArtifactDeleted(taskCtx, artifact.ID); err != nil {
+			log.Error("Cannot set artifact %d deleted: %v", artifact.ID, err)
+			continue
+		}
+		log.Info("Artifact %d set deleted", artifact.ID)
+	}
+	return nil
+}