fix: Cleanup multi-part session & layer parts after upload

Signed-off-by: jay-dee7 <[email protected]>
containerish · Nov 26, 2023 · 6918b9a · 6918b9a
1 parent b1f5c39
commit 6918b9a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/dfs/ipfs/p2p/p2p.go b/dfs/ipfs/p2p/p2p.go
@@ -188,6 +188,10 @@ func (ipfs *ipfsP2p) CompleteMultipartUpload(
 			}
 		}
 
+		// cleanup session & cached layer parts
+		ipfs.uploadSession.Del(uploadId)
+		ipfs.uploadParts.Del(uploadId)
+
 		return path.RootCid().String(), nil
 	}
 

diff --git a/registry/v2/registry.go b/registry/v2/registry.go
@@ -301,7 +301,11 @@ func (r *registry) MonolithicUpload(ctx echo.Context) error {
 	imageDigest := ctx.QueryParam("digest")
 	buf := &bytes.Buffer{}
 	if _, err := io.Copy(buf, ctx.Request().Body); err != nil {
-		errMsg := common.RegistryErrorResponse(RegistryErrorCodeBlobUploadInvalid, "error while reading request body", nil)
+		errMsg := common.RegistryErrorResponse(
+			RegistryErrorCodeBlobUploadInvalid,
+			"error while reading request body",
+			nil,
+		)
 		echoErr := ctx.JSONBlob(http.StatusNotFound, errMsg.Bytes())
 		r.logger.Log(ctx, fmt.Errorf("%s", errMsg)).Send()
 		return echoErr
@@ -522,7 +526,11 @@ func (r *registry) MonolithicPut(ctx echo.Context) error {
 
 	txnOp, ok := r.txnMap[uploadID]
 	if !ok {
-		errMsg := common.RegistryErrorResponse(RegistryErrorCodeUnknown, "transaction does not exist for uuid -"+identifier, nil)
+		errMsg := common.RegistryErrorResponse(
+			RegistryErrorCodeUnknown,
+			"transaction does not exist for uuid -"+identifier,
+			nil,
+		)
 		echoErr := ctx.JSONBlob(http.StatusBadRequest, errMsg.Bytes())
 		r.logger.Log(ctx, fmt.Errorf("%s", errMsg)).Send()
 		return echoErr
@@ -649,7 +657,11 @@ func (r *registry) CompleteUpload(ctx echo.Context) error {
 
 	txnOp, ok := r.txnMap[uploadID]
 	if !ok {
-		errMsg := common.RegistryErrorResponse(RegistryErrorCodeUnknown, "transaction does not exist for uuid -"+identifier, nil)
+		errMsg := common.RegistryErrorResponse(
+			RegistryErrorCodeUnknown,
+			"transaction does not exist for uuid -"+identifier,
+			nil,
+		)
 		echoErr := ctx.JSONBlob(http.StatusBadRequest, errMsg.Bytes())
 		r.logger.Log(ctx, fmt.Errorf("%s", errMsg)).Send()
 		return echoErr