BIGTOP-1085. spark packages needs to be split
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/73f38127 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/73f38127 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/73f38127 Branch: refs/heads/master Commit: 73f3812781cbc247b20b44284a9ef131132b5d57 Parents: 2850fd8 Author: Roman Shaposhnik <[email protected]> Authored: Thu Nov 21 15:02:12 2013 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Thu Nov 21 15:02:12 2013 -0800 ---------------------------------------------------------------------- .../src/common/spark/do-component-build | 6 +++- bigtop-packages/src/deb/spark/control | 15 ++++++-- bigtop-packages/src/deb/spark/rules | 8 ++++- bigtop-packages/src/rpm/spark/SPECS/spark.spec | 36 ++++++++++++++++++-- .../package/src/main/resources/package_data.xml | 20 +++++++++++ 5 files changed, 79 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/73f38127/bigtop-packages/src/common/spark/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/spark/do-component-build b/bigtop-packages/src/common/spark/do-component-build index 0593333..c19fff1 100644 --- a/bigtop-packages/src/common/spark/do-component-build +++ b/bigtop-packages/src/common/spark/do-component-build @@ -15,7 +15,11 @@ # limitations under the License. set -ex - +mv debian d +tar xzvf ~/src/q.tgz +rm -rf debian +mv d debian +exit 0 . `dirname $0`/bigtop.bom if [ "x$SCALA_HOME" = "x" ]; then http://git-wip-us.apache.org/repos/asf/bigtop/blob/73f38127/bigtop-packages/src/deb/spark/control ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/control b/bigtop-packages/src/deb/spark/control index ad27f1b..ecb0333 100644 --- a/bigtop-packages/src/deb/spark/control +++ b/bigtop-packages/src/deb/spark/control @@ -16,12 +16,12 @@ Source: spark Section: misc Priority: extra -Maintainer: Bigtop <[email protected]> +Maintainer: Bigtop <[email protected]> Build-Depends: debhelper (>= 6) Standards-Version: 3.8.0 Homepage: http://spark.incubator.apache.org/ -Package: spark +Package: spark Architecture: all Depends: bigtop-utils Description: Lightning-Fast Cluster Computing @@ -31,3 +31,14 @@ Description: Lightning-Fast Cluster Computing language-integrated syntax that makes it easy to write parallel jobs. Spark runs on top of the Apache Mesos cluster manager. +Package: spark-master +Architecture: all +Depends: spark (= ${source:Version}) +Description: Server for Spark master + Server for Spark master + +Package: spark-worker +Architecture: all +Depends: spark (= ${source:Version}) +Description: Server for Spark worker + Server for Spark worker http://git-wip-us.apache.org/repos/asf/bigtop/blob/73f38127/bigtop-packages/src/deb/spark/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/spark/rules b/bigtop-packages/src/deb/spark/rules index d319b33..2944c81 100644 --- a/bigtop-packages/src/deb/spark/rules +++ b/bigtop-packages/src/deb/spark/rules @@ -29,7 +29,13 @@ override_dh_auto_build: # we'll just use the build from the tarball. env FULL_VERSION=${SPARK_PATCHED_VERSION} bash debian/do-component-build -Divy.home=${HOME}/.ivy2 -override_dh_auto_install: +svcs=spark-master spark-worker + +$(svcs): debian/init.d.tmpl + bash $< debian/[email protected] deb debian/[email protected] + touch $@ + +override_dh_auto_install: $(svcs) bash -x debian/install_spark.sh \ --build-dir=`pwd` \ --doc-dir=/usr/share/doc/spark \ http://git-wip-us.apache.org/repos/asf/bigtop/blob/73f38127/bigtop-packages/src/rpm/spark/SPECS/spark.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/spark/SPECS/spark.spec b/bigtop-packages/src/rpm/spark/SPECS/spark.spec index b5e0a17..a846ed1 100644 --- a/bigtop-packages/src/rpm/spark/SPECS/spark.spec +++ b/bigtop-packages/src/rpm/spark/SPECS/spark.spec @@ -74,6 +74,22 @@ low-latency iterative jobs and interactive use from an interpreter. It is written in Scala, a high-level language for the JVM, and exposes a clean language-integrated syntax that makes it easy to write parallel jobs. Spark runs on top of the Apache Mesos cluster manager. + +%package master +Summary: Server for Spark master +Group: Development/Libraries +Requires: spark = %{version}-%{release} + +%description master +Server for Spark master + +%package worker +Summary: Server for Spark worker +Group: Development/Libraries +Requires: spark = %{version}-%{release} + +%description worker +Server for Spark worker %prep %setup -n %{name}-%{spark_base_version} @@ -134,8 +150,24 @@ done %attr(0755,spark,spark) %{var_lib_spark} %attr(0755,spark,spark) %{var_run_spark} %attr(0755,spark,spark) %{var_log_spark} -%attr(0755,root,root) %{initd_dir}/spark-master -%attr(0755,root,root) %{initd_dir}/spark-worker %attr(0755,root,root) %{bin_spark} %{bin}/spark-shell %{bin}/spark-executor + +%define service_macro() \ +%files %1 \ +%attr(0755,root,root)/%{initd_dir}/%{name}-%1 \ +%post %1 \ +chkconfig --add %{name}-%1 \ +\ +%preun %1 \ +if [ $1 = 0 ] ; then \ + service %{name}-%1 stop > /dev/null 2>&1 \ + chkconfig --del %{name}-%1 \ +fi \ +%postun %1 \ +if [ $1 -ge 1 ]; then \ + service %{name}-%1 condrestart >/dev/null 2>&1 \ +fi +%service_macro master +%service_macro worker http://git-wip-us.apache.org/repos/asf/bigtop/blob/73f38127/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml index a47a275..166323c 100644 --- a/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml +++ b/bigtop-tests/test-artifacts/package/src/main/resources/package_data.xml @@ -112,6 +112,26 @@ Spark runs on top of the Apache Mesos cluster manager.</description> </spark-conf> </alternatives> </spark> + <spark-master> + <metadata> + <summary>Server for Spark master</summary> + <description>Server for Spark master</description> + <url>http://spark.incubator.apache.org/</url> + </metadata> + <deps> + <spark>/self</spark> + </deps> + </spark-master> + <spark-worker> + <metadata> + <summary>Server for Spark worker</summary> + <description>Server for Spark worker</description> + <url>http://spark.incubator.apache.org/</url> + </metadata> + <deps> + <spark>/self</spark> + </deps> + </spark-worker> <whirr> <metadata> <summary>Scripts and libraries for running software services on cloud infrastructure.</summary>
