PIG-5415: [spark] TestScriptLanguage conflict between multiple SparkC…

…ontext (after spark2.4 upgrade) (knoguchi)

git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1896928 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -104,6 +104,8 @@ OPTIMIZATIONS
 
 BUG FIXES
 
+PIG-5415: [spark] TestScriptLanguage conflict between multiple SparkContext (after spark2.4 upgrade) (knoguchi)
+
 PIG-5412: testSkewedJoinOuter spark unit-test failing with ClassNotFoundException (knoguchi)
 
 PIG-5404: FLATTEN infers wrong datatype (knoguchi)

build.xml

@@ -281,7 +281,7 @@
               value="${mvnrepo}/org/codehaus/jackson/jackson-core-asl/${jackson-pig-3039-test.version}/jackson-core-asl-${jackson-pig-3039-test.version}.jar"/>
     <property name="jackson_mapper_repo_url"
               value="${mvnrepo}/org/codehaus/jackson/jackson-mapper-asl/${jackson-pig-3039-test.version}/jackson-mapper-asl-${jackson-pig-3039-test.version}.jar"/>
-    <property name="test.spark.spark_master" value="yarn-client" />
+    <property name="test.spark.spark_master" value="yarn" />
 
     <!--this is the naming policy for artifacts we want pulled down-->
     <property name="ivy.artifact.retrieve.pattern" value="${ant.project.name}/[artifact]-[revision](-[classifier]).[ext]"/>

src/org/apache/pig/backend/hadoop/executionengine/spark/SparkLauncher.java

@@ -572,7 +572,7 @@ private static synchronized void startSparkIfNeeded(JobConf jobConf, PigContext
         }
         if (sparkContext == null) {
             String sparkHome = System.getenv("SPARK_HOME");
-            if (!master.startsWith("local") && !master.equals("yarn-client")) {
+            if (!master.startsWith("local") && !master.equals("yarn")) {
                 // Check that we have the Mesos native library and Spark home
                 // are set
                 if (sparkHome == null) {