Repository: helix Updated Branches: refs/heads/helix-0.8.1-hotfix 2a770b2a6 -> a274340b2
Fix GroupCommit issue for adding back current state There was an issue that GroupCommit will add DROPPED current state back if there are double sent OFFLINE -> DROPPED message. Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/a274340b Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/a274340b Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/a274340b Branch: refs/heads/helix-0.8.1-hotfix Commit: a274340b29f6decd58d9fd8245d3523a6dae6ded Parents: 2a770b2 Author: Junkai Xue <[email protected]> Authored: Tue Jul 17 22:06:59 2018 -0700 Committer: Junkai Xue <[email protected]> Committed: Tue Jul 17 22:06:59 2018 -0700 ---------------------------------------------------------------------- helix-core/src/main/java/org/apache/helix/GroupCommit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/a274340b/helix-core/src/main/java/org/apache/helix/GroupCommit.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/GroupCommit.java b/helix-core/src/main/java/org/apache/helix/GroupCommit.java index b6c0ff1..e775d2d 100644 --- a/helix-core/src/main/java/org/apache/helix/GroupCommit.java +++ b/helix-core/src/main/java/org/apache/helix/GroupCommit.java @@ -117,9 +117,9 @@ public class GroupCommit { */ if (merged == null) { merged = new ZNRecord(first._record); - } else { - merged.merge(first._record); } + merged.merge(first._record); + Iterator<Entry> it = queue._pending.iterator(); while (it.hasNext()) { Entry ent = it.next();
