Revert #5330, #5331, #5333, #5334 (prepare consolidated re-land with both contributor trailers) - #5335
Merged
qqeasonchen merged 4 commits intoSep 7, 2026
Conversation
This reverts commit e6e1247. Part of consolidating the four attribution/fix commits (apache#5330, apache#5331, apache#5333, apache#5334) into a single follow-up PR that carries both contributor trailers (zhang-arvin for apache#5316, wangyusheng1985 for apache#5325) in its squash-merge commit message.
This reverts commit 2d2f98f. Part of consolidating the four attribution/fix commits (apache#5330, apache#5331, apache#5333, apache#5334) into a single follow-up PR that carries both contributor trailers (zhang-arvin for apache#5316, wangyusheng1985 for apache#5325) in its squash-merge commit message.
This reverts commit 4c3e85b. Part of consolidating the four attribution/fix commits (apache#5330, apache#5331, apache#5333, apache#5334) into a single follow-up PR that carries both contributor trailers (zhang-arvin for apache#5316, wangyusheng1985 for apache#5325) in its squash-merge commit message.
This reverts commit c7de75b. Part of consolidating the four attribution/fix commits (apache#5330, apache#5331, apache#5333, apache#5334) into a single follow-up PR that carries both contributor trailers (zhang-arvin for apache#5316, wangyusheng1985 for apache#5325) in its squash-merge commit message.
qqeasonchen
added a commit
that referenced
this pull request
Sep 7, 2026
… (PR #5316) (#5336) Combined re-land of the four earlier #5330 / #5331 / #5333 / #5334 commits (all reverted by #5335) as a single commit on develop, with both contributor trailers preserved. **What this PR does** - Reapplies the RocketMQ 5 POP broker-ACK barrier from PR #5316 (zhang-arvin, fixes #5295) onto the post-#5301-Sub-PR-B/C `UniIngressService.deliver` structure. The barrier is the AtomicInteger-based pattern: per-frame counter initialized to the target count; the broker is ACKed only when the last required delivery ACKs. - Adds a 6-line source-level Javadoc in `UniIngressService.java` attributing the barrier block to PR #5316 and zhang-arvin. - Adds a package-level paragraph in `ingress/package-info.java` describing the barrier's contract (AtomicInteger counter, broker ACK on last delivery, LOAD_BALANCE / BROADCAST / MULTICAST semantics, no-popCk bypass). - Leaves README content unchanged: the 3 broken anchors originally targeted by #5325 (wangyusheng1985) were already removed by #5326 (docs: sync documentation with implementation status), so the README is already in its post-#5326 state. **Why a single commit instead of four** GitHub's contributor graph counts both `commit author` and `Co-authored-by:` trailers in the commit message. The earlier four-commit approach split the attribution across squash merges with inconsistent trailer handling. Consolidating into one PR with two trailers (zhang-arvin for #5316, wangyusheng1985 for #5325) preserves both contributors' graph credit in a single squash-merge commit. **Files changed**: 2 files - `eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/ingress/UniIngressService.java` (barrier block + attribution Javadoc) - `eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/ingress/package-info.java` (package-level barrier doc) **Closes #5316, Closes #5325, Fixes #5295** cc @zhang-arvin @wangyusheng1985 Co-authored-by: zhang-arvin <arvin.zhang@htx-inc.com> Co-authored-by: wangyusheng1985 <wangyusheng1985@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts the four commits landed earlier to attribute / merge #5316 (zhang-arvin) and #5325 (wangyusheng1985) onto develop:
fix(#5295): gate RocketMQ 5 POP broker ACK on distribution completion)UniIngressService.javaingress/package-info.javaAfter this revert lands, the develop tree returns to
2b0d7abb(the pre-#5330 state), with the four changes unsuperseded.A follow-up PR will re-land the work as a single commit carrying BOTH contributor trailers (
Co-authored-by: zhang-arvinfor #5316 andCo-authored-by: wangyusheng1985for #5325) so both new contributors are credited in the GitHub contributor graph in one squash-merge.Why revert first? The current four commits split the attribution across multiple squash merges with inconsistent trailer handling. Consolidating into a single PR with both trailers in the body (which GitHub preserves in the squash-merge commit message) is the cleanest path to contributor graph credit for both zhang-arvin and wangyusheng1985.