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

Enrich nydus-image print, fix prefetch table layout and other couple of fixes #767

Merged
merged 7 commits into from
Sep 30, 2022

Conversation

changweige
Copy link
Contributor

@changweige changweige commented Sep 30, 2022

  1. rafs v5 and v6 has different root inode numbers. So use the real root inode number when getting path from inode number.
  2. rafs v6's inode number can't be decided until the end of dumping bootstrap. So don't record inode number in readadhead patterns anymore, use node index instead.
  3. enrich print nydus-image inspect

fixes #760

@anolis-bot
Copy link
Collaborator

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

@anolis-bot
Copy link
Collaborator

@changweige , 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/24888

@anolis-bot
Copy link
Collaborator

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

Test CaseTest Result
merge-target-branch✅ SUCCESS
build-docker-image✅ SUCCESS
compile-nydus✅ SUCCESS
compile-ctr-remote✅ SUCCESS
compile-nydus-snapshotter✅ SUCCESS
start-nydus-snapshotter-config-containerd✅ SUCCESS
run-container-with-nydus-image✅ SUCCESS

Congratulations, your test job passed!

@@ -219,6 +219,10 @@ impl RafsV6SuperBlock {
self.s_inos = inos.to_le();
}

pub fn inodes_count(&self) -> u64 {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please also add doc for this function

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added

@@ -168,7 +169,7 @@ impl Prefetch {
if self.policy == PrefetchPolicy::Fs {
let mut prefetch_table = RafsV5PrefetchTable::new();
for i in self.readahead_patterns.values().filter_map(|v| *v) {
prefetch_table.add_entry(i as u32);
prefetch_table.add_entry(i as u32 + 1);
Copy link
Collaborator

Choose a reason for hiding this comment

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

why plus one here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. I made a mistake here. will fix it.

@anolis-bot
Copy link
Collaborator

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

Test CaseTest Result
merge-target-branch✅ SUCCESS
build-docker-image✅ SUCCESS
compile-nydus✅ SUCCESS
compile-ctr-remote✅ SUCCESS
compile-nydus-snapshotter✅ SUCCESS
start-nydus-snapshotter-config-containerd✅ SUCCESS
run-container-with-nydus-image✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

@changweige , the code 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/24891

@anolis-bot
Copy link
Collaborator

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

Test CaseTest Result
merge-target-branch✅ SUCCESS
build-docker-image✅ SUCCESS
compile-nydus✅ SUCCESS
compile-ctr-remote✅ SUCCESS
compile-nydus-snapshotter✅ SUCCESS
start-nydus-snapshotter-config-containerd✅ SUCCESS
run-container-with-nydus-image✅ SUCCESS

Congratulations, your test job passed!

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
rafs v5 han v6 has different root inode numbers.

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
Because root dir's size is zero before gathering prefetching files.

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
Rafs v6 can't decide each inode number when walking and
building nodes tree. So record those prefetching files'
index in nodes array in readahead patterns.

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
By default, prefeth_all is true in rafs config. We
can't verify prefetch table contents then.

Signed-off-by: Changwei Ge <gechangwei@bytedance.com>
@anolis-bot
Copy link
Collaborator

@changweige , the code 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/24893

@changweige changweige changed the title Enrich nydus-image print, fix prefetch table layout and other couple of fixex Enrich nydus-image print, fix prefetch table layout and other couple of fixes Sep 30, 2022
@anolis-bot
Copy link
Collaborator

@changweige , 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/24894

@anolis-bot
Copy link
Collaborator

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

Test CaseTest Result
merge-target-branch✅ SUCCESS
build-docker-image✅ SUCCESS
compile-nydus✅ SUCCESS
compile-ctr-remote✅ SUCCESS
compile-nydus-snapshotter✅ SUCCESS
start-nydus-snapshotter-config-containerd✅ SUCCESS
run-container-with-nydus-image✅ SUCCESS

Congratulations, your test job passed!

@anolis-bot
Copy link
Collaborator

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

Test CaseTest Result
merge-target-branch✅ SUCCESS
build-docker-image✅ SUCCESS
compile-nydus✅ SUCCESS
compile-ctr-remote✅ SUCCESS
compile-nydus-snapshotter✅ SUCCESS
start-nydus-snapshotter-config-containerd✅ SUCCESS
run-container-with-nydus-image✅ SUCCESS

Congratulations, your test job passed!

@jiangliu jiangliu merged commit 87a6342 into dragonflyoss:master Sep 30, 2022
@changweige changweige deleted the print-fs-version branch October 20, 2022 05:41
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.

nydus-image inspect panics
3 participants