cleanup by rule error

Author: yeyuanjie

models/packages/package_version.go

@@ -180,7 +180,6 @@ type PackageSearchOptions struct {
 	RepoID          int64
 	Type            Type
 	PackageID       int64
-	LtVersionID     int64
 	Name            SearchValue       // only results with the specific name are found
 	Version         SearchValue       // only results with the specific version are found
 	Properties      map[string]string // only results are found which contain all listed version properties with the specific value
@@ -211,9 +210,6 @@ func (opts *PackageSearchOptions) ToConds() builder.Cond {
 	if opts.PackageID != 0 {
 		cond = cond.And(builder.Eq{"package.id": opts.PackageID})
 	}
-	if opts.LtVersionID != 0 {
-		cond = cond.And(builder.Lt{"package_version.id": opts.LtVersionID})
-	}
 	if opts.Name.Value != "" {
 		if opts.Name.ExactMatch {
 			cond = cond.And(builder.Eq{"package.lower_name": strings.ToLower(opts.Name.Value)})

routers/web/shared/packages/packages.go

@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	"code.gitea.io/gitea/modules/templates"
-	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/web"
 	"code.gitea.io/gitea/services/context"
 	"code.gitea.io/gitea/services/forms"
@@ -155,23 +154,24 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) {
 
 	versionsToRemove := make([]*packages_model.PackageDescriptor, 0, 10)
 
-	limit := 200
 	for _, p := range packages {
-		lastVersionID := int64(0)
+		skip := pcr.KeepCount
 		for {
 			pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
-				PackageID:   p.ID,
-				IsInternal:  optional.Some(false),
-				Sort:        packages_model.SortCreatedDesc,
-				Paginator:   db.NewAbsoluteListOptions(util.Iif(lastVersionID > 0, 0, pcr.KeepCount), limit),
-				LtVersionID: lastVersionID,
+				PackageID:  p.ID,
+				IsInternal: optional.Some(false),
+				Sort:       packages_model.SortCreatedDesc,
+				Paginator:  db.NewAbsoluteListOptions(skip, 200),
 			})
 			if err != nil {
 				ctx.ServerError("SearchVersions", err)
 				return
 			}
+			if len(pvs) == 0 {
+				break
+			}
 			for _, pv := range pvs {
-				lastVersionID = pv.ID
+				skip += 1
 				if skip, err := container_service.ShouldBeSkipped(ctx, pcr, p, pv); err != nil {
 					ctx.ServerError("ShouldBeSkipped", err)
 					return
@@ -201,9 +201,7 @@ func SetRulePreviewContext(ctx *context.Context, owner *user_model.User) {
 				}
 				versionsToRemove = append(versionsToRemove, pd)
 			}
-			if len(pvs) < limit {
-				break
-			}
+
 		}
 	}
 

services/packages/cleanup/cleanup.go

@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/optional"
 	packages_module "code.gitea.io/gitea/modules/packages"
-	"code.gitea.io/gitea/modules/util"
 	packages_service "code.gitea.io/gitea/services/packages"
 	alpine_service "code.gitea.io/gitea/services/packages/alpine"
 	arch_service "code.gitea.io/gitea/services/packages/arch"
@@ -59,23 +58,25 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
 		}
 
 		anyVersionDeleted := false
-		limit := 200
 		for _, p := range packages {
-			lastVersionID := int64(0)
+			skip := pcr.KeepCount
 			for {
 				pvs, _, err := packages_model.SearchVersions(ctx, &packages_model.PackageSearchOptions{
-					PackageID:   p.ID,
-					IsInternal:  optional.Some(false),
-					Sort:        packages_model.SortCreatedDesc,
-					Paginator:   db.NewAbsoluteListOptions(util.Iif(lastVersionID > 0, 0, pcr.KeepCount), limit),
-					LtVersionID: lastVersionID,
+					PackageID:  p.ID,
+					IsInternal: optional.Some(false),
+					Sort:       packages_model.SortCreatedDesc,
+					Paginator:  db.NewAbsoluteListOptions(skip, 200),
 				})
 				if err != nil {
 					return fmt.Errorf("CleanupRule [%d]: SearchVersions failed: %w", pcr.ID, err)
 				}
+				if len(pvs) == 0 {
+					break
+				}
+				log.Debug("%v pvs %v", skip, len(pvs))
 				versionDeleted := false
+				skip += len(pvs)
 				for _, pv := range pvs {
-					lastVersionID = pv.ID
 					if pcr.Type == packages_model.TypeContainer {
 						if skip, err := container_service.ShouldBeSkipped(ctx, pcr, p, pv); err != nil {
 							return fmt.Errorf("CleanupRule [%d]: container.ShouldBeSkipped failed: %w", pcr.ID, err)
@@ -108,7 +109,7 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
 					if err := packages_service.DeletePackageVersionAndReferences(ctx, pv); err != nil {
 						return fmt.Errorf("CleanupRule [%d]: DeletePackageVersionAndReferences failed: %w", pcr.ID, err)
 					}
-
+					skip -= 1
 					versionDeleted = true
 					anyVersionDeleted = true
 				}
@@ -124,9 +125,7 @@ func ExecuteCleanupRules(outerCtx context.Context) error {
 						}
 					}
 				}
-				if len(pvs) < limit {
-					break
-				}
+
 			}
 		}