Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit f9f5af4

Browse files
authored
Merge pull request #177 from apache-spark-on-k8s/prep-for-alpha-release
Prep for alpha release
2 parents cd0a083 + 35724a3 commit f9f5af4

File tree

94 files changed

+5542
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+5542
-64
lines changed

.travis.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,22 @@
2525
sudo: required
2626
dist: trusty
2727

28-
# 2. Choose language and target JDKs for parallel builds.
28+
# 2. Choose language, target JDK and env's for parallel builds.
2929
language: java
3030
jdk:
31-
- oraclejdk7
3231
- oraclejdk8
32+
env: # Used by the install section below.
33+
# Configure the unit test build for spark core and kubernetes modules,
34+
# while excluding some flaky unit tests using a regex pattern.
35+
- PHASE=test \
36+
PROFILES="-Pmesos -Pyarn -Phadoop-2.7 -Pkubernetes" \
37+
MODULES="-pl core,resource-managers/kubernetes/core -am" \
38+
ARGS="-Dtest=none -Dsuffixes='^org\.apache\.spark\.(?!ExternalShuffleServiceSuite|SortShuffleSuite$|rdd\.LocalCheckpointSuite$|deploy\.SparkSubmitSuite$|deploy\.StandaloneDynamicAllocationSuite$).*'"
39+
# Configure the full build.
40+
- PHASE=install \
41+
PROFILES="-Pmesos -Pyarn -Phadoop-2.7 -Pkubernetes -Pkinesis-asl -Phive -Phive-thriftserver" \
42+
MODULES="" \
43+
ARGS="-T 4 -q -DskipTests"
3344

3445
# 3. Setup cache directory for SBT and Maven.
3546
cache:
@@ -41,11 +52,12 @@ cache:
4152
notifications:
4253
email: false
4354

44-
# 5. Run maven install before running lint-java.
55+
# 5. Run maven build before running lints.
4556
install:
4657
- export MAVEN_SKIP_RC=1
47-
- build/mvn -T 4 -q -DskipTests -Pmesos -Pyarn -Phadoop-2.3 -Pkinesis-asl -Phive -Phive-thriftserver install
58+
- build/mvn ${PHASE} ${PROFILES} ${MODULES} ${ARGS}
4859

49-
# 6. Run lint-java.
60+
# 6. Run lints.
5061
script:
5162
- dev/lint-java
63+
- dev/lint-scala

README.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
# Apache Spark On Kubernetes
2+
3+
This repository, located at https://github.com/apache-spark-on-k8s/spark, contains a fork of Apache Spark that enables running Spark jobs natively on a Kubernetes cluster.
4+
5+
## What is this?
6+
7+
This is a collaboratively maintained project working on [SPARK-18278](https://issues.apache.org/jira/browse/SPARK-18278). The goal is to bring native support for Spark to use Kubernetes as a cluster manager, in a fully supported way on par with the Spark Standalone, Mesos, and Apache YARN cluster managers.
8+
9+
## Getting Started
10+
11+
- [Usage guide](docs/running-on-kubernetes.md) shows how to run the code
12+
- [Development docs](resource-managers/kubernetes/README.md) shows how to get set up for development
13+
- Code is primarily located in the [resource-managers/kubernetes](resource-managers/kubernetes) folder
14+
15+
## Why does this fork exist?
16+
17+
Adding native integration for a new cluster manager is a large undertaking. If poorly executed, it could introduce bugs into Spark when run on other cluster managers, cause release blockers slowing down the overall Spark project, or require hotfixes which divert attention away from development towards managing additional releases. Any work this deep inside Spark needs to be done carefully to minimize the risk of those negative externalities.
18+
19+
At the same time, an increasing number of people from various companies and organizations desire to work together to natively run Spark on Kubernetes. The group needs a code repository, communication forum, issue tracking, and continuous integration, all in order to work together effectively on an open source product.
20+
21+
We've been asked by an Apache Spark Committer to work outside of the Apache infrastructure for a short period of time to allow this feature to be hardened and improved without creating risk for Apache Spark. The aim is to rapidly bring it to the point where it can be brought into the mainline Apache Spark repository for continued development within the Apache umbrella. If all goes well, this should be a short-lived fork rather than a long-lived one.
22+
23+
## Who are we?
24+
25+
This is a collaborative effort by several folks from different companies who are interested in seeing this feature be successful. Companies active in this project include (alphabetically):
26+
27+
- Google
28+
- Haiwen
29+
- Hyperpilot
30+
- Intel
31+
- Palantir
32+
- Pepperdata
33+
- Red Hat
34+
35+
--------------------
36+
37+
(original README below)
38+
139
# Apache Spark
240

341
Spark is a fast and general cluster computing system for Big Data. It provides

assembly/pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.apache.spark</groupId>
2323
<artifactId>spark-parent_2.11</artifactId>
24-
<version>2.1.0</version>
24+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2525
<relativePath>../pom.xml</relativePath>
2626
</parent>
2727

@@ -148,6 +148,16 @@
148148
</dependency>
149149
</dependencies>
150150
</profile>
151+
<profile>
152+
<id>kubernetes</id>
153+
<dependencies>
154+
<dependency>
155+
<groupId>org.apache.spark</groupId>
156+
<artifactId>spark-kubernetes_${scala.binary.version}</artifactId>
157+
<version>${project.version}</version>
158+
</dependency>
159+
</dependencies>
160+
</profile>
151161
<profile>
152162
<id>hive</id>
153163
<dependencies>

common/network-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-shuffle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/network-yarn/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/sketch/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/tags/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/unsafe/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<groupId>org.apache.spark</groupId>
2424
<artifactId>spark-parent_2.11</artifactId>
25-
<version>2.1.0</version>
25+
<version>2.1.0-k8s-0.1.0-SNAPSHOT</version>
2626
<relativePath>../../pom.xml</relativePath>
2727
</parent>
2828

common/unsafe/src/main/java/org/apache/spark/unsafe/types/CalendarInterval.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ public static long parseSecondNano(String secondNano) throws IllegalArgumentExce
252252
public final int months;
253253
public final long microseconds;
254254

255-
public final long milliseconds() {
255+
public long milliseconds() {
256256
return this.microseconds / MICROS_PER_MILLI;
257257
}
258258

0 commit comments

Comments
 (0)