From a2f16d87e45a799ea81211ec926e12c530cb2872 Mon Sep 17 00:00:00 2001 From: Eugene Kirpichov Date: Wed, 22 Mar 2017 15:38:55 -0700 Subject: [PATCH] Log job state on unsuccessful cancel --- .../org/apache/beam/runners/dataflow/DataflowPipelineJob.java | 3 ++- .../apache/beam/runners/dataflow/DataflowPipelineJobTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 1112fbbd20443..732e0af64479c 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 State cancel() throws IOException { 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); 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 a2d67a0512c6f..5d4264dd01edc 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 void testCancelUnterminatedJobThatFails() throws IOException { 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();