diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/DeprovisionTask.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/DeprovisionTask.java index ede61bb829c3..50520064be85 100644 --- a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/DeprovisionTask.java +++ b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/DeprovisionTask.java @@ -119,7 +119,7 @@ protected Map createSubTasks( } @Override - protected void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Exception e) { + protected void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Throwable e) { provisionerNotifier.orphaned(programRunId); } diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisionTask.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisionTask.java index 720b18f99765..9b545edb736a 100644 --- a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisionTask.java +++ b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisionTask.java @@ -105,7 +105,7 @@ protected Map createSubTasks( } @Override - protected void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Exception e) { + protected void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Throwable e) { notifyFailed(e); } diff --git a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisioningTask.java b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisioningTask.java index 879dd060e5f3..4cd655642c12 100644 --- a/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisioningTask.java +++ b/cdap-app-fabric/src/main/java/io/cdap/cdap/internal/provision/task/ProvisioningTask.java @@ -157,7 +157,7 @@ public final long executeOnce() throws Exception { return 0; } catch (InterruptedException e) { throw e; - } catch (Exception e) { + } catch (Throwable e) { LOG.error("{} task failed in {} state for program run {} due to {}.", currentTaskInfo.getProvisioningOp().getType(), state, programRunId, Exceptions.condenseThrowableMessage(e), e); @@ -231,7 +231,7 @@ protected abstract Map createSubTask * @param taskInfo task info for the failure * @param e the non-retryable exception */ - protected abstract void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Exception e); + protected abstract void handleSubtaskFailure(ProvisioningTaskInfo taskInfo, Throwable e); /** * Logic to run when task info could not be saved to the ProvisionerStore. diff --git a/cdap-runtime-ext-dataproc/pom.xml b/cdap-runtime-ext-dataproc/pom.xml index cfd9811a6033..32f19de36c4d 100644 --- a/cdap-runtime-ext-dataproc/pom.xml +++ b/cdap-runtime-ext-dataproc/pom.xml @@ -63,9 +63,10 @@ com.google.guava guava - - 20.0 + + 32.1.2-jre commons-cli