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.

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

test commit #34148

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -243,10 +243,30 @@ private StreamingDataflowWorker(
@Nullable ChannelzServlet channelzServlet = null;
Consumer<PrintWriter> getDataStatusProvider;
Supplier<Long> currentActiveCommitBytesProvider;

if (options.isEnableStreamingEngine() && options.getIsWindmillServiceDirectPathEnabled()) {
// Direct path pipelines.
WeightedSemaphore<Commit> maxCommitByteSemaphore = Commits.maxCommitByteSemaphore();
GetDataClient getDataClient;
HeartbeatSender heartbeatSender;
WorkCommitter workCommitter;
WeightedSemaphore<Commit> maxCommitByteSemaphore = Commits.maxCommitByteSemaphore();
WindmillStreamPool<GetDataStream> getDataStreamPool =
WindmillStreamPool.create(
Math.max(1, options.getWindmillGetDataStreamCount()),
GET_DATA_STREAM_TIMEOUT,
windmillServer::getDataStream);
getDataClient = new StreamPoolGetDataClient(getDataMetricTracker, getDataStreamPool);
heartbeatSender =
createStreamingEngineHeartbeatSender(
options, windmillServer, getDataStreamPool, configFetcher.getGlobalConfigHandle());
workCommitter =
StreamingEngineWorkCommitter.builder()
.setCommitWorkStreamFactory(
WindmillStreamPool.create(
numCommitThreads, COMMIT_STREAM_TIMEOUT, windmillServer::commitWorkStream)
::getCloseableStream)
.setCommitByteSemaphore(maxCommitByteSemaphore)
.setNumCommitSenders(numCommitThreads)
.setOnCommitComplete(this::onCompleteCommit)
.build();
if (isDirectPathPipeline(options)) {
FanOutStreamingEngineWorkerHarness fanOutStreamingEngineWorkerHarness =
FanOutStreamingEngineWorkerHarness.create(
createJobHeader(options, clientId),
Expand Down Expand Up @@ -286,7 +306,13 @@ private StreamingDataflowWorker(
.setCommitWorkStreamFactory(
() -> CloseableStream.create(commitWorkStream, () -> {}))
.build(),
getDataMetricTracker);
getDataMetricTracker,
workCommitter,
getDataClient,
heartbeatSender,
streamingWorkScheduler,
() -> memoryMonitor.waitForResources("GetWork"),
computationStateCache::get);
getDataStatusProvider = getDataMetricTracker::printHtml;
currentActiveCommitBytesProvider =
fanOutStreamingEngineWorkerHarness::currentActiveCommitBytes;
Expand All @@ -302,34 +328,10 @@ private StreamingDataflowWorker(
.setMaxItems(chooseMaxBundlesOutstanding(options))
.setMaxBytes(MAX_GET_WORK_FETCH_BYTES)
.build();
GetDataClient getDataClient;
HeartbeatSender heartbeatSender;
WorkCommitter workCommitter;
GetWorkSender getWorkSender;
if (options.isEnableStreamingEngine()) {
WindmillStreamPool<GetDataStream> getDataStreamPool =
WindmillStreamPool.create(
Math.max(1, options.getWindmillGetDataStreamCount()),
GET_DATA_STREAM_TIMEOUT,
windmillServer::getDataStream);
getDataClient = new StreamPoolGetDataClient(getDataMetricTracker, getDataStreamPool);
heartbeatSender =
createStreamingEngineHeartbeatSender(
options, windmillServer, getDataStreamPool, configFetcher.getGlobalConfigHandle());
channelzServlet =
createChannelzServlet(options, windmillServer::getWindmillServiceEndpoints);
workCommitter =
StreamingEngineWorkCommitter.builder()
.setCommitWorkStreamFactory(
WindmillStreamPool.create(
numCommitThreads,
COMMIT_STREAM_TIMEOUT,
windmillServer::commitWorkStream)
::getCloseableStream)
.setCommitByteSemaphore(Commits.maxCommitByteSemaphore())
.setNumCommitSenders(numCommitThreads)
.setOnCommitComplete(this::onCompleteCommit)
.build();
getWorkSender =
GetWorkSender.forStreamingEngine(
receiver -> windmillServer.getWorkStream(request, receiver));
Expand Down Expand Up @@ -608,6 +610,10 @@ private static StreamingApplianceComputationConfigFetcher createApplianceComputa
new FixedGlobalConfigHandle(StreamingGlobalConfig.builder().build()));
}

private static boolean isDirectPathPipeline(DataflowWorkerHarnessOptions options) {
return options.isEnableStreamingEngine() && options.getIsWindmillServiceDirectPathEnabled();
}

private static void validateWorkerOptions(DataflowWorkerHarnessOptions options) {
Preconditions.checkArgument(
options.isStreaming(),
Expand Down
Loading
Loading