Skip to content

Commit 7611941

Browse files
includettsSbloodyS
andauthored
[Fix-18177][Task Plugin] Fix AliyunServerlessSpark plugin dependency conflicts and improve exception handling (#18180)
Co-authored-by: xiangzihao <460888207@qq.com>
1 parent dd8857b commit 7611941

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

  • dolphinscheduler-bom
  • dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark
  • dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark

dolphinscheduler-bom/pom.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@
129129
<guice.version>7.0.0</guice.version>
130130
<jsr305.version>3.0.0</jsr305.version>
131131
<error.prone.annotations.version>2.11.0</error.prone.annotations.version>
132+
<emr-serverless-spark.version>2.4.1</emr-serverless-spark.version>
133+
<credentials-java.version>1.0.1</credentials-java.version>
132134
</properties>
133135

134136
<dependencyManagement>
@@ -959,6 +961,18 @@
959961
<scope>test</scope>
960962
</dependency>
961963

964+
<dependency>
965+
<groupId>com.aliyun</groupId>
966+
<artifactId>emr_serverless_spark20230808</artifactId>
967+
<version>${emr-serverless-spark.version}</version>
968+
</dependency>
969+
970+
<dependency>
971+
<groupId>com.aliyun</groupId>
972+
<artifactId>credentials-java</artifactId>
973+
<version>${credentials-java.version}</version>
974+
</dependency>
975+
962976
<!-- test dependencies on TestContainers -->
963977
<dependency>
964978
<groupId>org.testcontainers</groupId>

dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-aliyunserverlessspark/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,11 @@
5454
<dependency>
5555
<groupId>com.aliyun</groupId>
5656
<artifactId>emr_serverless_spark20230808</artifactId>
57-
<version>1.0.0</version>
5857
</dependency>
5958

6059
<dependency>
6160
<groupId>com.aliyun</groupId>
6261
<artifactId>credentials-java</artifactId>
63-
<version>0.3.0</version>
6462
</dependency>
6563
</dependencies>
6664

dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@
6767
<dependency>
6868
<groupId>com.aliyun</groupId>
6969
<artifactId>emr_serverless_spark20230808</artifactId>
70-
<version>2.4.1</version>
7170
</dependency>
7271

7372
<dependency>
7473
<groupId>com.aliyun</groupId>
7574
<artifactId>credentials-java</artifactId>
76-
<version>0.3.0</version>
7775
</dependency>
7876
</dependencies>
7977

dolphinscheduler-task-plugin/dolphinscheduler-task-aliyunserverlessspark/src/main/java/org/apache/dolphinscheduler/plugin/task/aliyunserverlessspark/AliyunServerlessSparkTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public void handle(TaskCallBack taskCallBack) throws TaskException {
154154
return aliyunServerlessSparkClient.startJobRun(
155155
aliyunServerlessSparkParameters.getWorkspaceId(), startJobRunRequest);
156156
} catch (Exception e) {
157-
throw new AliyunServerlessSparkTaskException("Failed to start job run!");
157+
throw new AliyunServerlessSparkTaskException("Failed to start job run! ", e);
158158
}
159159
}, retryPolicy);
160160

@@ -224,7 +224,7 @@ public void cancelApplication() throws TaskException {
224224
aliyunServerlessSparkParameters.getWorkspaceId(), jobRunId,
225225
cancelJobRunRequest);
226226
} catch (Exception e) {
227-
throw new AliyunServerlessSparkTaskException("Failed to cancel job run!");
227+
throw new AliyunServerlessSparkTaskException("Failed to cancel job run! ", e);
228228
}
229229
}, retryPolicy);
230230
}

0 commit comments

Comments
 (0)