Skip to content
This repository was archived by the owner on Nov 11, 2022. It is now read-only.

Commit 967e4cc

Browse files
authored
Merge pull request #489 from dpmills/dataflow-client
Use a retrying Dataflow Client for DataflowPipelineJob
2 parents 9c3af6e + 5305b35 commit 967e4cc

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

sdk/src/main/java/com/google/cloud/dataflow/sdk/runners/DataflowPipelineRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ public DataflowPipelineJob run(Pipeline pipeline) {
651651
// regularly and need not be retried automatically.
652652
DataflowPipelineJob dataflowPipelineJob =
653653
new DataflowPipelineJob(options.getProject(), jobResult.getId(),
654-
Transport.newRawDataflowClient(options).build(), aggregatorTransforms);
654+
Transport.newDataflowClient(options).build(), aggregatorTransforms);
655655

656656
// If the service returned client request id, the SDK needs to compare it
657657
// with the original id generated in the request, if they are not the same

sdk/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,6 @@ public static Clouddebugger.Builder newClouddebuggerClient(DataflowPipelineOptio
161161
.setGoogleClientRequestInitializer(options.getGoogleApiTrace());
162162
}
163163

164-
/**
165-
* Returns a Dataflow client that does not automatically retry failed
166-
* requests.
167-
*/
168-
public static Dataflow.Builder
169-
newRawDataflowClient(DataflowPipelineOptions options) {
170-
return newDataflowClient(options)
171-
.setHttpRequestInitializer(options.getGcpCredential())
172-
.setGoogleClientRequestInitializer(options.getGoogleApiTrace());
173-
}
174-
175164
/**
176165
* Returns a Cloud Storage client builder.
177166
*

0 commit comments

Comments
 (0)