Use scratch space for non-archive uploads

Basically a follow up to 3219 for upload sources,
which suffer from the same issue of losing sparseness.

Signed-off-by: Alex Kalenyuk <[email protected]>

Author: akalenyu

cmd/cdi-cloner/clone-source.go

@@ -6,6 +6,7 @@ import (
 	"crypto/x509"
 	"errors"
 	"flag"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -55,7 +56,7 @@ func (er *execReader) Close() error {
 }
 
 func init() {
-	flag.StringVar(&contentType, "content-type", "", "filesystem-clone|blockdevice-clone")
+	flag.StringVar(&contentType, "content-type", "", fmt.Sprintf("%s|%s", common.FilesystemCloneContentType, common.BlockdeviceClone))
 	flag.StringVar(&mountPoint, "mount", "", "pvc mount point")
 	flag.Uint64Var(&uploadBytes, "upload-bytes", 0, "approx number of bytes in input")
 	klog.InitFlags(nil)
@@ -133,7 +134,7 @@ func pipeToSnappy(reader io.ReadCloser) io.ReadCloser {
 
 func validateContentType() {
 	switch contentType {
-	case "filesystem-clone", "blockdevice-clone":
+	case common.FilesystemCloneContentType, common.BlockdeviceClone:
 	default:
 		klog.Fatalf("Invalid content-type %q", contentType)
 	}
@@ -198,13 +199,13 @@ func newTarReader(preallocation bool) (io.ReadCloser, error) {
 
 func getInputStream(preallocation bool) io.ReadCloser {
 	switch contentType {
-	case "filesystem-clone":
+	case common.FilesystemCloneContentType:
 		rc, err := newTarReader(preallocation)
 		if err != nil {
 			klog.Fatalf("Error creating tar reader for %q: %+v", mountPoint, err)
 		}
 		return rc
-	case "blockdevice-clone":
+	case common.BlockdeviceClone:
 		rc, err := os.Open(mountPoint)
 		if err != nil {
 			klog.Fatalf("Error opening block device %q: %+v", mountPoint, err)

pkg/importer/upload-datasource.go

@@ -51,10 +51,6 @@ func (ud *UploadDataSource) Info() (ProcessingPhase, error) {
 	if ud.contentType == cdiv1.DataVolumeArchive {
 		return ProcessingPhaseTransferDataDir, nil
 	}
-	if !ud.readers.Convert {
-		// Uploading a raw file, we can write that directly to the target.
-		return ProcessingPhaseTransferDataFile, nil
-	}
 	return ProcessingPhaseTransferScratch, nil
 }
 

pkg/importer/upload-datasource_test.go

@@ -71,14 +71,14 @@ var _ = Describe("Upload data source", func() {
 		Expect(ProcessingPhaseTransferDataDir).To(Equal(result))
 	})
 
-	It("Info should return TransferData, when passed in a valid raw image", func() {
+	It("Info should return TransferScratch, when passed in a valid raw image", func() {
 		// Don't need to defer close, since ud.Close will close the reader
 		file, err := os.Open(tinyCoreFilePath)
 		Expect(err).NotTo(HaveOccurred())
 		ud = NewUploadDataSource(file, dvKubevirt)
 		result, err := ud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 	})
 
 	DescribeTable("calling transfer should", func(fileName string, dvContentType cdiv1.DataVolumeContentType, expectedPhase ProcessingPhase, scratchPath string, want []byte, wantErr bool) {
@@ -136,7 +136,7 @@ var _ = Describe("Upload data source", func() {
 		ud = NewUploadDataSource(sourceFile, dvKubevirt)
 		result, err := ud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 		result, err = ud.TransferFile(filepath.Join(tmpDir, "file"))
 		Expect(err).ToNot(HaveOccurred())
 		Expect(ProcessingPhaseResize).To(Equal(result))
@@ -149,7 +149,7 @@ var _ = Describe("Upload data source", func() {
 		ud = NewUploadDataSource(sourceFile, dvKubevirt)
 		result, err := ud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 		result, err = ud.TransferFile("/invalidpath/invalidfile")
 		Expect(err).To(HaveOccurred())
 		Expect(ProcessingPhaseError).To(Equal(result))
@@ -204,14 +204,14 @@ var _ = Describe("Async Upload data source", func() {
 		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 	})
 
-	It("Info should return TransferData, when passed in a valid raw image", func() {
+	It("Info should return TransferScratch, when passed in a valid raw image", func() {
 		// Don't need to defer close, since ud.Close will close the reader
 		file, err := os.Open(tinyCoreFilePath)
 		Expect(err).NotTo(HaveOccurred())
 		aud = NewAsyncUploadDataSource(file)
 		result, err := aud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 	})
 
 	DescribeTable("calling transfer should", func(fileName, scratchPath string, want []byte, wantErr bool) {
@@ -260,7 +260,7 @@ var _ = Describe("Async Upload data source", func() {
 		aud = NewAsyncUploadDataSource(sourceFile)
 		result, err := aud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 		result, err = aud.TransferFile(filepath.Join(tmpDir, "file"))
 		Expect(err).ToNot(HaveOccurred())
 		Expect(ProcessingPhaseValidatePause).To(Equal(result))
@@ -274,7 +274,7 @@ var _ = Describe("Async Upload data source", func() {
 		aud = NewAsyncUploadDataSource(sourceFile)
 		result, err := aud.Info()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ProcessingPhaseTransferDataFile).To(Equal(result))
+		Expect(ProcessingPhaseTransferScratch).To(Equal(result))
 		result, err = aud.TransferFile("/invalidpath/invalidfile")
 		Expect(err).To(HaveOccurred())
 		Expect(ProcessingPhaseError).To(Equal(result))

tests/upload_test.go

@@ -413,8 +413,6 @@ var _ = Describe("[rfe_id:138][crit:high][vendor:[email protected]][level:compon
 					same, err := f.VerifyTargetPVCContentMD5(f.Namespace, archivePVC, pathInPvc, expectedMd5)
 					Expect(err).ToNot(HaveOccurred())
 					Expect(same).To(BeTrue())
-					By("Verifying the image is sparse")
-					Expect(f.VerifySparse(f.Namespace, archivePVC, pathInPvc, utils.UploadFileSize)).To(BeTrue())
 				}
 			} else {
 				checkFailureNoValidToken(archivePVC)
@@ -733,8 +731,6 @@ var _ = Describe("[rfe_id:138][crit:high][vendor:[email protected]][level:compon
 						same, err := f.VerifyTargetPVCContentMD5(f.Namespace, pvc, pathInPvc, expectedMd5)
 						Expect(err).ToNot(HaveOccurred())
 						Expect(same).To(BeTrue())
-						By("Verifying the image is sparse")
-						Expect(f.VerifySparse(f.Namespace, pvc, pathInPvc, utils.UploadFileSize)).To(BeTrue())
 					}
 				} else {
 					checkFailureNoValidToken(pvcPrime)