beam-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Work logged] (BEAM-3875) Update Spark runner to Spark version 2.3.0
Date Wed, 04 Apr 2018 11:57:00 GMT

     [ https://issues.apache.org/jira/browse/BEAM-3875?focusedWorklogId=87511&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-87511
]

ASF GitHub Bot logged work on BEAM-3875:
----------------------------------------

                Author: ASF GitHub Bot
            Created on: 04/Apr/18 11:56
            Start Date: 04/Apr/18 11:56
    Worklog Time Spent: 10m 
      Work Description: jbonofre closed pull request #4893: [BEAM-3875] Update Spark runner
to use Spark version 2.3.0
URL: https://github.com/apache/beam/pull/4893
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/build_rules.gradle b/build_rules.gradle
index 2db3fe37ed4..77a794ca1c2 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -138,7 +138,7 @@ def grpc_google_common_protos = "0.1.9"
 def hamcrest_version = "1.3"
 def hadoop_version = "2.7.3"
 def jackson_version = "2.8.9"
-def spark_version = "2.2.1"
+def spark_version = "2.3.0"
 def pubsub_grpc_version = "0.1.18"
 def apex_core_version = "3.6.0"
 def apex_malhar_version = "3.4.0"
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 8d2bae3f658..b705f9e285f 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -112,7 +112,7 @@
       <id>spark-runner</id>
       <properties>
         <!-- Spark uses a different netty version than Beam's. -->
-        <netty.version>4.0.43.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
       </properties>
       <dependencies>
         <dependency>
diff --git a/pom.xml b/pom.xml
index 135be3737bb..a93b72f1fba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
     <pubsub.version>v1-rev10-1.22.0</pubsub.version>
     <slf4j.version>1.7.25</slf4j.version>
     <spanner.version>0.20.0b-beta</spanner.version>
-    <spark.version>2.2.1</spark.version>
+    <spark.version>2.3.0</spark.version>
     <spring.version>4.3.5.RELEASE</spring.version>
     <stax2.version>3.1.4</stax2.version>
     <storage.version>v1-rev71-1.22.0</storage.version>
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/package-info.java
b/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/package-info.java
deleted file mode 100644
index f19f6353600..00000000000
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/aggregators/metrics/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Defines classes for integrating with Spark's metrics mechanism (Sinks, Sources, etc.).
- */
-package org.apache.beam.runners.spark.aggregators.metrics;
diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TranslationUtils.java
b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TranslationUtils.java
index 42b690c3dda..ba0ba5625d4 100644
--- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TranslationUtils.java
+++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TranslationUtils.java
@@ -385,11 +385,9 @@ public static void rejectStateAndTimers(DoFn<?, ?> doFn) {
   /**
    * checking if we can avoid Serialization - relevant to RDDs. DStreams are memory ser in
spark.
    * @param level StorageLevel required
-   * @return
+   * @return true if the level is memory only
    */
   public static boolean avoidRddSerialization(StorageLevel level) {
     return level.equals(StorageLevel.MEMORY_ONLY()) || level.equals(StorageLevel.MEMORY_ONLY_2());
   }
-
-
 }
diff --git a/sdks/java/io/hadoop-input-format/pom.xml b/sdks/java/io/hadoop-input-format/pom.xml
index 1907deb9144..1fba06d303f 100644
--- a/sdks/java/io/hadoop-input-format/pom.xml
+++ b/sdks/java/io/hadoop-input-format/pom.xml
@@ -69,7 +69,7 @@
     <profile>
       <id>spark-runner</id>
       <properties>
-        <netty.version>4.0.43.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
       </properties>
       <dependencies>
         <dependency>
diff --git a/sdks/java/io/jdbc/pom.xml b/sdks/java/io/jdbc/pom.xml
index 577d4f55a74..c79d8cbb7be 100644
--- a/sdks/java/io/jdbc/pom.xml
+++ b/sdks/java/io/jdbc/pom.xml
@@ -41,7 +41,7 @@
     <profile>
       <id>spark-runner</id>
       <properties>
-        <netty.version>4.0.43.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
       </properties>
       <dependencies>
         <dependency>
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index e7146168983..4ccedca5bbf 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -244,7 +244,7 @@
       <!-- Makes the SparkRunner available when running a pipeline. Additionally,
            overrides some Spark dependencies to Beam-compatible versions. -->
       <properties>
-        <netty.version>4.0.43.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
       </properties>
       <dependencies>
         <dependency>
diff --git a/sdks/java/nexmark/pom.xml b/sdks/java/nexmark/pom.xml
index cc0b21512f9..613ddc70a58 100644
--- a/sdks/java/nexmark/pom.xml
+++ b/sdks/java/nexmark/pom.xml
@@ -75,7 +75,7 @@
       <id>spark-runner</id>
       <properties>
         <!-- Spark uses a different netty version than Beam's. -->
-        <netty.version>4.0.43.Final</netty.version>
+        <netty.version>4.1.17.Final</netty.version>
       </properties>
       <dependencies>
         <dependency>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Issue Time Tracking
-------------------

    Worklog Id:     (was: 87511)
    Time Spent: 3h 10m  (was: 3h)

> Update Spark runner to Spark version 2.3.0
> ------------------------------------------
>
>                 Key: BEAM-3875
>                 URL: https://issues.apache.org/jira/browse/BEAM-3875
>             Project: Beam
>          Issue Type: Improvement
>          Components: runner-spark
>            Reporter: Ismaël Mejía
>            Assignee: Ismaël Mejía
>            Priority: Minor
>             Fix For: 2.5.0
>
>          Time Spent: 3h 10m
>  Remaining Estimate: 0h
>
> Spark 2.3.0 was released in Feb 2018 and apart of the usual fixes, it has early support
to run jobs on Kubernetes, a new data source API and early support for continuous processing.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message