Bug #12326
closedSome important fixes are not getting backported
0%
Description
We have a backporting policy which says1
If you are fixing a bug (see above) and the bug exists in older stable
branches (for example, the "dumpling" or "firefly" branches), then you
should file a Redmine ticket describing your issue and fill out the
"Backport: <branchname>" form field. This will notify other developers that
your commit should be cherry-picked to these stable branches. For example,
you should set "Backport: firefly" in your Redmine ticket to indicate that
you are fixing a bug that exists on the "firefly" branch and that you
desire that your change be cherry-picked to that branch.
However, this policy is not always being followed. It seems that it conflicts with a prior policy or practice of putting a line
Backport: firefly, hammer
in the commit message. This is problematic, however, because once the commit has been merged into master, the commit message is immutable: if the Backport
line there is wrong for any reason, there is no way to correct it.
Here are two examples of important fixes that were earmarked for backport using the latter practice:
- https://github.com/ceph/ceph/commit/8614dcebf384b74b283cd352001a65fa26ba925c
- https://github.com/ceph/ceph/commit/bbec53edf9e585af4e20bbc9ba9057d6fdfda342
The former had no tracker issue associated with it at all, while the latter did have a tracker issue, but it was marked Resolved and its Backport field was empty. I found these two issues by going through the master git log with --grep Backport
, but this is a very time-consuming process that the backports team cannot be relied upon to do.
This is an organizational bug the solution to which (if any) is non-obvious. We already have a policy that would ensure that no backports are passed over, if only everyone followed it. Perhaps it is just a matter of raising awareness? Or maybe adhering to the policy is too onerous/time-consuming and places an undue burden on developers?
For completeness, the two issues mentioned above are now associated with the following issues:
[1] https://github.com/ceph/ceph/blob/master/SubmittingPatches#L267
Updated by Nathan Cutler about 7 years ago
- Status changed from New to Resolved
This is no longer a problem.