Repository: beam Updated Branches: refs/heads/master 70efdd0fe -> d6f6351f1
Log job state on unsuccessful cancel Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a2f16d87 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a2f16d87 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a2f16d87 Branch: refs/heads/master Commit: a2f16d87e45a799ea81211ec926e12c530cb2872 Parents: 70efdd0 Author: Eugene Kirpichov <[email protected]> Authored: Wed Mar 22 15:38:55 2017 -0700 Committer: Eugene Kirpichov <[email protected]> Committed: Wed Mar 22 17:57:58 2017 -0700 ---------------------------------------------------------------------- .../org/apache/beam/runners/dataflow/DataflowPipelineJob.java | 3 ++- .../org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/a2f16d87/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java index 1112fbb..732e0af 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java @@ -354,8 +354,9 @@ public class DataflowPipelineJob implements PipelineResult { return state; } else { String errorMsg = String.format( - "Failed to cancel the job, " + "Failed to cancel job in state %s, " + "please go to the Developers Console to cancel it manually: %s", + state, MonitoringUtil.getJobMonitoringPageURL(getProjectId(), getJobId())); LOG.warn(errorMsg); throw new IOException(errorMsg, e); http://git-wip-us.apache.org/repos/asf/beam/blob/a2f16d87/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java ---------------------------------------------------------------------- diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java index a2d67a0..5d4264d 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java @@ -755,7 +755,7 @@ public class DataflowPipelineJobTest { DataflowPipelineJob job = new DataflowPipelineJob(JOB_ID, options, null); thrown.expect(IOException.class); - thrown.expectMessage("Failed to cancel the job, " + thrown.expectMessage("Failed to cancel job in state RUNNING, " + "please go to the Developers Console to cancel it manually:"); job.cancel();
