Skip to content

Commit cd5dddf

Browse files
authored
remove private ipv6 check for direct path (#34368)
1 parent 4450031 commit cd5dddf

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ public final class StreamingDataflowWorker {
165165
private static final Random CLIENT_ID_GENERATOR = new Random();
166166
private static final String CHANNELZ_PATH = "/channelz";
167167
private static final String BEAM_FN_API_EXPERIMENT = "beam_fn_api";
168-
private static final String ENABLE_IPV6_EXPERIMENT = "enable_private_ipv6_google_access";
169168
private static final String STREAMING_ENGINE_USE_JOB_SETTINGS_FOR_HEARTBEAT_POOL_EXPERIMENT =
170169
"streaming_engine_use_job_settings_for_heartbeat_pool";
171170

@@ -244,7 +243,9 @@ private StreamingDataflowWorker(
244243
@Nullable ChannelzServlet channelzServlet = null;
245244
Consumer<PrintWriter> getDataStatusProvider;
246245
Supplier<Long> currentActiveCommitBytesProvider;
247-
if (isDirectPathPipeline(options)) {
246+
247+
if (options.isEnableStreamingEngine() && options.getIsWindmillServiceDirectPathEnabled()) {
248+
// Direct path pipelines.
248249
WeightedSemaphore<Commit> maxCommitByteSemaphore = Commits.maxCommitByteSemaphore();
249250
FanOutStreamingEngineWorkerHarness fanOutStreamingEngineWorkerHarness =
250251
FanOutStreamingEngineWorkerHarness.create(
@@ -607,28 +608,6 @@ private static StreamingApplianceComputationConfigFetcher createApplianceComputa
607608
new FixedGlobalConfigHandle(StreamingGlobalConfig.builder().build()));
608609
}
609610

610-
private static boolean isDirectPathPipeline(DataflowWorkerHarnessOptions options) {
611-
if (options.isEnableStreamingEngine() && options.getIsWindmillServiceDirectPathEnabled()) {
612-
boolean isIpV6Enabled =
613-
Optional.ofNullable(options.getDataflowServiceOptions())
614-
.map(serviceOptions -> serviceOptions.contains(ENABLE_IPV6_EXPERIMENT))
615-
.orElse(false);
616-
617-
if (isIpV6Enabled) {
618-
return true;
619-
}
620-
621-
LOG.warn(
622-
"DirectPath is currently only supported with IPv6 networking stack. This requires setting "
623-
+ "\"enable_private_ipv6_google_access\" in experimental pipeline options. "
624-
+ "For information on how to set experimental pipeline options see "
625-
+ "https://cloud.google.com/dataflow/docs/guides/setting-pipeline-options#experimental. "
626-
+ "Defaulting to CloudPath.");
627-
}
628-
629-
return false;
630-
}
631-
632611
private static void validateWorkerOptions(DataflowWorkerHarnessOptions options) {
633612
Preconditions.checkArgument(
634613
options.isStreaming(),

0 commit comments

Comments
 (0)