From 5305b351c6cae36e1ee47d47ac11a2f8731b1b71 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 28 Nov 2016 14:16:20 -0800 Subject: [PATCH] Use a retrying Dataflow Client for DataflowPipelineJob --- .../dataflow/sdk/runners/DataflowPipelineRunner.java | 2 +- .../com/google/cloud/dataflow/sdk/util/Transport.java | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java index 8099f0955e..7dc0e9295b 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java @@ -625,7 +625,7 @@ public DataflowPipelineJob run(Pipeline pipeline) { // regularly and need not be retried automatically. DataflowPipelineJob dataflowPipelineJob = new DataflowPipelineJob(options.getProject(), jobResult.getId(), - Transport.newRawDataflowClient(options).build(), aggregatorTransforms); + Transport.newDataflowClient(options).build(), aggregatorTransforms); // If the service returned client request id, the SDK needs to compare it // with the original id generated in the request, if they are not the same diff --git a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java b/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java index 15fe286339..f2de47e390 100644 --- a/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java +++ b/sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java @@ -157,17 +157,6 @@ public static Clouddebugger.Builder newClouddebuggerClient(DataflowPipelineOptio .setGoogleClientRequestInitializer(options.getGoogleApiTrace()); } - /** - * Returns a Dataflow client that does not automatically retry failed - * requests. - */ - public static Dataflow.Builder - newRawDataflowClient(DataflowPipelineOptions options) { - return newDataflowClient(options) - .setHttpRequestInitializer(options.getGcpCredential()) - .setGoogleClientRequestInitializer(options.getGoogleApiTrace()); - } - /** * Returns a Cloud Storage client builder. *