Log job state on unsuccessful cancel

mransley · Mar 23, 2017 · a2f16d8 · a2f16d8
1 parent 70efdd0
commit a2f16d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...oud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java b/...oud-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/...dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java b/...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();