I think it comes down to "do you think somebody else needs to review it?".
I do like to test before a cherrypick -at least of all the tests which the patch changed, and for object store stuff a full test run is good due diligence, but I think at least for me cherrypick no merge issues: local compile, maybe test, push up cherrypick import merge issues: the same merge problems and need to pull in previous work -that's when it gets complicated. The last bit of work of mine with major backport was the list-side changes of HADOOP-13230, where all versions of Hadoop needed to be aware that an empty directory marker in s3 didn't mean that the path was empty. That I did as a new JIRA with it's own PRs for each branch, even though it was just a small subset of the main patch + some of the PathCapabilities API (HADOOP-17210) for probes ( https://issues.apache.org/jira/browse/HADOOP-17199). I did all that though the normal build process but once I was happy I did the merge myself. I could make the case here that (a) the changes were isolated and (b) they were needed. And I was doing the changes through gerrit if anybody wanted to see what I was doing. -Steve On Wed, 2 Jun 2021 at 06:18, Masatake Iwasaki <iwasak...@oss.nttdata.co.jp> wrote: > I think we usually merge backport without explicit +1 if the conflict is > trivial, > same as done on JIRA-only workflow > (on which we attached patch like HADOOP-xxx-branch-3.3.001.patch for > precommit check then commit it without explicit +1). > > If committers want review since the change is not trivial, > backporting PR might tend to be ignored without explicit request. > > There seems to be no clear statement about approving backports on > HowToCommit wiki. > https://cwiki.apache.org/confluence/display/HADOOP2/HowToCommit > > On 2021/06/02 13:43, Wei-Chiu Chuang wrote: > > I'm curious about the GitHub PR conventions we use today... say I want to > > backport a commit from trunk to branch-3.3, and there's a small code > > conflict so I push a PR against branch-3.3 using GitHub to go through the > > precommit check. > > > > Do I need explicit approval from another committer to merge the backport > > PR? (As.a committer, I know I can merge at any time) or can I merge when > > the precommit comes back okay? > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: hdfs-dev-unsubscr...@hadoop.apache.org > For additional commands, e-mail: hdfs-dev-h...@hadoop.apache.org > >
