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.

Sign up for GitHub

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

Jump to bottom

Throw exception if Dataflow template file writing fails. #33684

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Throw exception if Dataflow template file writing fails. #33684

wants to merge 2 commits into from
+223 −125

Conversation

baeminbo
Copy link
Contributor

@baeminbo baeminbo commented Jan 21, 2025 •
edited
Loading

Fix #33636

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

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • 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.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@github-actions GitHub Actions
Copy link
Contributor

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

@github-actions GitHub Actions
Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @jrmccluskey added as fallback since no labels match configuration

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@baeminbo
Copy link
Contributor Author

This fixes GCS upload errors are swallowed in PrintWriter at DataflouwRunner.run().

To test the fix, the unit tests mock the static method FileSystems.create() in DataflowRunnerTest. For this, Mockito.mockStatic is used instead of PowerMockito.mockStatic so that we don't need PowerMockRunner anymore for some unit tests that mock static methods.

The dependency mockito-core was replaced by mockito-inline for the Mockito.mockStatic change.

I changed DataflowPipelineOptionsTest as well to remove the usage of PowerMockito.mockStatic. I fixed some warnings such as unnecessary type conversion, unthrown exceptions, etc.

@baeminbo
Copy link
Contributor Author

R: @jrmccluskey

Hi, could you review this PR? I waited for auto-assignment, but it didn't. Could you let me know what's the right way to set the assignee?

@github-actions GitHub Actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

@jrmccluskey
Copy link
Contributor

assign set of reviewers

@jrmccluskey
Copy link
Contributor

R: @jrmccluskey

Hi, could you review this PR? I waited for auto-assignment, but it didn't. Could you let me know what's the right way to set the assignee?

Usually the "assign set of reviewers" comment will get the bot to assign someone appropriate for the PR if it failed previously. I'll defer to the bot assignment here since a Java template change is outside of my wheelhouse for review.

@github-actions GitHub Actions
Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @damccorm added as fallback since no labels match configuration

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@github-actions GitHub Actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

damccorm
damccorm reviewed Jan 29, 2025
View reviewed changes
Copy link
Contributor

@damccorm damccorm left a comment

Choose a reason for hiding this comment

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

One comment about tests, otherwise this LGTM

...e-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowRunnerTest.java
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did we change our mocking logic here? Seems like a bunch of changes in this test file might be unrelated to the main change, could you share why you made the changes or scope them to a future PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

IIUC, PowerMockito is a part of PowerMock, which is an extension of Mockito. That was used for insufficient features of Mockito such as mocking static methods. Now, mockito-inline can support those features. It looks like that PowerMock project was stopped.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@damccorm damccorm damccorm left review comments

Assignees
No one assigned
Labels
dataflow Next Action: Reviewers runners
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug]: The output reports success when Dataflow template creation is not successful
3 participants
@baeminbo @jrmccluskey @damccorm