Backport #18814
closedkraken: PrimaryLogPG: up_osd_features used without the requires_kraken flag in kraken
Updated by Nathan Cutler about 7 years ago
- Copied from Bug #18644: PrimaryLogPG: up_osd_features used without the requires_kraken flag in kraken added
Updated by Shinobu Kinjo about 7 years ago
- Description updated (diff)
- Assignee set to Shinobu Kinjo
Updated by Shinobu Kinjo about 7 years ago
- Status changed from New to In Progress
Updated by Loïc Dachary about 7 years ago
- Description updated (diff)
- Status changed from In Progress to New
master pull request: https://github.com/ceph/ceph/pull/13114
Please set the to "In Progress" when a backport pull request is ready
Updated by Shinobu Kinjo about 7 years ago
@Loïc Dachary Sorry for the late. The reason why I just waited is that there are 2 commits for the bug:
#1 https://github.com/ceph/ceph/pull/13114/commits/1a5cc32f0a3bf5ef06642402e930e3786700ab7d
#2 https://github.com/ceph/ceph/pull/13114/commits/47066ef310e2dea3501657851bf3c2b96efb0669
When I tried to cherry-pick, results for both ended up with:
[root@octopus ceph]# git cherry-pick -x 1a5cc32f0a3bf5ef06642402e930e3786700ab7d
fatal: bad object 1a5cc32f0a3bf5ef06642402e930e3786700ab7d
[root@octopus ceph]# git cherry-pick -x 47066ef310e2dea3501657851bf3c2b96efb0669
fatal: bad object 47066ef310e2dea3501657851bf3c2b96efb0669
There should be missing something. Please advice :)
Updated by Shinobu Kinjo about 7 years ago
- Status changed from New to Need More Info
Updated by Shinobu Kinjo about 7 years ago
- Status changed from Need More Info to New
Yay git did some trick =)
Updated by Shinobu Kinjo about 7 years ago
- Status changed from New to Need More Info
1st one is fine but 2nd one:
[root@octopus ceph]# git cherry-pick x 1a5cc32f0a3bf5ef06642402e930e3786700ab7d)
[wip-18751-hammer fcff3dc] osd/OSDMap: reflect REQUIRE_*_OSDS flag in required features
Author: Sage Weil <sage@redhat.com>
1 file changed, 15 insertions(+), 2 deletions(
[root@octopus ceph]# git cherry-pick -x 47066ef310e2dea3501657851bf3c2b96efb0669
error: could not apply 47066ef... osd/PrimaryLogPG: encode object_info with required (not up) features
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Updated by Nathan Cutler about 7 years ago
@Shinobu The idea is to resolve the conflicts, if you can, and describe how you did it in the commit message. This can sometimes be a little tricky. There is some documentation on backporting commits here: http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_backport_commits
Updated by Shinobu Kinjo about 7 years ago
@Nathan Weinberg Thank you so much for your help. Please let me give it try again and I will write some up here.
Updated by Shinobu Kinjo about 7 years ago
- Status changed from Need More Info to New
Updated by Shinobu Kinjo about 7 years ago
- Status changed from New to In Progress
@Nathan Weinberg Yay finally. Hopefully there is nothing stupid :3
Updated by Shinobu Kinjo about 7 years ago
@Nathan Weinberg I delete remote branch which was used for PR#13373 because the PR was something definitely wrong and messy because of lack of my knowledge regarding to Git.
I've been getting better understanding how Git works. I will create a new PR.
This backport has been really really good exercise to me :)
Updated by Shinobu Kinjo about 7 years ago
- Status changed from In Progress to New
Updated by Nathan Cutler about 7 years ago
@Shinobu Backporting is an excellent way to practice with git :-) HINT: read about "interactive rebasing" - if you make a mistake in a PR, you don't have to close it and open another one. You can rebase your wip branch and then force-push it (git push f origin wip...) and the PR will be automatically updated.
Updated by Shinobu Kinjo about 7 years ago
- Description updated (diff)
- Status changed from New to In Progress
Updated by Nathan Cutler about 7 years ago
- Status changed from In Progress to Resolved
- Target version set to v11.2.1