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

fix: merge io from same blob panic #1347

Merged
merged 1 commit into from
Jul 6, 2023

Conversation

ccx1024cc
Copy link
Contributor

@ccx1024cc ccx1024cc commented Jul 6, 2023

Details

When merging io from same blob with different id, assertion breaks. The images without blob deduplication suffer from it.

This pr removes the assertion that requires merging in same blob index. By design, it makes sense, because different blob layer may share same blob file. A continuous read from same blob for different layer is helpful for performance.

Types of changes

  • 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

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

When merging io from same blob with different id, assertion breaks. The
images without blob deduplication suffers from it.

This pr removes the assertion that requires merging in same blob index.
By design, it makes sense, because different blob layer may share same
blob file. A continuous read from same blob for different layer is
helpful for performance.

Signed-off-by: 泰友 <cuichengxu.ccx@antgroup.com>
@ccx1024cc ccx1024cc requested a review from a team as a code owner July 6, 2023 01:01
@ccx1024cc ccx1024cc requested review from bergwolf, jiangliu and changweige and removed request for a team July 6, 2023 01:01
@anolis-bot
Copy link
Collaborator

@ccx1024cc , a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/83046

@anolis-bot
Copy link
Collaborator

@ccx1024cc , the title has been updated, so a new test job has been submitted. Please wait in patience. The test job url: https://tone.openanolis.cn/ws/nrh4nnio/test_result/83047

@codecov
Copy link

codecov bot commented Jul 6, 2023

Codecov Report

Merging #1347 (adf68c8) into master (7d5cb1a) will increase coverage by 0.09%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1347      +/-   ##
==========================================
+ Coverage   45.69%   45.79%   +0.09%     
==========================================
  Files         123      123              
  Lines       37287    37339      +52     
  Branches    37287    37339      +52     
==========================================
+ Hits        17040    17099      +59     
+ Misses      19349    19341       -8     
- Partials      898      899       +1     
Impacted Files Coverage Δ
storage/src/device.rs 58.22% <100.00%> (+3.67%) ⬆️

... and 3 files with indirect coverage changes

@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
build rust golang image✅ SUCCESS
compile nydusd✅ SUCCESS
compile ctr remote✅ SUCCESS
compile nydus snapshotter✅ SUCCESS
run container with rafs✅ SUCCESS
run container with zran✅ SUCCESS
run container with rafs and compile linux✅ SUCCESS

Congratulations, your test job passed!

Copy link
Member

@adamqqqplay adamqqqplay left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for your work.

@jiangliu jiangliu merged commit 5db3f0a into dragonflyoss:master Jul 6, 2023
24 checks passed
@anolis-bot
Copy link
Collaborator

@ccx1024cc , The CI test is completed, please check result:

Test CaseTest Result
nydus_ci❌ FAIL

Sorry, your test job failed. Please get the details in the link.

This was referenced Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants