HOWTO backport commits » History » Version 6
Loïc Dachary, 03/28/2015 11:31 AM
1 | 1 | Loïc Dachary | h3. Backport issues |
---|---|---|---|
2 | |||
3 | The helper snippet at http://workbench.dachary.org/dachary/ceph-workbench/issues/3 can be used to semi automate the process below |
||
4 | |||
5 | 4 | Loïc Dachary | * Pick one entry with the highest *Severity* field at http://workbench.dachary.org/ceph/ceph-backports/wikis/giant#issues-that-need-backporting |
6 | 2 | Loïc Dachary | * git cherry-pick -x the commits from the pull request that was targeting master (not from the pull requests targeting stable branches) |
7 | * if there is a conflict explain how it was resolved in the commit message, below the Conflicts line. For instance: |
||
8 | <pre> |
||
9 | commit c60da2f3c34e7325c748d2d6e55140a0a30013fd |
||
10 | Author: Samuel Just <sjust@redhat.com> |
||
11 | Date: Thu Nov 20 15:15:08 2014 -0800 |
||
12 | |||
13 | PGLog: include rollback_info_trimmed_to in (read|write)_log |
||
14 | |||
15 | Fixes: #10157 |
||
16 | Backport: firefly, giant |
||
17 | Signed-off-by: Samuel Just <sjust@redhat.com> |
||
18 | (cherry picked from commit 1fe8b846641486cc294fe7e1d2450132c38d2dba) |
||
19 | |||
20 | Conflicts: |
||
21 | src/osd/PGLog.cc |
||
22 | in the context coll_t::META_COLL was replaced with META_COLL |
||
23 | </pre> |
||
24 | * if the conflict is difficult to resolve, seek help from the author of the original commit (see "librbd: deadlock in image refresh":https://github.com/ceph/ceph/pull/4176 for instance) |
||
25 | * create a pull request with the backport and a URL to the issue and set the milestone to giant |
||
26 | * add the URL of the pull request in the issue |
||
27 | 1 | Loïc Dachary | * if the make check bot finds a problem, fix it |
28 | 6 | Loïc Dachary | * assign the pull request to the [[HOWTO#Leads|lead]] after it passed [[HOWTO run integration and upgrade tests|integration and upgrade tests]] |
29 | 3 | Loïc Dachary | |
30 | 5 | Loïc Dachary | All commits being backported must be cherry-picked from master. There are exceptions to this rule (see https://github.com/ceph/ceph/pull/4175 for instance: it fixes a regression introduced by an incorrect resolution of a backport) but they are rare. When a backport is done to fix a bug that shows in the integration tests or upgrade tests run by cron, testing the backport in an integration branch is redundant because the existing tests will keep failing. |