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

Backport latest pr to 2.2 #1413

Merged
merged 3 commits into from
Aug 29, 2023
Merged

Conversation

zyfjeff
Copy link
Contributor

@zyfjeff zyfjeff commented Aug 29, 2023

Relevant Issue (if applicable)

If there are Issues related to this PullRequest, please list it.

Details

commit d7cce5c (HEAD -> backport-2.2, upstream/backport-2.2)
Author: zyfjeff zyfjeff@linux.alibaba.com
Date: Mon Aug 28 16:17:36 2023 +0800

add --original-blob-ids args for merge

the default merge command is to get the name of the original
blob from the bootstrap name, and add a cli args for it

Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>

commit b1cebb9
Author: zyfjeff zyfjeff@linux.alibaba.com
Date: Tue Aug 29 11:36:51 2023 +0800

bugfix: do not fill 0 buffer, and skip validate features

1. Buffer reset to 0 will cause race during concurrency.

2. Previously, the second validate_header did not actually take effect. Now
it is repaired, and it is found that the features of blob info do not
set the --inline-bootstrap position to true, so the check of features is
temporarily skipped. Essentially needs to be fixed from nydus-image from
upstream.

Signed-off-by: zhaoshang <zhaoshangsjtu@linux.alibaba.com>
Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>

commit e4b86b1
Author: zyfjeff zyfjeff@linux.alibaba.com
Date: Mon Aug 28 13:49:40 2023 +0800

Support use /dev/stdin as SOURCE path for image build

Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>

Types of changes

What types of changes does your PullRequest introduce? Put an x in all the boxes that apply:

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation Update (if none of the other choices apply)

Checklist

Go over all the following points, and put an x in all the boxes that apply.

  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.

Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>
1. Buffer reset to 0 will cause race during concurrency.

2. Previously, the second validate_header did not actually take effect. Now
it is repaired, and it is found that the features of blob info do not
set the --inline-bootstrap position to true, so the check of features is
temporarily skipped. Essentially needs to be fixed from nydus-image from
upstream.

Signed-off-by: zhaoshang <zhaoshangsjtu@linux.alibaba.com>
Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>
the default merge command is to get the name of the original
blob from the bootstrap name, and add a cli args for it

Signed-off-by: zyfjeff <zyfjeff@linux.alibaba.com>
@zyfjeff zyfjeff requested a review from a team as a code owner August 29, 2023 08:18
@zyfjeff zyfjeff requested review from liubogithub, jiangliu and adamqqqplay and removed request for a team August 29, 2023 08:18
@zyfjeff zyfjeff changed the title Backport to 2.2 Backport latest pr to 2.2 Aug 29, 2023
@imeoer imeoer merged commit e8c3246 into dragonflyoss:stable/v2.2 Aug 29, 2023
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants