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

Refactor StateFetcher #28755

Merged
merged 2 commits into from
Oct 20, 2023
Merged

Refactor StateFetcher #28755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
156102b
Refactor StateFetcher
m-trieu Sep 30, 2023
7732ecf
make @SuppressWarnings annotations local and with comments
m-trieu Oct 5, 2023
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
291 changes: 0 additions & 291 deletions ...aflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StateFetcher.java
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions ...worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
import org.apache.beam.runners.dataflow.worker.streaming.WeightedBoundedQueue;
import org.apache.beam.runners.dataflow.worker.streaming.Work;
import org.apache.beam.runners.dataflow.worker.streaming.Work.State;
import org.apache.beam.runners.dataflow.worker.streaming.sideinput.SideInputStateFetcher;
import org.apache.beam.runners.dataflow.worker.util.BoundedQueueExecutor;
import org.apache.beam.runners.dataflow.worker.util.MemoryMonitor;
import org.apache.beam.runners.dataflow.worker.util.common.worker.ElementCounter;
Expand Down Expand Up @@ -228,7 +229,7 @@ public class StreamingDataflowWorker {
private final Thread commitThread;
private final AtomicLong activeCommitBytes = new AtomicLong();
private final AtomicBoolean running = new AtomicBoolean();
private final StateFetcher stateFetcher;
private final SideInputStateFetcher sideInputStateFetcher;
private final StreamingDataflowWorkerOptions options;
private final boolean windmillServiceEnabled;
private final long clientId;
Expand Down Expand Up @@ -406,7 +407,7 @@ public void run() {
this.metricTrackingWindmillServer =
new MetricTrackingWindmillServerStub(windmillServer, memoryMonitor, windmillServiceEnabled);
this.metricTrackingWindmillServer.start();
this.stateFetcher = new StateFetcher(metricTrackingWindmillServer);
this.sideInputStateFetcher = new SideInputStateFetcher(metricTrackingWindmillServer);
this.clientId = clientIdGenerator.nextLong();

for (MapTask mapTask : mapTasks) {
Expand Down Expand Up @@ -1078,7 +1079,7 @@ public void close() {
}
};
});
StateFetcher localStateFetcher = stateFetcher.byteTrackingView();
SideInputStateFetcher localSideInputStateFetcher = sideInputStateFetcher.byteTrackingView();

// If the read output KVs, then we can decode Windmill's byte key into a userland
// key object and provide it to the execution context for use with per-key state.
Expand Down Expand Up @@ -1114,7 +1115,7 @@ public void close() {
outputDataWatermark,
synchronizedProcessingTime,
stateReader,
localStateFetcher,
localSideInputStateFetcher,
outputBuilder);

// Blocks while executing work.
Expand Down Expand Up @@ -1184,7 +1185,7 @@ public void close() {
shuffleBytesRead += message.getSerializedSize();
}
}
long stateBytesRead = stateReader.getBytesRead() + localStateFetcher.getBytesRead();
long stateBytesRead = stateReader.getBytesRead() + localSideInputStateFetcher.getBytesRead();
windmillShuffleBytesRead.addValue(shuffleBytesRead);
windmillStateBytesRead.addValue(stateBytesRead);
windmillStateBytesWritten.addValue(stateBytesWritten);
Expand Down
Loading
Loading