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/11/12 19:15:55 UTC

[spark] branch master updated: [SPARK-37302][BUILD] Explicitly downloads guava and jetty-io in test-dependencies.sh

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 01ab0be  [SPARK-37302][BUILD] Explicitly downloads guava and jetty-io in test-dependencies.sh
01ab0be is described below

commit 01ab0bedb2ad423963ebff78272e0d045b0b9107
Author: Kousuke Saruta <sa...@oss.nttdata.com>
AuthorDate: Fri Nov 12 11:14:29 2021 -0800

    [SPARK-37302][BUILD] Explicitly downloads guava and jetty-io in test-dependencies.sh
    
    ### What changes were proposed in this pull request?
    
    This PR change `dev/test-dependencies.sh` to download `guava` and `jetty-io` explicitly.
    
    `dev/run-tests.py` fails if Scala 2.13 is used and `guava` or `jetty-io` is not in the both of Maven and Coursier local repository.
    
    ```
    $ rm -rf ~/.m2/repository/*
    $ # For Linux
    $ rm -rf ~/.cache/coursier/v1/*
    $ # For macOS
    $ rm -rf ~/Library/Caches/Coursier/v1/*
    $ dev/change-scala-version.sh 2.13
    $ dev/test-dependencies.sh
    $ build/sbt -Pscala-2.13 clean compile
    ...
    [error] /home/kou/work/oss/spark-scala-2.13/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java:24:1:  error: package com.google.common.primitives does not exist
    [error] import com.google.common.primitives.Ints;
    [error]                                    ^
    [error] /home/kou/work/oss/spark-scala-2.13/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java:30:1:  error: package com.google.common.annotations does not exist
    [error] import com.google.common.annotations.VisibleForTesting;
    [error]                                     ^
    [error] /home/kou/work/oss/spark-scala-2.13/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java:31:1:  error: package com.google.common.base does not exist
    [error] import com.google.common.base.Preconditions;
    ...
    ```
    ```
    [error] /home/kou/work/oss/spark-scala-2.13/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala:87:25: Class org.eclipse.jetty.io.ByteBufferPool not found - continuing with a stub.
    [error]     val connector = new ServerConnector(
    [error]                         ^
    [error] /home/kou/work/oss/spark-scala-2.13/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala:87:21: multiple constructors for ServerConnector with alternatives:
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: java.util.concurrent.Executor,x$3: org.eclipse.jetty.util.thread.Scheduler,x$4: org.eclipse.jetty.io.ByteBufferPool,x$5: Int,x$6: Int,x$7: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: org.eclipse.jetty.util.ssl.SslContextFactory,x$3: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: Int,x$3: Int,x$4: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector
    [error]  cannot be invoked with (org.eclipse.jetty.server.Server, Null, org.eclipse.jetty.util.thread.ScheduledExecutorScheduler, Null, Int, Int, org.eclipse.jetty.server.HttpConnectionFactory)
    [error]     val connector = new ServerConnector(
    [error]                     ^
    [error] /home/kou/work/oss/spark-scala-2.13/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala:207:13: Class org.eclipse.jetty.io.ClientConnectionFactory not found - continuing with a stub.
    [error]         new HttpClient(new HttpClientTransportOverHTTP(numSelectors), null)
    [error]             ^
    [error] /home/kou/work/oss/spark-scala-2.13/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala:287:25: multiple constructors for ServerConnector with alternatives:
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: java.util.concurrent.Executor,x$3: org.eclipse.jetty.util.thread.Scheduler,x$4: org.eclipse.jetty.io.ByteBufferPool,x$5: Int,x$6: Int,x$7: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: org.eclipse.jetty.util.ssl.SslContextFactory,x$3: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector <and>
    [error]   (x$1: org.eclipse.jetty.server.Server,x$2: Int,x$3: Int,x$4: org.eclipse.jetty.server.ConnectionFactory*)org.eclipse.jetty.server.ServerConnector
    [error]  cannot be invoked with (org.eclipse.jetty.server.Server, Null, org.eclipse.jetty.util.thread.ScheduledExecutorScheduler, Null, Int, Int, org.eclipse.jetty.server.ConnectionFactory)
    [error]         val connector = new ServerConnector(
    ```
    
    The reason is that `exec-maven-plugin` used in `test-dependencies.sh` downloads pom of guava and jetty-io but doesn't downloads the corresponding jars, and skip dependency testing if Scala 2.13 is used (if dependency testing runs, Maven downloads those jars).
    
    ```
    if [[ "$SCALA_BINARY_VERSION" != "2.12" ]]; then
      # TODO(SPARK-36168) Support Scala 2.13 in dev/test-dependencies.sh
      echo "Skip dependency testing on $SCALA_BINARY_VERSION"
      exit 0
    fi
    ```
    
    ```
    $ find ~/.m2 -name "guava*"
    ...
    /home/kou/.m2/repository/com/google/guava/guava/14.0.1/guava-14.0.1.pom
    /home/kou/.m2/repository/com/google/guava/guava/14.0.1/guava-14.0.1.pom.sha1
    ...
    /home/kou/.m2/repository/com/google/guava/guava-parent/14.0.1/guava-parent-14.0.1.pom
    /home/kou/.m2/repository/com/google/guava/guava-parent/14.0.1/guava-parent-14.0.1.pom.sha1
    ...
    
    $ find ~/.m2 -name "jetty*"
    ...
    /home/kou/.m2/repository/org/eclipse/jetty/jetty-io/9.4.43.v20210629/jetty-io-9.4.43.v20210629.pom
    /home/kou/.m2/repository/org/eclipse/jetty/jetty-io/9.4.43.v20210629/jetty-io-9.4.43.v20210629.pom.sha1
    ...
    ```
    
    Under the circumstances, building Spark using SBT fails.
    `run-tests.py` builds Spark using SBT after the dependency testing so `run-tests.py` fails with Scala 2.13.
    
    Further, I noticed that this issue can even happen with Sala 2.12 if the script exit at the following part.
    ```
    OLD_VERSION=$($MVN -q \
        -Dexec.executable="echo" \
        -Dexec.args='${project.version}' \
        --non-recursive \
        org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+\.[0-9]+')
    if [ $? != 0 ]; then
        echo -e "Error while getting version string from Maven:\n$OLD_VERSION"
        exit 1
    fi
    ```
    
    This phenomenon is similar to SPARK-34762 (#31862).
    So the fix is to get guava and jetty-io explicitly by `mvn dependency:get`.
    
    ### Why are the changes needed?
    
    To keep the Maven local repository sanity. Then, we can avoid such confusable build error.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Confirmed that we can successfully compile code with the following commands.
    ```
    rm -rf ~/.m2/repository/*
    # For Linux
    rm -rf ~/.cache/coursier/v1/*
    # For macOS
    rm -rf ~/Library/Caches/Coursier/v1/*
    dev/change-scala-version.sh 2.13
    dev/test-dependencies.sh
    ./build/sbt -Pyarn -Pmesos -Pkubernetes -Phive -Phive-thriftserver -Phadoop-cloud -Pkinesis-asl -Pdocker-integration-tests -Pkubernetes-integration-tests -Pspark-ganglia-lgpl -Pscala-2.13 compile test:compile
    ```
    
    Closes #34570 from sarutak/fix-test-dependencies-issue.
    
    Authored-by: Kousuke Saruta <sa...@oss.nttdata.com>
    Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
 dev/test-dependencies.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev/test-dependencies.sh b/dev/test-dependencies.sh
index f0aaf25..156a0d3 100755
--- a/dev/test-dependencies.sh
+++ b/dev/test-dependencies.sh
@@ -49,6 +49,11 @@ OLD_VERSION=$($MVN -q \
     -Dexec.args='${project.version}' \
     --non-recursive \
     org.codehaus.mojo:exec-maven-plugin:1.6.0:exec | grep -E '[0-9]+\.[0-9]+\.[0-9]+')
+# dependency:get for guava and jetty-io are workaround for SPARK-37302.
+GUAVA_VERSION=`build/mvn help:evaluate -Dexpression=guava.version -q -DforceStdout`
+build/mvn dependency:get -Dartifact=com.google.guava:guava:${GUAVA_VERSION} -q
+JETTY_VERSION=`build/mvn help:evaluate -Dexpression=jetty.version -q -DforceStdout`
+build/mvn dependency:get -Dartifact=org.eclipse.jetty:jetty-io:${JETTY_VERSION} -q
 if [ $? != 0 ]; then
     echo -e "Error while getting version string from Maven:\n$OLD_VERSION"
     exit 1

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