Address review comments

Signed-off-by: Alexander Wels <awels@redhat.com>
kubevirt · Aug 3, 2023 · 5c80162 · 5c80162
1 parent f1d2ad2
commit 5c80162
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/pkg/importer/http-datasource.go b/pkg/importer/http-datasource.go
@@ -130,20 +130,13 @@ func (hs *HTTPDataSource) Info() (ProcessingPhase, error) {
 	if hs.contentType == cdiv1.DataVolumeArchive {
 		return ProcessingPhaseTransferDataDir, nil
 	}
-	if hs.readers.Convert {
-		// removing check for hs.brokenForQemuImg, and always assuming it is true
-		// revert once we are able to get nbdkit 1.35.8, which contains a fix for the
-		// slow download speed.
-		return ProcessingPhaseTransferScratch, nil
-	}
-	if hs.readers.Archived || hs.customCA != "" {
+	if !hs.readers.Convert && (hs.readers.Archived || hs.customCA != "") {
 		return ProcessingPhaseTransferDataFile, nil
 	}
-	hs.url, _ = url.Parse(fmt.Sprintf("nbd+unix:///?socket=%s", nbdkitSocket))
-	if err = hs.n.StartNbdkit(hs.endpoint.String()); err != nil {
-		return ProcessingPhaseError, err
-	}
-	return ProcessingPhaseConvert, nil
+	// removing check for hs.brokenForQemuImg, and always assuming it is true
+	// revert once we are able to get nbdkit 1.35.8, which contains a fix for the
+	// slow download speed.
+	return ProcessingPhaseTransferScratch, nil
 }
 
 // Transfer is called to transfer the data from the source to a scratch location.

diff --git a/pkg/importer/http-datasource_test.go b/pkg/importer/http-datasource_test.go
@@ -93,11 +93,6 @@ var _ = Describe("Http data source", func() {
 		if !wantErr {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(expectedPhase).To(Equal(newPhase))
-			if newPhase == ProcessingPhaseConvert {
-				expectURL, err := url.Parse("nbd+unix:///?socket=/tmp/nbdkit.sock")
-				Expect(err).NotTo(HaveOccurred())
-				Expect(expectURL).To(Equal(dp.GetURL()))
-			}
 		} else {
 			Expect(err).To(HaveOccurred())
 		}

diff --git a/tests/import_test.go b/tests/import_test.go
@@ -454,6 +454,9 @@ var _ = Describe("[rfe_id:1118][crit:high][vendor:cnv-qe@redhat.com][level:compo
 		afterCMD(portForwardCmd)
 	})
 
+	// Skipping this test until we can get progress information again. What happens is that the go
+	// http client cannot determine the total size, and thus the prometheus endpoint is not initialized
+	// This causes this test to now fail because the endpoint is not there, skipping for now.
 	PIt("[test_id:4970]Import pod should have prometheus stats available while importing", func() {
 		var endpoint *v1.Endpoints
 		c := f.K8sClient