Do not collect repositories before pruning

Signed-off-by: Gladkov Alexey <[email protected]>

Author: legionus

pkg/dockerregistry/server/prune/prune.go

@@ -58,6 +58,29 @@ func (l *repoLayersPruner) Prune(ctx context.Context) error {
 	return nil
 }
 
+type repoPruner struct {
+	storageDriver driver.StorageDriver
+	name          string
+}
+
+func (r *repoPruner) Prune(ctx context.Context) error {
+	if len(r.name) == 0 {
+		return nil
+	}
+
+	logger := context.GetLogger(ctx)
+	vacuum := storage.NewVacuum(ctx, r.storageDriver)
+
+	logger.Debugln("Removing %s repository", r.name)
+	if err := vacuum.RemoveRepository(r.name); err != nil {
+		return fmt.Errorf("unable to remove the repository %s: %v", r.name, err)
+	}
+
+	r.name = ""
+
+	return nil
+}
+
 // Prune removes blobs which are not used by Images in OpenShift.
 //
 // On error, the Summary will contain what was deleted so far.
@@ -107,13 +130,18 @@ func Prune(ctx context.Context, storageDriver driver.StorageDriver, registry dis
 	var stats Summary
 
 	layersPruner := &repoLayersPruner{}
+	repoPruner := &repoPruner{
+		storageDriver: storageDriver,
+	}
 
-	var reposToDelete []string
 	err = repositoryEnumerator.Enumerate(ctx, func(repoName string) error {
 		if !dryRun {
 			if err := layersPruner.Prune(ctx); err != nil {
 				return err
 			}
+			if err := repoPruner.Prune(ctx); err != nil {
+				return err
+			}
 		}
 
 		logger.Debugln("Processing repository", repoName)
@@ -132,8 +160,12 @@ func Prune(ctx context.Context, storageDriver driver.StorageDriver, registry dis
 		if kerrors.IsNotFound(err) {
 			logger.Printf("The image stream %s/%s is not found, will remove the whole repository", ref.Namespace, ref.Name)
 
-			// We cannot delete the repository at this point, because it would break Enumerate.
-			reposToDelete = append(reposToDelete, repoName)
+			if !dryRun {
+				// We cannot delete the repository at this point, because it would break Enumerate.
+				repoPruner.name = repoName
+			} else {
+				logger.Printf("Would delete repository: %s", repoName)
+			}
 
 			return nil
 		} else if err != nil {
@@ -190,21 +222,12 @@ func Prune(ctx context.Context, storageDriver driver.StorageDriver, registry dis
 	if err := layersPruner.Prune(ctx); err != nil {
 		return stats, err
 	}
+	if err := repoPruner.Prune(ctx); err != nil {
+		return stats, err
+	}
 
 	vacuum := storage.NewVacuum(ctx, storageDriver)
 
-	logger.Debugln("Removing repositories")
-	for _, repoName := range reposToDelete {
-		if dryRun {
-			logger.Printf("Would delete repository: %s", repoName)
-			continue
-		}
-
-		if err = vacuum.RemoveRepository(repoName); err != nil {
-			return stats, fmt.Errorf("unable to remove the repository %s: %v", repoName, err)
-		}
-	}
-
 	logger.Debugln("Processing blobs")
 	blobStatter := registry.BlobStatter()
 	err = registry.Blobs().Enumerate(ctx, func(dgst digest.Digest) error {