spark git commit: [SPARK-16018][SHUFFLE] Shade netty to load shuffle jar in Nodemanger

2016-06-17 Thread tgraves 
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 269b715e4 -> 3457497e0


[SPARK-16018][SHUFFLE] Shade netty to load shuffle jar in Nodemanger

## What changes were proposed in this pull request?
Shade the netty.io namespace so that we can use it in shuffle independent of 
the dependencies being pulled by hadoop jars.

## How was this patch tested?
Ran a decent job involving shuffle write/read and tested the new 
spark-x-yarn-shuffle jar. After shading netty.io namespace, the nodemanager 
loads and shuffle job completes successfully.

Author: Dhruve Ashar 

Closes #13739 from dhruve/bug/SPARK-16018.

(cherry picked from commit 298c4ae81520b6b39230a6b0bf733c2b7caea627)
Signed-off-by: Tom Graves 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3457497e
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3457497e
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3457497e

Branch: refs/heads/branch-2.0
Commit: 3457497e0257cd2ce8d87cccf258a5abe2339eb9
Parents: 269b715
Author: Dhruve Ashar 
Authored: Fri Jun 17 15:44:33 2016 -0500
Committer: Tom Graves 
Committed: Fri Jun 17 15:44:58 2016 -0500

--
 common/network-yarn/pom.xml | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/3457497e/common/network-yarn/pom.xml
--
diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 1fd3af2..3b7ffe8 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -96,6 +96,13 @@
 com.fasterxml.jackson.**
   
 
+
+  io.netty
+  
${spark.shade.packageName}.io.netty
+  
+io.netty.**
+  
+
   
 
 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [SPARK-16018][SHUFFLE] Shade netty to load shuffle jar in Nodemanger

2016-06-17 Thread tgraves 
Repository: spark
Updated Branches:
  refs/heads/master c8809db5a -> 298c4ae81


[SPARK-16018][SHUFFLE] Shade netty to load shuffle jar in Nodemanger

## What changes were proposed in this pull request?
Shade the netty.io namespace so that we can use it in shuffle independent of 
the dependencies being pulled by hadoop jars.

## How was this patch tested?
Ran a decent job involving shuffle write/read and tested the new 
spark-x-yarn-shuffle jar. After shading netty.io namespace, the nodemanager 
loads and shuffle job completes successfully.

Author: Dhruve Ashar 

Closes #13739 from dhruve/bug/SPARK-16018.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/298c4ae8
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/298c4ae8
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/298c4ae8

Branch: refs/heads/master
Commit: 298c4ae81520b6b39230a6b0bf733c2b7caea627
Parents: c8809db
Author: Dhruve Ashar 
Authored: Fri Jun 17 15:44:33 2016 -0500
Committer: Tom Graves 
Committed: Fri Jun 17 15:44:33 2016 -0500

--
 common/network-yarn/pom.xml | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/298c4ae8/common/network-yarn/pom.xml
--
diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index 1fd3af2..3b7ffe8 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -96,6 +96,13 @@
 com.fasterxml.jackson.**
   
 
+
+  io.netty
+  
${spark.shade.packageName}.io.netty
+  
+io.netty.**
+  
+
   
 
 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org