[#417] Abort multipart upload using tree service

Signed-off-by: Denis Kirillov <denis@nspcc.ru>

api/handler/multipart_upload.go

@@ -584,17 +584,14 @@ func (h *handler) AbortMultipartUploadHandler(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	var (
-		queryValues = reqInfo.URL.Query()
-		uploadID    = queryValues.Get(uploadIDHeaderName)
-		additional  = []zap.Field{zap.String("uploadID", uploadID), zap.String("Key", reqInfo.ObjectName)}
+	uploadID := reqInfo.URL.Query().Get(uploadIDHeaderName)
+	additional := []zap.Field{zap.String("uploadID", uploadID), zap.String("Key", reqInfo.ObjectName)}
 
-		p = &layer.UploadInfoParams{
-			UploadID: uploadID,
-			Bkt:      bktInfo,
-			Key:      reqInfo.ObjectName,
-		}
-	)
+	p := &layer.UploadInfoParams{
+		UploadID: uploadID,
+		Bkt:      bktInfo,
+		Key:      reqInfo.ObjectName,
+	}
 
 	if err = h.obj.AbortMultipartUpload(r.Context(), p); err != nil {
 		h.logAndSendError(w, "could not abort multipart upload", reqInfo, err, additional...)

api/layer/multipart_upload.go

@@ -488,7 +488,7 @@ func (n *layer) ListMultipartUploads(ctx context.Context, p *ListMultipartUpload
 }
 
 func (n *layer) AbortMultipartUpload(ctx context.Context, p *UploadInfoParams) error {
-	_, objects, err := n.getUploadParts(ctx, p)
+	multipartInfo, objects, err := n.getUploadParts(ctx, p)
 	if err != nil {
 		return err
 	}
@@ -499,7 +499,7 @@ func (n *layer) AbortMultipartUpload(ctx context.Context, p *UploadInfoParams) e
 		}
 	}
 
-	return nil
+	return n.treeService.DeleteMultipartUpload(ctx, &p.Bkt.CID, multipartInfo.ID)
 }
 
 func (n *layer) ListParts(ctx context.Context, p *ListPartsParams) (*ListPartsInfo, error) {

api/layer/tree_service.go

@@ -51,6 +51,7 @@ type TreeService interface {
 	RemoveSystemVersion(ctx context.Context, cnrID *cid.ID, nodeID uint64) error
 
 	CreateMultipartUpload(ctx context.Context, cnrID *cid.ID, info *data.MultipartInfo) error
+	DeleteMultipartUpload(ctx context.Context, cnrID *cid.ID, multipartNodeID uint64) error
 	GetMultipartUploadsByPrefix(ctx context.Context, cnrID *cid.ID, prefix string) ([]*data.MultipartInfo, error)
 	GetMultipartUpload(ctx context.Context, cnrID *cid.ID, objectName, uploadID string) (*data.MultipartInfo, error)
 

internal/neofs/tree.go

@@ -869,6 +869,10 @@ func (c *TreeClient) GetParts(ctx context.Context, cnrID *cid.ID, multipartNodeI
 	return result, nil
 }
 
+func (c *TreeClient) DeleteMultipartUpload(ctx context.Context, cnrID *cid.ID, multipartNodeID uint64) error {
+	return c.removeNode(ctx, cnrID, systemTree, multipartNodeID)
+}
+
 func (c *TreeClient) Close() error {
 	if c.conn != nil {
 		return c.conn.Close()

internal/neofstest/tree/tree_mock.go

@@ -255,3 +255,7 @@ func (t *TreeServiceMock) AddPart(ctx context.Context, cnrID *cid.ID, multipartN
 func (t *TreeServiceMock) GetParts(ctx context.Context, cnrID *cid.ID, multipartNodeID uint64) ([]*data.PartInfo, error) {
 	panic("implement me")
 }
+
+func (t *TreeServiceMock) DeleteMultipartUpload(ctx context.Context, cnrID *cid.ID, multipartNodeID uint64) error {
+	panic("implement me")
+}