|
|
@ -121,22 +121,9 @@ public class SparkTask extends AbstractYarnTask { |
|
|
|
protected void setMainJarName() { |
|
|
|
protected void setMainJarName() { |
|
|
|
// main jar
|
|
|
|
// main jar
|
|
|
|
ResourceInfo mainJar = sparkParameters.getMainJar(); |
|
|
|
ResourceInfo mainJar = sparkParameters.getMainJar(); |
|
|
|
|
|
|
|
String resourceName = getResourceNameOfMainJar(mainJar); |
|
|
|
if (null == mainJar) { |
|
|
|
|
|
|
|
throw new RuntimeException("Spark task jar params is null"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int resourceId = mainJar.getId(); |
|
|
|
|
|
|
|
String resourceName; |
|
|
|
|
|
|
|
if (resourceId == 0) { |
|
|
|
|
|
|
|
resourceName = mainJar.getRes(); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
//when update resource maybe has error
|
|
|
|
|
|
|
|
resourceName = mainJar.getResourceName().replaceFirst("/", ""); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
mainJar.setRes(resourceName); |
|
|
|
mainJar.setRes(resourceName); |
|
|
|
sparkParameters.setMainJar(mainJar); |
|
|
|
sparkParameters.setMainJar(mainJar); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
|