scwhittle commented on code in PR #32775:
URL: https://github.com/apache/beam/pull/32775#discussion_r1800967627
##########
runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/harness/FanOutStreamingEngineWorkerHarness.java:
##########
@@ -80,32 +80,39 @@
public final class FanOutStreamingEngineWorkerHarness implements
StreamingWorkerHarness {
private static final Logger LOG =
LoggerFactory.getLogger(FanOutStreamingEngineWorkerHarness.class);
- private static final String PUBLISH_NEW_WORKER_METADATA_THREAD =
"PublishNewWorkerMetadataThread";
- private static final String CONSUME_NEW_WORKER_METADATA_THREAD =
"ConsumeNewWorkerMetadataThread";
+ private static final String WORKER_METADATA_CONSUMER_THREAD_NAME =
+ "WindmillWorkerMetadataConsumerThread";
+ private static final String STREAM_MANAGER_THREAD_NAME =
"WindmillStreamManager-%d";
private final JobHeader jobHeader;
private final GrpcWindmillStreamFactory streamFactory;
private final WorkItemScheduler workItemScheduler;
private final ChannelCachingStubFactory channelCachingStubFactory;
private final GrpcDispatcherClient dispatcherClient;
- private final AtomicBoolean isBudgetRefreshPaused;
- private final GetWorkBudgetRefresher getWorkBudgetRefresher;
- private final AtomicReference<Instant> lastBudgetRefresh;
+ private final GetWorkBudgetDistributor getWorkBudgetDistributor;
+ private final GetWorkBudget totalGetWorkBudget;
private final ThrottleTimer getWorkerMetadataThrottleTimer;
- private final ExecutorService newWorkerMetadataPublisher;
- private final ExecutorService newWorkerMetadataConsumer;
- private final long clientId;
- private final Supplier<GetWorkerMetadataStream> getWorkerMetadataStream;
- private final Queue<WindmillEndpoints> newWindmillEndpoints;
private final Function<WindmillStream.CommitWorkStream, WorkCommitter>
workCommitterFactory;
private final ThrottlingGetDataMetricTracker getDataMetricTracker;
+ private final ExecutorService windmillStreamManager;
+ private final ExecutorService workerMetadataConsumer;
+ private final Object metadataLock;
Review Comment:
nit: just do = new Object() here?
##########
runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/streaming/harness/GlobalDataStreamSender.java:
##########
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.beam.runners.dataflow.worker.streaming.harness;
+
+import java.io.Closeable;
+import java.util.function.Supplier;
+import javax.annotation.concurrent.ThreadSafe;
+import
org.apache.beam.runners.dataflow.worker.windmill.WindmillEndpoints.Endpoint;
+import
org.apache.beam.runners.dataflow.worker.windmill.client.WindmillStream.GetDataStream;
+import org.apache.beam.sdk.annotations.Internal;
+
+@Internal
+@ThreadSafe
+// TODO (m-trieu): replace Supplier<Stream> with Stream after
github.com/apache/beam/pull/32774/ is
+// merged
+final class GlobalDataStreamSender implements Closeable,
Supplier<GetDataStream> {
+ private final Endpoint endpoint;
+ private final Supplier<GetDataStream> delegate;
+ private volatile boolean started;
+
+ GlobalDataStreamSender(Supplier<GetDataStream> delegate, Endpoint endpoint) {
+ this.delegate = delegate;
+ this.started = false;
+ this.endpoint = endpoint;
+ }
+
+ @Override
+ public GetDataStream get() {
+ if (!started) {
Review Comment:
started is volatile but it also isn't controlling anything useful at the
moment as far as I can tell. Should started be removed for now instead? Or
should close() be changed to do something only if started?
--
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.
To unsubscribe, e-mail: github-unsubscr...@beam.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
