Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Aug 14, 2023

Conversation

akalenyu
Copy link
Collaborator

@akalenyu akalenyu commented Aug 13, 2023

What this PR does / why we need it:
When importing via node container runtime, we always have the image available in the container filesystem,
so there should be no reason to use scratch space.
This manifests itself in the form of a bug where we loop over

E0813 13:32:38.443088       1 data-processor.go:251] scratch space required and none found
E0813 13:32:38.443102       1 importer.go:181] scratch space required and none found

On registry node pull imports when images are not raw. Testing for this is added in this PR

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 #
https://issues.redhat.com/browse/CNV-32010

Special notes for your reviewer:

Release note:

BugFix: non-raw registry node pull imports not progressing

@kubevirt-bot 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. size/M labels Aug 13, 2023
When importing via node container runtime cache, we always have the image handy locally.
This manifests itself in the form of a bug where we loop over
```bash
E0813 13:32:38.443088       1 data-processor.go:251] scratch space required and none found
E0813 13:32:38.443102       1 importer.go:181] scratch space required and none found
```
On registry node pull imports where images are not raw

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>
@akalenyu
Copy link
Collaborator Author

/retest

@akalenyu
Copy link
Collaborator Author

/cc @awels

@@ -133,6 +133,13 @@ func (hs *HTTPDataSource) Info() (ProcessingPhase, error) {
if !hs.readers.Convert {
return ProcessingPhaseTransferDataFile, nil
}
if pullMethod, _ := util.ParseEnvVar(common.ImporterPullMethod, false); pullMethod == string(cdiv1.RegistryPullNode) {
hs.url, _ = url.Parse(fmt.Sprintf("nbd+unix:///?socket=%s", nbdkitSocket))
if err = hs.n.StartNbdkit(hs.endpoint.String()); err != nil {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

surprised this is working as #2832 looks like it removes nbdkit packages

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh maybe it's just duplicate versions?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that just removed the older version of nbdkit that was a duplicate (and actually not used in the build at all)

@awels
Copy link
Member

awels commented Aug 14, 2023

/lgtm
/approve
/cherrypick release-v1.57

@kubevirt-bot
Copy link
Contributor

@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:

/lgtm
/approve
/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 kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2023
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awels

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:

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

@kubevirt-bot kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 14, 2023
@kubevirt-bot kubevirt-bot merged commit b92cdf7 into kubevirt:main Aug 14, 2023
16 of 17 checks passed
@kubevirt-bot
Copy link
Contributor

@awels: new pull request created: #2846

In response to this:

/lgtm
/approve
/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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants