Skip to content

[BEAM-10991] Cherrypick #12980 to 2.25.0: Revert "[BEAM-8543] Dataflow streaming timers are not strictly time ordered when set earlier mid-bundle (#11924)" - #12993

Merged
robinyqiu merged 2 commits into
apache:release-2.25.0from
kennknowles:cherrypick-timer-issue
Oct 5, 2020

Conversation

@kennknowles

Copy link
Copy Markdown
Member

This change is a serious regression in 2.24.0 so should be cherrypicked back to 2.25.0


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

Post-Commit Tests Status (on master branch)

LangSDKDataflowFlinkSamzaSparkTwister2
GoBuild Status---Build Status---Build Status---
JavaBuild StatusBuild Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build StatusBuild Status
Build Status
Build Status
Build Status
PythonBuild Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
---Build Status---
XLangBuild Status---Build Status---Build Status---

Pre-Commit Tests Status (on master branch)

---JavaPythonGoWebsiteWhitespaceTypescript
Non-portableBuild StatusBuild Status
Build Status
Build Status
Build Status
Build StatusBuild StatusBuild StatusBuild Status
Portable---Build Status------------

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests

See CI.md for more information about GitHub Actions CI.

…rdered when set earlier mid-bundle (apache#11924)"
This reverts commit 88acc52.
There is a bug in this commit that causes deleted timers to not clear their
watermark holds, resulting in stuck pipelines. See
https://issues.apache.org/jira/browse/BEAM-10991

@robinyqiurobinyqiu left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov

codecovBot commented Oct 1, 2020

Copy link
Copy Markdown

Codecov Report

Merging #12993 into release-2.25.0 will increase coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@ Coverage Diff @@## release-2.25.0 #12993 +/- ##
==================================================
+ Coverage 82.30% 82.36% +0.05% 
==================================================
Files 455 455 Lines 54589 54948 +359 ==================================================
+ Hits 44931 45257 +326 - Misses 9658 9691 +33 
Impacted FilesCoverage Δ
...ks/python/apache_beam/runners/worker/sdk_worker.py88.80% <0.00%> (-0.18%)⬇️
...nners/portability/fn_api_runner/worker_handlers.py80.75% <0.00%> (+0.17%)⬆️
sdks/python/apache_beam/transforms/util.py95.63% <0.00%> (+0.18%)⬆️
sdks/python/apache_beam/io/gcp/bigquery.py81.02% <0.00%> (+0.30%)⬆️
sdks/python/apache_beam/runners/common.py89.20% <0.00%> (+0.44%)⬆️
sdks/python/apache_beam/io/localfilesystem.py91.66% <0.00%> (+0.75%)⬆️
...ks/python/apache_beam/runners/worker/data_plane.py89.90% <0.00%> (+1.22%)⬆️
sdks/python/apache_beam/io/gcp/bigquery_tools.py89.88% <0.00%> (+1.76%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c329565...1f24fec. Read the comment docs.

@kennknowles

Copy link
Copy Markdown
MemberAuthor

Run Java PreCommit

@kennknowles

Copy link
Copy Markdown
MemberAuthor

Run Python PreCommit

@kennknowles

Copy link
Copy Markdown
MemberAuthor

Run Python_PVR_Flink PreCommit

Comment threadCHANGES.md
@robinyqiu
robinyqiu merged commit 01040fd into apache:release-2.25.0Oct 5, 2020
@kennknowles
kennknowles deleted the cherrypick-timer-issue branch January 4, 2024 20:35
Sign up for freeto 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.

2 participants

@kennknowles@robinyqiu