Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Spark livy console artifacts uploading failure block start #4814

Merged
merged 3 commits into from
Dec 15, 2020
Merged

Fix Spark livy console artifacts uploading failure block start #4814

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ebbdab
Fix Spark livy console artifacts uploading failure block start
wezhang Dec 15, 2020
4a3a8c1
Merge branch 'develop' into v3.48-fix-livy-console-fail-upload-arti
wezhang Dec 15, 2020
6650867
Merge branch 'develop' into v3.48-fix-livy-console-fail-upload-arti
wezhang Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ...ht-node-common/src/com/microsoft/azure/hdinsight/sdk/common/livy/interactive/Session.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@

import static com.microsoft.azure.hdinsight.common.MessageInfoType.Debug;
import static com.microsoft.azure.hdinsight.common.MessageInfoType.Info;
import static com.microsoft.azure.hdinsight.common.MessageInfoType.Warning;
import static com.microsoft.azure.hdinsight.spark.common.log.SparkLogLine.TOOL;
import static java.lang.Thread.sleep;
import static rx.exceptions.Exceptions.propagate;
Expand Down Expand Up @@ -512,6 +513,14 @@ public Observable<Session> deploy() {
.doOnNext(uri -> ctrlSubject.onNext(
new SparkLogLine(TOOL, Info, "Uploaded to " + uri)))
.toList()
.onErrorResumeNext(err -> {
ctrlSubject.onNext(
new SparkLogLine(TOOL, Warning, "Failed to upload artifact: " + err));
ctrlSubject.onNext(
new SparkLogLine(TOOL, Warning, "Try to start interactive session without those artifacts dependency..."));

return Observable.empty();
})
.map(uploadedUris -> {
this.createParameters.uploadedArtifactsUris.addAll(uploadedUris);

Expand Down