You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2020/08/27 18:54:37 UTC
[GitHub] [beam] rohdesamuel opened a new pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
rohdesamuel opened a new pull request #12702:
URL: https://github.com/apache/beam/pull/12702
Change-Id: I24eb5a94e1bdafa1833ede0d04c9e2b824417f87
The old logic didn't allow for the BCJ to terminate if cancelled without a trigger. This allows for the BCJ to be cancelled at any time.
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) 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](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/#make-reviewers-job-easier).
Post-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
Lang | SDK | Dataflow | Flink | Samza | Spark | Twister2
--- | --- | --- | --- | --- | --- | ---
Go | [](https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/) | ---
Java | [](https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/) | [](https://builds.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/)
Python | [](https://ci-beam.apache.org/job/beam_PostCommit_Python2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python35/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python2_PVR_Flink_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PostCommit_Python35_VR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/) | ---
XLang | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/) | --- | [](https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/) | ---
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
--- |Java | Python | Go | Website | Whitespace
--- | --- | --- | --- | --- | ---
Non-portable | [](https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/)<br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/lastCompletedBuild/) <br>[](https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/) | [](https://ci-beam.apache.org/job/beam_PreCommit_Whitespace_Cron/lastCompletedBuild/)
Portable | --- | [](https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/) | --- | --- | ---
See [.test-infra/jenkins/README](https://github.com/apache/beam/blob/master/.test-infra/jenkins/README.md) for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] rohdesamuel commented on a change in pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
rohdesamuel commented on a change in pull request #12702:
URL: https://github.com/apache/beam/pull/12702#discussion_r482495349
##########
File path: sdks/python/apache_beam/runners/interactive/background_caching_job.py
##########
@@ -103,6 +102,7 @@ def cancel(self):
if not PipelineState.is_terminal(self._pipeline_result.state):
try:
self._pipeline_result.cancel()
+ self._pipeline_result.wait_until_finish()
Review comment:
Yeah, in a later PR I added a lock about the pipeline result because of this comment. And it generally shouldn't be a problem if the cancellation takes a long time.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] udim commented on a change in pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
udim commented on a change in pull request #12702:
URL: https://github.com/apache/beam/pull/12702#discussion_r489117331
##########
File path: sdks/python/apache_beam/runners/interactive/background_caching_job.py
##########
@@ -87,11 +87,10 @@ def _should_end_condition_checker(self):
return any([l.is_triggered() for l in self._limiters])
def is_done(self):
- is_terminated = self._pipeline_result.state is PipelineState.DONE
+ is_terminated = self._pipeline_result.state in (
+ PipelineState.DONE, PipelineState.CANCELLED)
Review comment:
Codecov reporting was buggy, should be better now. :)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] rohdesamuel commented on pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
rohdesamuel commented on pull request #12702:
URL: https://github.com/apache/beam/pull/12702#issuecomment-683907757
R: @pabloem
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pabloem commented on a change in pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
pabloem commented on a change in pull request #12702:
URL: https://github.com/apache/beam/pull/12702#discussion_r480288919
##########
File path: sdks/python/apache_beam/runners/interactive/background_caching_job.py
##########
@@ -87,11 +87,10 @@ def _should_end_condition_checker(self):
return any([l.is_triggered() for l in self._limiters])
def is_done(self):
- is_terminated = self._pipeline_result.state is PipelineState.DONE
+ is_terminated = self._pipeline_result.state in (
+ PipelineState.DONE, PipelineState.CANCELLED)
Review comment:
Ah this is odd indeed - this line must be hit by the test in capture_control_test.py, right? But codecov is marking it as not covered, correct?
cc: @udim
##########
File path: sdks/python/apache_beam/runners/interactive/background_caching_job.py
##########
@@ -103,6 +102,7 @@ def cancel(self):
if not PipelineState.is_terminal(self._pipeline_result.state):
try:
self._pipeline_result.cancel()
+ self._pipeline_result.wait_until_finish()
Review comment:
I'm sure you've considered this, but just to be sure, have you given thought to other code assuming that this call is asynchronous?
Also, might this pipeline run in an environment where a cancelation may take a long time? I guess it shouldnt be a problem generally?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] codecov[bot] commented on pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on pull request #12702:
URL: https://github.com/apache/beam/pull/12702#issuecomment-682154278
# [Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=h1) Report
> Merging [#12702](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=desc) into [master](https://codecov.io/gh/apache/beam/commit/faf76d59a5b24bf7f0daed5a503a07f0fff70ec1?el=desc) will **decrease** coverage by `0.00%`.
> The diff coverage is `0.00%`.
[](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #12702 +/- ##
==========================================
- Coverage 40.30% 40.30% -0.01%
==========================================
Files 451 451
Lines 53168 53169 +1
==========================================
Hits 21429 21429
- Misses 31739 31740 +1
```
| [Impacted Files](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...beam/runners/interactive/background\_caching\_job.py](https://codecov.io/gh/apache/beam/pull/12702/diff?src=pr&el=tree#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy9pbnRlcmFjdGl2ZS9iYWNrZ3JvdW5kX2NhY2hpbmdfam9iLnB5) | `25.00% <0.00%> (-0.25%)` | :arrow_down: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=footer). Last update [faf76d5...6bc39bc](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] codecov[bot] edited a comment on pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
codecov[bot] edited a comment on pull request #12702:
URL: https://github.com/apache/beam/pull/12702#issuecomment-682154278
# [Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=h1) Report
> Merging [#12702](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=desc) into [master](https://codecov.io/gh/apache/beam/commit/faf76d59a5b24bf7f0daed5a503a07f0fff70ec1?el=desc) will **decrease** coverage by `0.00%`.
> The diff coverage is `0.00%`.
[](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #12702 +/- ##
==========================================
- Coverage 40.30% 40.30% -0.01%
==========================================
Files 451 451
Lines 53168 53169 +1
==========================================
Hits 21429 21429
- Misses 31739 31740 +1
```
| [Impacted Files](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [...beam/runners/interactive/background\_caching\_job.py](https://codecov.io/gh/apache/beam/pull/12702/diff?src=pr&el=tree#diff-c2Rrcy9weXRob24vYXBhY2hlX2JlYW0vcnVubmVycy9pbnRlcmFjdGl2ZS9iYWNrZ3JvdW5kX2NhY2hpbmdfam9iLnB5) | `25.00% <0.00%> (-0.25%)` | :arrow_down: |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=footer). Last update [faf76d5...6bc39bc](https://codecov.io/gh/apache/beam/pull/12702?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pabloem merged pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
pabloem merged pull request #12702:
URL: https://github.com/apache/beam/pull/12702
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] rohdesamuel commented on a change in pull request #12702: [BEAM-10603] Fix BCJ termination conditions.
Posted by GitBox <gi...@apache.org>.
rohdesamuel commented on a change in pull request #12702:
URL: https://github.com/apache/beam/pull/12702#discussion_r480307676
##########
File path: sdks/python/apache_beam/runners/interactive/background_caching_job.py
##########
@@ -87,11 +87,10 @@ def _should_end_condition_checker(self):
return any([l.is_triggered() for l in self._limiters])
def is_done(self):
- is_terminated = self._pipeline_result.state is PipelineState.DONE
+ is_terminated = self._pipeline_result.state in (
+ PipelineState.DONE, PipelineState.CANCELLED)
Review comment:
Yeah, it definitely looks like it should be. Maybe Codev is trying to do something smarter like static analysis on the logic?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org