You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2021/01/16 05:13:30 UTC

[spark] branch master updated: [SPARK-34110][BUILD] Upgrade Zookeeper to 3.6.2

This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/master by this push:
     new d6906b3  [SPARK-34110][BUILD] Upgrade Zookeeper to 3.6.2
d6906b3 is described below

commit d6906b3b767427b83a25a8ee5a387c756bd5ab06
Author: Yuming Wang <yu...@ebay.com>
AuthorDate: Fri Jan 15 21:12:41 2021 -0800

    [SPARK-34110][BUILD] Upgrade Zookeeper to 3.6.2
    
    ### What changes were proposed in this pull request?
    
    This PR upgrade Zookeeper to 3.6.2.
    
    ### Why are the changes needed?
    
    To make Spark running on jdk 14, otherwise:
    ```
    21/01/13 20:25:32,533 WARN [Driver-SendThread(apache-spark-zk-3.vip.hadoop.com:2181)] zookeeper.ClientCnxn:1164 : Session 0x0 for server apache-spark-zk-3.vip.hadoop.com/<unresolved>:2181, unexpected error, closing socket connection and attempting reconnect
    java.lang.IllegalArgumentException: Unable to canonicalize address apache-spark-zk-3.vip.hadoop.com/<unresolved>:2181 because it's not resolvable
    	at org.apache.zookeeper.SaslServerPrincipal.getServerPrincipal(SaslServerPrincipal.java:65)
    	at org.apache.zookeeper.SaslServerPrincipal.getServerPrincipal(SaslServerPrincipal.java:41)
    	at org.apache.zookeeper.ClientCnxn$SendThread.startConnect(ClientCnxn.java:1001)
    	at org.apache.zookeeper.ClientCnxn$SendThread.run(ClientCnxn.java:1060)
    ```
    
    Please see [ZOOKEEPER-3779](https://issues.apache.org/jira/browse/ZOOKEEPER-3779) for more details.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Manual test:
    1. Replace zookeeper-3.4.14.jar with zookeeper-3.6.2.jar and zookeeper-jute-3.6.2.jar
    2. Run Spark on jdk 14. Hadoop 2.7 with HADOOP-12760, Hive 1.2.1 and Zookeeper server version is 3.4.6.
        Some key configurations:
        ```
        # spark-defaults.conf
        spark.yarn.appMasterEnv.JAVA_HOME              /apache/releases/jdk-14.0.2
        spark.executorEnv.JAVA_HOME                    /apache/releases/jdk-14.0.2
        # spark-env.sh
        export JAVA_HOME=/apache/releases/jdk-14.0.2
        ```
    
    Jenkins Tests
    - Hadoop 3.2: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/134048/testReport
    - Hadoop 2.7: https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/134063/testReport
    
    Closes #31177 from wangyum/SPARK-34110.
    
    Authored-by: Yuming Wang <yu...@ebay.com>
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
 dev/deps/spark-deps-hadoop-2.7-hive-2.3 | 3 ++-
 dev/deps/spark-deps-hadoop-3.2-hive-2.3 | 3 ++-
 pom.xml                                 | 8 ++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-2.7-hive-2.3 b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
index caede04..86d2c3a 100644
--- a/dev/deps/spark-deps-hadoop-2.7-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-2.7-hive-2.3
@@ -240,5 +240,6 @@ xml-apis/1.4.01//xml-apis-1.4.01.jar
 xmlenc/0.52//xmlenc-0.52.jar
 xz/1.5//xz-1.5.jar
 zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
-zookeeper/3.4.14//zookeeper-3.4.14.jar
+zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
+zookeeper/3.6.2//zookeeper-3.6.2.jar
 zstd-jni/1.4.8-1//zstd-jni-1.4.8-1.jar
diff --git a/dev/deps/spark-deps-hadoop-3.2-hive-2.3 b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
index 344d8e5..7d3876c 100644
--- a/dev/deps/spark-deps-hadoop-3.2-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3.2-hive-2.3
@@ -207,5 +207,6 @@ velocity/1.5//velocity-1.5.jar
 xbean-asm7-shaded/4.15//xbean-asm7-shaded-4.15.jar
 xz/1.5//xz-1.5.jar
 zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar
-zookeeper/3.4.14//zookeeper-3.4.14.jar
+zookeeper-jute/3.6.2//zookeeper-jute-3.6.2.jar
+zookeeper/3.6.2//zookeeper-3.6.2.jar
 zstd-jni/1.4.8-1//zstd-jni-1.4.8-1.jar
diff --git a/pom.xml b/pom.xml
index 26b5186..64b09b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
     <hadoop.version>3.2.2</hadoop.version>
     <protobuf.version>2.5.0</protobuf.version>
     <yarn.version>${hadoop.version}</yarn.version>
-    <zookeeper.version>3.4.14</zookeeper.version>
+    <zookeeper.version>3.6.2</zookeeper.version>
     <curator.version>2.13.0</curator.version>
     <hive.group>org.apache.hive</hive.group>
     <hive.classifier>core</hive.classifier>
@@ -1534,7 +1534,11 @@
           </exclusion>
           <exclusion>
             <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
+            <artifactId>netty-handler</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
           </exclusion>
           <exclusion>
             <groupId>com.github.spotbugs</groupId>


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