From 4c7ada15769f5ebf1ceaba3ff051f7db04e83abd Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 6 Jun 2025 21:27:43 +0800 Subject: [PATCH] fix --- routers/api/packages/container/container.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/routers/api/packages/container/container.go b/routers/api/packages/container/container.go index a235923aacd21..ccde734850305 100644 --- a/routers/api/packages/container/container.go +++ b/routers/api/packages/container/container.go @@ -403,12 +403,7 @@ func EndUploadBlob(ctx *context.Context) { } return } - doClose := true - defer func() { - if doClose { - uploader.Close() - } - }() + defer uploader.Close() if ctx.Req.Body != nil { if err := uploader.Append(ctx, ctx.Req.Body); err != nil { @@ -441,11 +436,10 @@ func EndUploadBlob(ctx *context.Context) { return } - if err := uploader.Close(); err != nil { - apiError(ctx, http.StatusInternalServerError, err) - return - } - doClose = false + // There was a strange bug: the "Close" fails with error "close .../tmp/package-upload/....: file already closed" + // AFAIK there should be no other "Close" call to the uploader between NewBlobUploader and this line. + // At least it's safe to call Close twice, so ignore the error. + _ = uploader.Close() if err := container_service.RemoveBlobUploadByID(ctx, uploader.ID); err != nil { apiError(ctx, http.StatusInternalServerError, err)