Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BugFix] Release workgroup token immediately when fragment is cancelled (backport #19310) #19363

Merged
merged 3 commits into from Mar 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 10, 2023

This is an automatic backport of pull request #19310 done by Mergify.
Cherry-pick of 6f0bd88 has failed:

On branch mergify/bp/branch-2.3/pr-19310
Your branch is up to date with 'origin/branch-2.3'.

You are currently cherry-picking commit 6f0bd88fe.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   be/src/exec/pipeline/fragment_context.cpp
	both modified:   be/src/exec/pipeline/query_context.cpp
	both modified:   be/src/exec/pipeline/query_context.h
	both modified:   be/src/exec/pipeline/scan/scan_operator.cpp
	both modified:   fe/fe-core/src/main/java/com/starrocks/qe/Coordinator.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…ed (#19310)

Signed-off-by: ZiheLiu <ziheliu1024@gmail.com>
(cherry picked from commit 6f0bd88)

# Conflicts:
#	be/src/exec/pipeline/fragment_context.cpp
#	be/src/exec/pipeline/query_context.cpp
#	be/src/exec/pipeline/query_context.h
#	be/src/exec/pipeline/scan/scan_operator.cpp
#	fe/fe-core/src/main/java/com/starrocks/qe/Coordinator.java
wanpengfei-git
wanpengfei-git previously approved these changes Mar 10, 2023
@wanpengfei-git wanpengfei-git enabled auto-merge (rebase) March 10, 2023 09:02
Signed-off-by: ZiheLiu <ziheliu1024@gmail.com>
@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run all

2 similar comments
@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run all

@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run all

Signed-off-by: ZiheLiu <ziheliu1024@gmail.com>
@ZiheLiu ZiheLiu force-pushed the mergify/bp/branch-2.3/pr-19310 branch from ad242a8 to 8ba8481 Compare March 14, 2023 02:39
@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run all

@ZiheLiu ZiheLiu disabled auto-merge March 14, 2023 03:03
@ZiheLiu ZiheLiu enabled auto-merge (squash) March 14, 2023 03:04
@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run starrocks_fe_unittest

1 similar comment
@ZiheLiu
Copy link
Contributor

ZiheLiu commented Mar 14, 2023

run starrocks_fe_unittest

@ZiheLiu ZiheLiu disabled auto-merge March 14, 2023 06:34
@ZiheLiu ZiheLiu enabled auto-merge (squash) March 14, 2023 06:34
@ZiheLiu ZiheLiu merged commit 5e60156 into branch-2.3 Mar 14, 2023
9 of 11 checks passed
@ZiheLiu ZiheLiu deleted the mergify/bp/branch-2.3/pr-19310 branch March 14, 2023 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants