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.

Sign up for GitHub

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

Jump to bottom

pacific: os/bluestore: don't need separate variable to mark hits when lookup oid. #52943

Merged
merged 1 commit into from Aug 17, 2023
Merged

pacific: os/bluestore: don't need separate variable to mark hits when lookup oid. #52943

merged 1 commit into from Aug 17, 2023

Conversation

YiteGu
Copy link
Contributor

@YiteGu YiteGu commented Aug 11, 2023 •
edited

Signed-off-by: locallocal locallocal@163.com
(cherry picked from commit 1428544)

Contribution Guidelines

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows

@locallocal @YiteGu
os/bluestore: don't need separate variable to mark hits when lookup oid.
510e33d 
Signed-off-by: locallocal <locallocal@163.com>
(cherry picked from commit 1428544)
@YiteGu YiteGu requested a review from a team as a code owner August 11, 2023 10:32
@github-actions github-actions bot added this to the pacific milestone Aug 11, 2023
@YiteGu YiteGu changed the title os/bluestore: don't need separate variable to mark hits when lookup oid. pacific: os/bluestore: don't need separate variable to mark hits when lookup oid. Aug 11, 2023
@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 11, 2023

@ifed01 have a code review

@ifed01
Copy link
Contributor

ifed01 commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

Sorry, I no use -x option while cherry-pick. Should I close this PR, recommit a new one?

@ifed01
Copy link
Contributor

ifed01 commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

Sorry, I no use -x option while cherry-pick. Should I close this PR, recommit a new one?

you can drop the original commit in your branch via git rebase -i and cherry-pick once again. Then push the branch - PR will be updated automatically

@YiteGu YiteGu force-pushed the fix-duplicate-onode-miss-statistics branch from e1ea90d to e64120a Compare August 11, 2023 11:58
@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

Sorry, I no use -x option while cherry-pick. Should I close this PR, recommit a new one?

you can drop the original commit in your branch via git rebase -i and cherry-pick once again. Then push the branch - PR will be updated automatically

done

@ifed01
Copy link
Contributor

ifed01 commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

Sorry, I no use -x option while cherry-pick. Should I close this PR, recommit a new one?

you can drop the original commit in your branch via git rebase -i and cherry-pick once again. Then push the branch - PR will be updated automatically

done

I see no difference. Commit description still references weird parent commit:

os/bluestore: don't need separate variable to mark hits when lookup oid.
Signed-off-by: locallocal locallocal@163.com
(cherry picked from commit b42340725e6946262ac5da0a2e4568b8dd90c598)

@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 11, 2023 •
edited

my step:

  1. drop commit: git reset --hard
  2. git cherry-pick -x b42340725e6946262ac5da0a2e4568b8dd90c598
  3. git push --set-upstream origin fix-duplicate-onode-miss-statistics -f

@ifed01
Copy link
Contributor

ifed01 commented Aug 11, 2023

my step:

  1. drop commit: git reset --hard
  2. git cherry-pick -x b42340725e6946262ac5da0a2e4568b8dd90c598
    I don't know where b42340725e6946262ac5da0a2e4568b8dd90c598 comes from. It has to be:
    1428544
    Which is the original commit SHA at os/bluestore: don't need separate variable to mark hits when lookup oid. #44216
  1. git push --set-upstream origin fix-duplicate-onode-miss-statistics -f

@YiteGu YiteGu force-pushed the fix-duplicate-onode-miss-statistics branch from e64120a to 510e33d Compare August 11, 2023 12:59
@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 11, 2023

Please use cherry-pick -x to properly backport the commit. Currently the source commit id under "cherry picket from commit" look invalid.

Sorry, I no use -x option while cherry-pick. Should I close this PR, recommit a new one?

you can drop the original commit in your branch via git rebase -i and cherry-pick once again. Then push the branch - PR will be updated automatically

done

I see no difference. Commit description still references weird parent commit:

os/bluestore: don't need separate variable to mark hits when lookup oid. Signed-off-by: locallocal locallocal@163.com (cherry picked from commit b42340725e6946262ac5da0a2e4568b8dd90c598)

updated

@pdvian
Copy link

pdvian commented Aug 16, 2023

Rados approved: https://tracker.ceph.com/projects/rados/wiki/PACIFIC#httpstrellocomcONHeA3yz1823-wip-yuri8-testing-2023-08-11-0834-pacific

@ifed01
Copy link
Contributor

ifed01 commented Aug 16, 2023

jenkins test make check

@ifed01
Copy link
Contributor

ifed01 commented Aug 16, 2023

jenkins test api

@batrick
Copy link
Member

batrick commented Aug 17, 2023

https://tracker.ceph.com/projects/cephfs/wiki/Pacific#2023-August-11

no issues in fs run.

@yuriw
Copy link
Contributor

yuriw commented Aug 17, 2023

jenkins test make check

@yuriw
Copy link
Contributor

yuriw commented Aug 17, 2023

@YiteGu pls merge at will when checks passed
ref: https://trello.com/c/ONHeA3yz

@yuriw yuriw merged commit 68558bf into ceph:pacific Aug 17, 2023
8 checks passed
@YiteGu
Copy link
Contributor Author

YiteGu commented Aug 18, 2023

@YiteGu pls merge at will when checks passed ref: https://trello.com/c/ONHeA3yz

I have sent the join trello request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ifed01 ifed01 ifed01 approved these changes

Assignees
No one assigned
Labels
backport pacific bluestore core needs-qa ready-to-merge TESTED
Projects
None yet
Milestone
pacific
6 participants
@YiteGu @ifed01 @pdvian @batrick @yuriw @locallocal