From faaa04944677ed33ed0268bebc9e24293f0ef75f Mon Sep 17 00:00:00 2001
From: ideal <yezhixinghai@gmail.com>
Date: Sun, 26 Jul 2020 13:18:36 +0800
Subject: [PATCH] fic spark job submit

---
 sylph-dist/src/data/data.db                   | Bin 77824 -> 77824 bytes
 .../spark/yarn/SylphSparkYarnClient.java      |   3 ++-
 sylph-yarn/build.gradle                       |   4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sylph-dist/src/data/data.db b/sylph-dist/src/data/data.db
index fa564f96ccc223584b822a23ae006c1a6cad44ba..0e0132bd5e888e858c235dc49a4766e44f214000 100644
GIT binary patch
delta 126
zcmV-^0D=F2-~@o+1dtm6ACVkG0UxnorY{KN01I;j0RZEXfz$~Dh8qP504a$hv*<86
z0h5$G8<RdV9g`ibL9?AQXMF|$5C8xV>9Y#3#}6+6001vZ6$N2%aBOK~VRUJ4ZeKAq
gHZn2*000*k7X>jiGB-19Z)0I>0dt9jqAjApaIJJEbN~PV

delta 104
zcmV-u0GI!O-~@o+1dtm68<8AC0UNPkrY{KK01I;j0RZ5Ufzq?zoFN0V0W<@A1_2Mz
z01wf#3b4lyFD(TH07(@EVQ_G4X=7n@X>V>{F*P<aGBP+dIWsggH(xL?Ffw^za&7@@
Kyc<)qqQG$Wp&`%!

diff --git a/sylph-runners/spark/src/main/java/ideal/sylph/runner/spark/yarn/SylphSparkYarnClient.java b/sylph-runners/spark/src/main/java/ideal/sylph/runner/spark/yarn/SylphSparkYarnClient.java
index d9af5e542..6804d3c45 100644
--- a/sylph-runners/spark/src/main/java/ideal/sylph/runner/spark/yarn/SylphSparkYarnClient.java
+++ b/sylph-runners/spark/src/main/java/ideal/sylph/runner/spark/yarn/SylphSparkYarnClient.java
@@ -40,7 +40,8 @@ public SylphSparkYarnClient(ClientArguments clientArgs, SparkConf sparkConf, Yar
         this.yarnQueue = yarnQueue;
 
         //String key = DRIVER_MEMORY; //test
-        Field field = Client.class.getDeclaredField("org$apache$spark$deploy$yarn$Client$$hadoopConf");
+        //Field field = Client.class.getDeclaredField("org$apache$spark$deploy$yarn$Client$$hadoopConf"); //scala 2.11
+        Field field = Client.class.getDeclaredField("hadoopConf");    //scala 2.12
         field.setAccessible(true);
         YarnConfiguration yarnConfiguration = new YarnConfiguration(yarnClient.getConfig());
         field.set(this, yarnConfiguration);
diff --git a/sylph-yarn/build.gradle b/sylph-yarn/build.gradle
index ce4b5df8b..0d0cf08cc 100644
--- a/sylph-yarn/build.gradle
+++ b/sylph-yarn/build.gradle
@@ -1,3 +1,7 @@
+configurations.all {
+  resolutionStrategy { preferProjectModules() }
+}
+
 dependencies {
   // conflict was found between the following modules:
   compileOnly group: 'org.apache.hadoop', name: 'hadoop-client', version: deps.hadoop