Fix uploading for block devices that exceed requested size

Signed-off-by: Andrei Kvapil <kvapss@gmail.com>
kubevirt · Oct 14, 2024 · 90fdd7f · 90fdd7f
1 parent 7b330eb
commit 90fdd7f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/importer/data-processor.go b/pkg/importer/data-processor.go
@@ -368,7 +368,14 @@ func (dp *DataProcessor) calculateTargetSize() int64 {
 		klog.V(1).Infof("Request image size not empty.\n")
 		newImageSizeQuantity := resource.MustParse(dp.requestImageSize)
 		minQuantity := util.MinQuantity(targetQuantity, &newImageSizeQuantity)
-		targetQuantity = &minQuantity
+		// Override target size to the requested one
+		if size >= int64(0) {
+			// Filesystem volume
+			targetQuantity = &minQuantity
+		} else if targetQuantity.Cmp(minQuantity) == -1 {
+			// Block volume with size smaller than requested
+			targetQuantity = &minQuantity
+		}
 	}
 	klog.V(1).Infof("Target size %s.\n", targetQuantity.String())
 	targetSize := targetQuantity.Value()