Merge pull request #3556 from Xiol/issue-3554-abort-lease-on-failure

fix: Abort lease on upload failure
vmware · Oct 21, 2024 · c0321f8 · c0321f8
2 parents 26e9cb4 + 36cac69
commit c0321f8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/ovf/importer/importer.go b/ovf/importer/importer.go
@@ -161,6 +161,7 @@ func (imp *Importer) Import(ctx context.Context, fpath string, opts Options) (*t
 
 	info, err := lease.Wait(ctx, spec.FileItem)
 	if err != nil {
+		_ = lease.Abort(ctx, nil)
 		return nil, err
 	}
 
@@ -169,6 +170,11 @@ func (imp *Importer) Import(ctx context.Context, fpath string, opts Options) (*t
 
 	for _, i := range info.Items {
 		if err := imp.Upload(ctx, lease, i); err != nil {
+			_ = lease.Abort(ctx, &types.LocalizedMethodFault{
+				Fault: &types.FileFault{
+					File: i.Path,
+				},
+			})
 			return nil, err
 		}
 	}