Merge pull request cdapio#15327 from cdapio/provisioning_fix

[CDAP-20807] Update Guava version to match google libraries needs and ensure Errors (e.g. method not found) are properly propagated.
cloudsufi · Sep 20, 2023 · ec02b03 · ec02b03
2 parents b7abe0d + a85d402
commit ec02b03
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
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
@@ -119,7 +119,7 @@ protected Map<ProvisioningOp.Status, ProvisioningSubtask> 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
@@ -105,7 +105,7 @@ protected Map<ProvisioningOp.Status, ProvisioningSubtask> 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
@@ -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<ProvisioningOp.Status, ProvisioningSubtask> 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
@@ -63,9 +63,10 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <!-- required by com.google.auth:google-auth-library-oauth2-http,
-           but set to 0.13.0 by google-cloud-dataproc for some reason -->
-      <version>20.0</version>
+      <!-- newer version required by google libs,
+           but set to 0.13.0 by parent pom, so put explicit version
+           needed by google libs -->
+      <version>32.1.2-jre</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>