Add support for ProgressEventSkipped

The new event indicates that a blob has been skipped. This information can be used by CRI-O for more detailed image layer re-use metrics. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
containers · Jun 5, 2020 · f1c1394 · f1c1394
1 parent 8d71f3f
commit f1c1394
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/copy/copy.go b/copy/copy.go
@@ -1060,6 +1060,14 @@ func (ic *imageCopier) copyLayer(ctx context.Context, srcInfo types.BlobInfo, to
 			logrus.Debugf("Skipping blob %s (already present):", srcInfo.Digest)
 			bar := ic.c.createProgressBar(pool, srcInfo, "blob", "skipped: already exists")
 			bar.SetTotal(0, true)
+
+			// Throw an event that the layer has been skipped
+			if ic.c.progress != nil && ic.c.progressInterval > 0 {
+				ic.c.progress <- types.ProgressProperties{
+					Event:    types.ProgressEventSkipped,
+					Artifact: srcInfo,
+				}
+			}
 			return blobInfo, cachedDiffID, nil
 		}
 	}

diff --git a/types/types.go b/types/types.go
@@ -604,6 +604,10 @@ const (
 	// ProgressEventDone is fired when the data transfer has been finished for
 	// the specific artifact
 	ProgressEventDone
+
+	// ProgressEventSkipped is fired when the artifact has been skipped because
+	// its already available at the destination
+	ProgressEventSkipped
 )
 
 // ProgressProperties is used to pass information from the copy code to a monitor which