Skip to content

[BEAM-6867] Fixing data race in DataflowSideInputReadCounter #8080

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

Merged
pabloem merged 1 commit into from
Apr 9, 2019
Merged

[BEAM-6867] Fixing data race in DataflowSideInputReadCounter #8080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...r/src/main/java/org/apache/beam/runners/dataflow/worker/DataflowSideInputReadCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,10 @@ public DataflowSideInputReadCounter(
this.declaringOperationContext = operationContext;
byteCounters = new HashMap<>();
executionStates = new HashMap<>();
checkState();
updateCurrentStateIfOutdated();
}

private void checkState() {
private void updateCurrentStateIfOutdated() {
DataflowExecutionState currentState =
(DataflowExecutionState) executionContext.getExecutionStateTracker().getCurrentState();
if (currentState == null
Expand Down Expand Up @@ -160,11 +160,11 @@ public void addBytesRead(long n) {

@Override
public Closeable enter() {
checkState();
// Only update status from tracked thread to avoid race condition and inconsistent state updates
if (executionContext.getExecutionStateTracker().getTrackedThread() != Thread.currentThread()) {
return () -> {};
}
updateCurrentStateIfOutdated();
return executionContext.getExecutionStateTracker().enterState(currentExecutionState);
}

Expand Down