Skip to content

Commit

Permalink
Adds new Spark versions 2.1.1 and 2.2.0
Browse files Browse the repository at this point in the history
Note that version 2.2.0 does not have a version for hadoop 2.4,
thus, we use the version for hadoop 2.7.
On cluster tests, it successfully ran on hadoop 2.4
  • Loading branch information
akunft committed Aug 4, 2017
1 parent 413146e commit 8d7ae0f
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 0 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Peel offers the following features for your experiments.
| Spark | 2.0.1 | `spark-2.0.1` |
| Spark | 2.0.2 | `spark-2.0.2` |
| Spark | 2.1.0 | `spark-2.1.0` |
| Spark | 2.1.1 | `spark-2.1.1` |
| Spark | 2.2.0 | `spark-2.2.0` |
| Zookeeper | 3.4.5 | `zookeeper-3.4.5` |
| Dstat | 0.7.2 | `dstat-0.7.2` |
| Dstat | 0.7.3 | `dstat-0.7.3` |
Expand Down
20 changes: 20 additions & 0 deletions peel-extensions/src/main/resources/reference.spark-2.1.1.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# include common spark configuration
include "reference.spark.conf"

system {
spark {
path {
archive.url = "http://archive.apache.org/dist/spark/spark-2.1.1/spark-2.1.1-bin-hadoop2.4.tgz"
archive.md5 = "7219c856c889e5f90fe1dd698e71069c"
archive.src = ${app.path.downloads}"/spark-2.1.1-bin-hadoop2.4.tgz"
home = ${system.spark.path.archive.dst}"/spark-2.1.1-bin-hadoop2.4"
}
config {
# spark-env.sh entries
env {
# directory where process IDs are stored
SPARK_PID_DIR = "/tmp/spark-2.1.1-pid"
}
}
}
}
20 changes: 20 additions & 0 deletions peel-extensions/src/main/resources/reference.spark-2.2.0.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# include common spark configuration
include "reference.spark.conf"

system {
spark {
path {
archive.url = "http://archive.apache.org/dist/spark/spark-2.2.0/spark-2.2.0-bin-hadoop2.7.tgz"
archive.md5 = "1715b661bdf33b40c98b3daa7837f690"
archive.src = ${app.path.downloads}"/spark-2.2.0-bin-hadoop2.7.tgz"
home = ${system.spark.path.archive.dst}"/spark-2.2.0-bin-hadoop2.7"
}
config {
# spark-env.sh entries
env {
# directory where process IDs are stored
SPARK_PID_DIR = "/tmp/spark-2.2.0-pid"
}
}
}
}
16 changes: 16 additions & 0 deletions peel-extensions/src/main/scala/org/peelframework/extensions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,22 @@ class extensions extends ApplicationContextAware {
mc = ctx.getBean(classOf[Mustache.Compiler])
)

@Bean(name = Array("spark-2.1.1"))
def `spark-2.1.1`: Spark = new Spark(
version = "2.1.1",
configKey = "spark",
lifespan = Lifespan.EXPERIMENT,
mc = ctx.getBean(classOf[Mustache.Compiler])
)

@Bean(name = Array("spark-2.2.0"))
def `spark-2.2.0`: Spark = new Spark(
version = "2.2.0",
configKey = "spark",
lifespan = Lifespan.EXPERIMENT,
mc = ctx.getBean(classOf[Mustache.Compiler])
)

// DStat

@Bean(name = Array("dstat-0.7.2"))
Expand Down

0 comments on commit 8d7ae0f

Please sign in to comment.