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

Overhead on profile and usable space toghether #1926

Conversation

brybacki
Copy link
Contributor

@brybacki brybacki commented Sep 6, 2021

What this PR does / why we need it:

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 #
Bugfix: Fix fsoverhead calculation.

Special notes for your reviewer:
AS it looks #1924 depends on #1923, this PR joins them together.

Release note:

Bugfix: Fix fsoverhead calculation

brybacki and others added 2 commits September 6, 2021 13:08
Calculation needs play well with the actual resize that is done in data-processor

Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>
Signed-off-by: Alexander Wels <awels@redhat.com>
@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. labels Sep 6, 2021
@brybacki
Copy link
Contributor Author

brybacki commented Sep 7, 2021

/cherrypick release-v1.34

@kubevirt-bot
Copy link
Contributor

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

In response to this:

/cherrypick release-v1.34

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.

@brybacki
Copy link
Contributor Author

brybacki commented Sep 7, 2021

/cherrypick release-v1.38

@kubevirt-bot
Copy link
Contributor

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

In response to this:

/cherrypick release-v1.38

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.

@mhenriks
Copy link
Member

mhenriks commented Sep 7, 2021

/lgtm
/approve

@kubevirt-bot kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Sep 7, 2021
@kubevirt-bot
Copy link
Contributor

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

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 Sep 7, 2021
@kubevirt-bot kubevirt-bot merged commit a308404 into kubevirt:main Sep 7, 2021
@kubevirt-bot
Copy link
Contributor

@brybacki: #1926 failed to apply on top of branch "release-v1.34":

Applying: Correct the fsOverhead calculation in profile
Applying: Properly reverse the calculation for overhead.
Using index info to reconstruct a base tree...
M	pkg/importer/data-processor.go
M	pkg/importer/data-processor_test.go
M	tests/upload_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/upload_test.go
Auto-merging pkg/importer/data-processor_test.go
CONFLICT (content): Merge conflict in pkg/importer/data-processor_test.go
Auto-merging pkg/importer/data-processor.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 Properly reverse the calculation for overhead.
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.34

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
Copy link
Contributor

@brybacki: #1926 failed to apply on top of branch "release-v1.38":

Applying: Correct the fsOverhead calculation in profile
Applying: Properly reverse the calculation for overhead.
Using index info to reconstruct a base tree...
M	pkg/importer/data-processor.go
M	pkg/importer/data-processor_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/importer/data-processor_test.go
CONFLICT (content): Merge conflict in pkg/importer/data-processor_test.go
Auto-merging pkg/importer/data-processor.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 Properly reverse the calculation for overhead.
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.38

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.

brybacki added a commit to brybacki/containerized-data-importer that referenced this pull request Sep 7, 2021
* Correct the fsOverhead calculation in profile

Calculation needs play well with the actual resize that is done in data-processor

Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

* Properly reverse the calculation for overhead.

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

Co-authored-by: Alexander Wels <awels@redhat.com>
Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>
brybacki added a commit to brybacki/containerized-data-importer that referenced this pull request Sep 7, 2021
* Correct the fsOverhead calculation in profile

Calculation needs play well with the actual resize that is done in data-processor

Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

* Properly reverse the calculation for overhead.

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

Co-authored-by: Alexander Wels <awels@redhat.com>
Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Sep 7, 2021
* Correct the fsOverhead calculation in profile

Calculation needs play well with the actual resize that is done in data-processor

Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

* Properly reverse the calculation for overhead.

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

Co-authored-by: Alexander Wels <awels@redhat.com>
Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

Co-authored-by: Alexander Wels <awels@redhat.com>
kubevirt-bot pushed a commit that referenced this pull request Sep 7, 2021
* Correct the fsOverhead calculation in profile

Calculation needs play well with the actual resize that is done in data-processor

Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

* Properly reverse the calculation for overhead.

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

Co-authored-by: Alexander Wels <awels@redhat.com>
Signed-off-by: Bartosz Rybacki <brybacki@redhat.com>

Co-authored-by: Alexander Wels <awels@redhat.com>
@brybacki brybacki deleted the overhea-on-profile-and-usablespace-toghether branch October 4, 2021 10:40
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/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants