Always use scratchspace when importing and converting #2832

awels · 2023-08-01T15:55:06Z

What this PR does / why we need it:
nbdkit is slow in combination with qemu-img when importing and converting a qcow2 image. For now when converting always use scratch space, this is significantly faster. Once nbdkit 1.35.8 is available we can revisit this because that version will improve nbdkit performance significantly.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2809

Special notes for your reviewer:
Also removes old version of nbdkit left over in WORKSPACE file, as well as fixing invalid number of arguments in some error returns

Release note:

BugFix: use scratch space for all http conversion imports, to speed up the process.

tests/import_test.go

alromeros · 2023-08-03T13:04:55Z

/lgtm

mhenriks · 2023-08-03T14:35:03Z

pkg/importer/http-datasource.go

+		return ProcessingPhaseTransferScratch, nil
+	}
+	if hs.readers.Archived || hs.customCA != "" {
+		return ProcessingPhaseTransferDataFile, nil
 	}
 	hs.url, _ = url.Parse(fmt.Sprintf("nbd+unix:///?socket=%s", nbdkitSocket))


looks like nbdkit will still be called for importing raw non compressed. How's the performance with that? should we get rid of it entirely?

We need to keep it around for the multi stage import, which uses nbdkit. But you are right this will still be slow for uncompressed raw files since it uses nbdkit.

mhenriks · 2023-08-03T20:40:50Z

pkg/importer/http-datasource.go

-	if err = hs.n.StartNbdkit(hs.endpoint.String()); err != nil {
-		return ProcessingPhaseError, err
+	if !hs.readers.Convert && (hs.readers.Archived || hs.customCA != "") {
+		return ProcessingPhaseTransferDataFile, nil


I think we can technically get rid && (hs.readers.Archived || hs.customCA != "")?

No need to write a raw/iso to scratch, right?

UNLESS we want to truly respect preallocation settings. In which case, we should just always return ProcessingPhaseTransferScratch, nil for kubevirt content type and preallocation=false

Signed-off-by: Alexander Wels <awels@redhat.com>

of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed. Signed-off-by: Alexander Wels <awels@redhat.com>

return total, and this means the metrics are disabled. Signed-off-by: Alexander Wels <awels@redhat.com>

Signed-off-by: Alexander Wels <awels@redhat.com>

Fixed functional test that was not doing the right thing while running the test. Signed-off-by: Alexander Wels <awels@redhat.com>

awels · 2023-08-06T01:08:21Z

/test pull-containerized-data-importer-e2e-ceph

mhenriks · 2023-08-07T12:16:09Z

@awels test failures may be related to changes?

awels · 2023-08-07T12:46:43Z

Yes, I think so, investigating what the problem is.

alromeros · 2023-08-08T06:55:29Z

pkg/importer/data-processor.go

@@ -308,6 +308,8 @@ func (dp *DataProcessor) resize() (ProcessingPhase, error) {
 			return ProcessingPhaseError, err
 		}
 		dp.preallocationApplied = dp.preallocation
+	} else {


It's cleaner to leave dp.preallocationApplied = dp.preallocation outside the condition and do it once, but it's not a must.

/test pull-containerized-data-importer-e2e-ceph

Good point in my mind it was not logically equivalent because the stuff above could return a different phase, but that would not change outside the else.

writing to the device Signed-off-by: Alexander Wels <awels@redhat.com>

awels · 2023-08-08T15:51:17Z

/test pull-containerized-data-importer-e2e-nfs

mhenriks · 2023-08-08T20:03:10Z

pkg/importer/data-processor.go

 	}
+	dp.preallocationApplied = dp.preallocation


given the current implementation isn't preallocationApplied always true?

Only if the DV has the preallocation flag set, the value of dp.preallocation will be true in that case, false otherwise

I was mistaken when preallocationApplied should always be true. My understanding of the implementation in this PR is:

Regardless of what the user preallocation setting the disk will always be preallocated when not "converting" so raw, iso, etc

User preallocation settings are respected when "converting" from scratch space.

I am wondering if case 1 above is accurately reflected in dp.preallocationApplied?

I am not sure I can know at this point in the code, this gets run for multiple different datasources, some of which may preallocate and some may not. I do know that if the flag was set on the importer pod, then the datasource would respect it, if it was not set, it may or may not have preallocated depending on the datsource.

Maybe we need to add something to the datasource API where the datasource can indicate it preallocated or not.

alromeros · 2023-08-11T10:01:51Z

/lgtm

alromeros · 2023-08-11T10:08:55Z

Is #2743 still relevant after this merges?

mhenriks · 2023-08-11T14:54:02Z

/approve

kubevirt-bot · 2023-08-11T14:54:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mhenriks

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [mhenriks]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

awels · 2023-08-11T18:02:25Z

/cherrypick release-v1.57

kubevirt-bot · 2023-08-11T18:02:27Z

@awels: once the present PR merges, I will cherry-pick it on top of release-v1.57 in a new PR and assign it to you.

In response to this:

/cherrypick release-v1.57

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

kubevirt-bot · 2023-08-11T20:32:19Z

@awels: #2832 failed to apply on top of branch "release-v1.57":

Applying: Remove older nbdkit
Applying: When converting always use scratch space importing instead of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed.
Using index info to reconstruct a base tree...
M	pkg/importer/http-datasource_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/importer/http-datasource_test.go
CONFLICT (content): Merge conflict in pkg/importer/http-datasource_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 When converting always use scratch space importing instead of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-v1.57

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

* Remove older nbdkit Signed-off-by: Alexander Wels <awels@redhat.com> * When converting always use scratch space importing instead of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed. Signed-off-by: Alexander Wels <awels@redhat.com> * Disable metrics test for import because straight import doesn't return total, and this means the metrics are disabled. Signed-off-by: Alexander Wels <awels@redhat.com> * Fix broken functional tests Signed-off-by: Alexander Wels <awels@redhat.com> * Address review comments Signed-off-by: Alexander Wels <awels@redhat.com> * Additional review comments. Fixed functional test that was not doing the right thing while running the test. Signed-off-by: Alexander Wels <awels@redhat.com> * Always set preallocation on block devices when directly writing to the device Signed-off-by: Alexander Wels <awels@redhat.com> --------- Signed-off-by: Alexander Wels <awels@redhat.com>

* Remove older nbdkit * When converting always use scratch space importing instead of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed. * Disable metrics test for import because straight import doesn't return total, and this means the metrics are disabled. * Fix broken functional tests * Address review comments * Additional review comments. Fixed functional test that was not doing the right thing while running the test. * Always set preallocation on block devices when directly writing to the device --------- Signed-off-by: Alexander Wels <awels@redhat.com>

kubevirt-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Aug 1, 2023

kubevirt-bot requested review from maya-r and mhenriks August 1, 2023 15:55

kubevirt-bot added the size/L label Aug 1, 2023

awels force-pushed the always_scratchspace branch 2 times, most recently from 752c731 to 511e405 Compare August 1, 2023 17:28

alromeros reviewed Aug 3, 2023

View reviewed changes

tests/import_test.go Show resolved Hide resolved

kubevirt-bot assigned alromeros Aug 3, 2023

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2023

mhenriks reviewed Aug 3, 2023

View reviewed changes

kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 3, 2023

awels force-pushed the always_scratchspace branch from edc157b to 5c80162 Compare August 3, 2023 19:49

mhenriks reviewed Aug 3, 2023

View reviewed changes

awels added 5 commits August 4, 2023 09:16

Remove older nbdkit

1210cc1

Signed-off-by: Alexander Wels <awels@redhat.com>

When converting always use scratch space importing instead

6927bc9

of ndbkit. Once we are able to get nbdkit 1.35.8 or newer we can revert this change since that will include improvements to the downloading speed. Signed-off-by: Alexander Wels <awels@redhat.com>

Disable metrics test for import because straight import doesn't

b140bb8

return total, and this means the metrics are disabled. Signed-off-by: Alexander Wels <awels@redhat.com>

Fix broken functional tests

9496558

Signed-off-by: Alexander Wels <awels@redhat.com>

Address review comments

06dec15

Signed-off-by: Alexander Wels <awels@redhat.com>

awels force-pushed the always_scratchspace branch from 5c80162 to 2060ecc Compare August 4, 2023 14:25

Additional review comments.

ba11540

Fixed functional test that was not doing the right thing while running the test. Signed-off-by: Alexander Wels <awels@redhat.com>

awels force-pushed the always_scratchspace branch from 2060ecc to ba11540 Compare August 4, 2023 17:55

alromeros reviewed Aug 8, 2023

View reviewed changes

Always set preallocation on block devices when directly

5186dcd

writing to the device Signed-off-by: Alexander Wels <awels@redhat.com>

awels force-pushed the always_scratchspace branch from 336e58a to 5186dcd Compare August 8, 2023 12:36

mhenriks reviewed Aug 8, 2023

View reviewed changes

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 11, 2023

kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 11, 2023

kubevirt-bot merged commit 1f14ac7 into kubevirt:main Aug 11, 2023
17 checks passed

awels mentioned this pull request Aug 11, 2023

[release-v1.57] Always use scratchspace when importing and converting (#2832) #2841

Merged

mhenriks mentioned this pull request Aug 14, 2023

Don't use scratch space for registry node pull imports #2845

Merged

lxs137 mentioned this pull request Aug 25, 2023

cdi-importer: import virtualbox ova or tar archive in oneshot #2748

Closed

alromeros mentioned this pull request Dec 14, 2023

skip nbdkit for all raw/iso image imports #2743

Closed

This was referenced Apr 19, 2024

[WIP] Revert to using nbdkit for http conversion imports #3212

Closed

Improve http import flow to decide whether to use scratch space or not #3219

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Always use scratchspace when importing and converting #2832

Always use scratchspace when importing and converting #2832

awels commented Aug 1, 2023

alromeros commented Aug 3, 2023

mhenriks Aug 3, 2023

awels Aug 3, 2023

mhenriks Aug 3, 2023 •

edited

awels commented Aug 6, 2023

mhenriks commented Aug 7, 2023

awels commented Aug 7, 2023

alromeros Aug 8, 2023

awels Aug 8, 2023

awels commented Aug 8, 2023

mhenriks Aug 8, 2023

awels Aug 10, 2023

mhenriks Aug 11, 2023

awels Aug 11, 2023 •

edited

alromeros commented Aug 11, 2023

alromeros commented Aug 11, 2023

mhenriks commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

awels commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

Always use scratchspace when importing and converting #2832

Always use scratchspace when importing and converting #2832

Conversation

awels commented Aug 1, 2023

alromeros commented Aug 3, 2023

mhenriks Aug 3, 2023

Choose a reason for hiding this comment

awels Aug 3, 2023

Choose a reason for hiding this comment

mhenriks Aug 3, 2023 • edited

Choose a reason for hiding this comment

awels commented Aug 6, 2023

mhenriks commented Aug 7, 2023

awels commented Aug 7, 2023

alromeros Aug 8, 2023

Choose a reason for hiding this comment

awels Aug 8, 2023

Choose a reason for hiding this comment

awels commented Aug 8, 2023

mhenriks Aug 8, 2023

Choose a reason for hiding this comment

awels Aug 10, 2023

Choose a reason for hiding this comment

mhenriks Aug 11, 2023

Choose a reason for hiding this comment

awels Aug 11, 2023 • edited

Choose a reason for hiding this comment

alromeros commented Aug 11, 2023

alromeros commented Aug 11, 2023

mhenriks commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

awels commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

kubevirt-bot commented Aug 11, 2023

mhenriks Aug 3, 2023 •

edited

awels Aug 11, 2023 •

edited