You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@impala.apache.org by "Quanlong Huang (Code Review)" <ge...@cloudera.org> on 2019/06/16 03:31:50 UTC
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Quanlong Huang has uploaded this change for review. ( http://gerrit.cloudera.org:8080/13660
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
IMPALA-8669 Support giving a terminal commit in compare_branches.py
Currently, bin/compare_branches.py (used in cherrypick-2.x-and-test
Jenkins job) will cherry-pick as more commits as possible. However, a
clean pick from the master branch does not mean it can always pass the
tests. If we find such a problematic commit, we'd like to let the
cherrypick-2.x-and-test Jenkins job cherry-pick till the commit before
it. And then submit only a patch for the problematic commit for review.
This patch adds a new parameter "source_terminal_commit" for specifying
where to stop. It's the full commit hash of the terminal commit in the
source branch. bin/compare_branches.py will stop after cherry-picking
this commit.
Tests:
- Test locally by pushing the 2.x branch to my repo ("self") and run
bin/compare_branches.py --cherry_pick --partial_ok \
--source_remote_name asf-gerrit --target_remote_name self -v \
--source_terminal_commit def5c881b1dee93848daea52d93a0602e11338ca
Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
---
M bin/compare_branches.py
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/60/13660/1
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 1
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 1:
Build Successful
https://jenkins.impala.io/job/gerrit-code-review-checks/3636/ : Initial code review checks passed. Use gerrit-verify-dryrun-external or gerrit-verify-dryrun to run full precommit tests.
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 1
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Comment-Date: Sun, 16 Jun 2019 04:04:45 +0000
Gerrit-HasComments: No
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Quanlong Huang (Code Review)" <ge...@cloudera.org>.
Hello Impala Public Jenkins,
I'd like you to reexamine a change. Please visit
http://gerrit.cloudera.org:8080/13660
to look at the new patch set (#2).
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
IMPALA-8669 Support giving a terminal commit in compare_branches.py
Currently, bin/compare_branches.py (used in cherrypick-2.x-and-test
Jenkins job) will cherry-pick as more commits as possible. However, a
clean pick from the master branch does not mean it can always pass the
tests. If we find such a problematic commit, we'd like to let the
cherrypick-2.x-and-test Jenkins job cherry-pick till the commit before
it. And then submit only a patch for the problematic commit for review.
This patch adds a new parameter "source_terminal_commit" for specifying
where to stop. It's the full commit hash of the terminal commit in the
source branch. bin/compare_branches.py will stop after cherry-picking
this commit.
Tests:
- Test locally by pushing the 2.x branch to my repo ("self") and run
bin/compare_branches.py --cherry_pick --partial_ok \
--source_remote_name asf-gerrit --target_remote_name self -v \
--source_terminal_commit def5c881b1dee93848daea52d93a0602e11338ca
Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
---
M bin/compare_branches.py
1 file changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.cloudera.org:29418/Impala-ASF refs/changes/60/13660/2
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 2:
(1 comment)
http://gerrit.cloudera.org:8080/#/c/13660/2/bin/compare_branches.py
File bin/compare_branches.py:
http://gerrit.cloudera.org:8080/#/c/13660/2/bin/compare_branches.py@105
PS2, Line 105: h
flake8: E128 continuation line under-indented for visual indent
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Comment-Date: Sun, 16 Jun 2019 06:16:53 +0000
Gerrit-HasComments: Yes
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Quanlong Huang (Code Review)" <ge...@cloudera.org>.
Quanlong Huang has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 2:
(2 comments)
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py
File bin/compare_branches.py:
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py@105
PS1, Line 105: h
> flake8: E128 continuation line under-indented for visual indent
Ignored this to keep original code style
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py@166
PS1, Line 166:
> flake8: E302 expected 2 blank lines, found 1
Done
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Quanlong Huang <hu...@gmail.com>
Gerrit-Comment-Date: Tue, 18 Jun 2019 23:21:12 +0000
Gerrit-HasComments: Yes
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Tim Armstrong (Code Review)" <ge...@cloudera.org>.
Tim Armstrong has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Tue, 18 Jun 2019 23:31:18 +0000
Gerrit-HasComments: No
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Quanlong Huang (Code Review)" <ge...@cloudera.org>.
Quanlong Huang has submitted this change and it was merged. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
IMPALA-8669 Support giving a terminal commit in compare_branches.py
Currently, bin/compare_branches.py (used in cherrypick-2.x-and-test
Jenkins job) will cherry-pick as more commits as possible. However, a
clean pick from the master branch does not mean it can always pass the
tests. If we find such a problematic commit, we'd like to let the
cherrypick-2.x-and-test Jenkins job cherry-pick till the commit before
it. And then submit only a patch for the problematic commit for review.
This patch adds a new parameter "source_terminal_commit" for specifying
where to stop. It's the full commit hash of the terminal commit in the
source branch. bin/compare_branches.py will stop after cherry-picking
this commit.
Tests:
- Test locally by pushing the 2.x branch to my repo ("self") and run
bin/compare_branches.py --cherry_pick --partial_ok \
--source_remote_name asf-gerrit --target_remote_name self -v \
--source_terminal_commit def5c881b1dee93848daea52d93a0602e11338ca
Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Reviewed-on: http://gerrit.cloudera.org:8080/13660
Reviewed-by: Tim Armstrong <ta...@cloudera.com>
Tested-by: Quanlong Huang <hu...@gmail.com>
---
M bin/compare_branches.py
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Tim Armstrong: Looks good to me, approved
Quanlong Huang: Verified
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 3
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 2:
Build Successful
https://jenkins.impala.io/job/gerrit-code-review-checks/3637/ : Initial code review checks passed. Use gerrit-verify-dryrun-external or gerrit-verify-dryrun to run full precommit tests.
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Comment-Date: Sun, 16 Jun 2019 06:47:30 +0000
Gerrit-HasComments: No
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Impala Public Jenkins (Code Review)" <ge...@cloudera.org>.
Impala Public Jenkins has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 1:
(2 comments)
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py
File bin/compare_branches.py:
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py@105
PS1, Line 105: h
flake8: E128 continuation line under-indented for visual indent
http://gerrit.cloudera.org:8080/#/c/13660/1/bin/compare_branches.py@166
PS1, Line 166: def cherrypick(cherry_pick_hashes, full_target_branch_name, partial_ok, terminal_commit):
flake8: E302 expected 2 blank lines, found 1
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 1
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Comment-Date: Sun, 16 Jun 2019 03:32:29 +0000
Gerrit-HasComments: Yes
[Impala-ASF-CR](2.x) IMPALA-8669 Support giving a terminal commit in compare branches.py
Posted by "Quanlong Huang (Code Review)" <ge...@cloudera.org>.
Quanlong Huang has posted comments on this change. ( http://gerrit.cloudera.org:8080/13660 )
Change subject: IMPALA-8669 Support giving a terminal commit in compare_branches.py
......................................................................
Patch Set 2: Verified+1
--
To view, visit http://gerrit.cloudera.org:8080/13660
To unsubscribe, visit http://gerrit.cloudera.org:8080/settings
Gerrit-Project: Impala-ASF
Gerrit-Branch: 2.x
Gerrit-MessageType: comment
Gerrit-Change-Id: I7a4dfae26f8f616c6f550114edfbafd6fc1c068d
Gerrit-Change-Number: 13660
Gerrit-PatchSet: 2
Gerrit-Owner: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Impala Public Jenkins <im...@cloudera.com>
Gerrit-Reviewer: Quanlong Huang <hu...@gmail.com>
Gerrit-Reviewer: Tim Armstrong <ta...@cloudera.com>
Gerrit-Comment-Date: Wed, 19 Jun 2019 01:42:42 +0000
Gerrit-HasComments: No