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

luminous: librbd: diff iterate with fast-diff now correctly includes parent #32471

Closed
wants to merge 1 commit into from
Closed

luminous: librbd: diff iterate with fast-diff now correctly includes parent #32471

wants to merge 1 commit into from

Conversation

zhengchengyao
Copy link
Contributor

@zhengchengyao zhengchengyao commented Jan 3, 2020 •
edited

When whole-object and include-parent options are enabled, the
diff will now include the parent image diffs. Previously, the
parent image diffs were not included when fast-diff was enabled
but was included when fast-diff was disabled.

Fixes: https://tracker.ceph.com/issues/42248
Signed-off-by: Jason Dillaman dillaman@redhat.com
(cherry picked from commit b61f83b)

backport of #32403
Fix: https://tracker.ceph.com/issues/43476

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug
Show available Jenkins commands
  • jenkins retest this please
  • 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 backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

@zhengchengyao zhengchengyao changed the title librbd: diff iterate with fast-diff now correctly includes parent luminous: librbd: diff iterate with fast-diff now correctly includes parent Jan 3, 2020
@tchaikov tchaikov added this to the luminous milestone Jan 6, 2020
@smithfarm smithfarm requested a review from dillaman April 17, 2020 09:46
@smithfarm
Copy link
Contributor 

ceph-backport.sh: Attempting to cherry pick 1 commits from https://github.com/ceph/ceph/pull/32403 into local branch wip-43476-luminous
ceph-backport.sh: Running "git cherry-pick -x" on b61f83b6f0b librbd: diff iterate with fast-diff now correctly includes parent
+ git cherry-pick -x b61f83b6f0b5913484cca060e090f81d6215f6cb
[wip-43476-luminous c1b0971aaba] librbd: diff iterate with fast-diff now correctly includes parent
 Author: Jason Dillaman <dillaman@redhat.com>
 Date: Mon Dec 23 11:34:07 2019 -0500
 1 file changed, 19 insertions(+), 1 deletion(-)
+ set +x
ceph-backport.sh: Cherry picking completed without conflicts

@smithfarm
Copy link
Contributor

@zhengchengyao Could you put the full SHA1 in the (cherry picked from commit ) line? As more and more commits are added to Ceph, the abbreviated SHA1 might not be sufficient to find the commit.

@zhengchengyao zhengchengyao force-pushed the diff_luminous branch 3 times, most recently from 6ab5231 to e704728 Compare April 17, 2020 10:43
@zhengchengyao
librbd: diff iterate with fast-diff now correctly includes parent
e704728 
When whole-object and include-parent options are enabled, the
diff will now include the parent image diffs. Previously, the
parent image diffs were not included when fast-diff was enabled
but was included when fast-diff was disabled.

Fixes: https://tracker.ceph.com/issues/42248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit b61f83b)
@dillaman
Copy link

@smithfarm Is there going to be another release of Luminous? I thought it has long been EOLed.

@smithfarm
Copy link
Contributor

@dillaman I don't think there will be any more upstream luminous point releases, but there are various companies still maintaining downstream products based on luminous, so the idea (according to my limited understanding) is to occasionally do an integration run and merge PRs into the luminous branch to facilitate downstream maintenance, in a spirit of open collaboration.

dillaman
dillaman approved these changes Apr 17, 2020
View reviewed changes
Copy link

@dillaman dillaman left a comment

Choose a reason for hiding this comment

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

👍

@yuriw
Copy link
Contributor

yuriw commented Apr 20, 2020

wip-yuri8-testing-2020-04-20-1406-luminous

@smithfarm
Copy link
Contributor

luminous EOL

@smithfarm smithfarm closed this Jan 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dillaman dillaman dillaman approved these changes

Assignees
No one assigned
Labels
bug-fix luminous-batch-1 needs-qa rbd
Projects
None yet
Milestone
luminous
5 participants
@zhengchengyao @smithfarm @dillaman @yuriw @tchaikov