Skip to content

Commit 35695bf

Browse files
wezhangEskibear
authored andcommitted
Fix Spark Job remote debug hang regression
1 parent 42d4564 commit 35695bf

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/spark/common/SparkBatchJob.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,12 +387,18 @@ public Observable<SimpleImmutableEntry<String, Long>> getDriverLog(@NotNull Stri
387387
return Observable.empty();
388388
}
389389

390-
return Observable.just(new SimpleImmutableEntry<>(JobUtils.getInformationFromYarnLogDom(
390+
String logGot = JobUtils.getInformationFromYarnLogDom(
391391
getSubmission().getCredentialsProvider(),
392392
getCurrentLogUrl(),
393393
type,
394394
offset,
395-
size), offset));
395+
size);
396+
397+
if (StringUtils.isEmpty(logGot)) {
398+
return Observable.empty();
399+
}
400+
401+
return Observable.just(new SimpleImmutableEntry<>(logGot, offset));
396402
});
397403
}
398404

Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/spark/run/SparkJobLogInputStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ISparkBatchJob attachJob(@NotNull ISparkBatchJob sparkJob) {
6464
private synchronized Optional<SimpleImmutableEntry<String, Long>> fetchLog(long logOffset, int fetchSize) {
6565
return getAttachedJob()
6666
.map(job -> job.getDriverLog(getLogType(), logOffset, fetchSize)
67-
.toBlocking().singleOrDefault(new SimpleImmutableEntry<>("", logOffset)));
67+
.toBlocking().singleOrDefault(null));
6868
}
6969

7070
void setSparkBatchJob(@Nullable ISparkBatchJob sparkBatchJob) {

0 commit comments

Comments
 (0)