Skip to content

KYLIN-5245 code optimization, a more elegant processing method. #2046

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

Open
wants to merge 1 commit into
base: kylin4
Choose a base branch
from
Open

KYLIN-5245 code optimization, a more elegant processing method. #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 1 addition & 10 deletions ...ylin-spark-engine/src/main/java/org/apache/kylin/engine/spark/application/SparkEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,6 @@

public class SparkEntry {
public static void main(String[] args) {
int retCode = JobWorkSpace.execute(args);
if (retCode == 2) {
System.exit(1);
} else if (System.getProperty("spark.master").equals("yarn") && System.getProperty("spark.submit.deployMode").equals("cluster")) {
if (retCode == 1) {
throw new RuntimeException("Job failed!");
}
} else {
System.exit(retCode);
}
JobWorkSpace.execute(args);
}
}
13 changes: 10 additions & 3 deletions ...project/kylin-spark-engine/src/main/scala/org/apache/spark/application/JobWorkSpace.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,25 @@ import org.apache.spark.internal.Logging
import org.apache.spark.scheduler.KylinJobEventLoop

object JobWorkSpace extends Logging {
def execute(args: Array[String]): Int = {
def execute(args: Array[String]): Unit = {
try {
val (application, appArgs) = resolveArgs(args)
val eventLoop = new KylinJobEventLoop
val worker = new JobWorker(application, appArgs, eventLoop)
val monitor = new JobMonitor(eventLoop)
val workspace = new JobWorkSpace(eventLoop, monitor, worker)
workspace.run()
if (System.getProperty("spark.master").equals("yarn") && System.getProperty("spark.submit.deployMode").equals("cluster")) {
val res = workspace.run()
if (res != 0) {
System.exit(res)
}
} else {
System.exit(workspace.run())
}
} catch {
case throwable: Throwable =>
logError("Error occurred when init job workspace.", throwable)
2
System.exit(1)
}
}

Expand Down