You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by ke...@apache.org on 2013/12/12 20:02:57 UTC
git commit: Use binaries for vagrant up.
Updated Branches:
refs/heads/master 0eefbcbb5 -> 5da999254
Use binaries for vagrant up.
This is a significant speedup - we now skip building mesos from source.
Before: Bringing up the devtools took 24 minutes:
vagrant up 36.41s user 4.28s system 2% cpu 24:20.66 total
In this version it takes less than 8 minutes:
vagrant up devtools 31.22s user 3.14s system 7% cpu 7:43.25 total
So now a full new Aurora cluster takes less than 13 min:
vagrant up 102.64s user 12.44s system 15% cpu 12:47.19 total
Testing Done:
vagrant destroy
vagrant up
Verified that job submission and all components work.
Bugs closed: AURORA-8
Reviewed at https://reviews.apache.org/r/16200/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/5da99925
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/5da99925
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/5da99925
Branch: refs/heads/master
Commit: 5da999254dd11d80f2e18b8c29783c10a0d90cc3
Parents: 0eefbcb
Author: Kevin Sweeney <ke...@apache.org>
Authored: Thu Dec 12 11:02:38 2013 -0800
Committer: Kevin Sweeney <ks...@twitter.com>
Committed: Thu Dec 12 11:02:38 2013 -0800
----------------------------------------------------------------------
examples/vagrant/provision-aurora-scheduler.sh | 4 +--
examples/vagrant/provision-dev-environment.sh | 33 ++++-----------------
examples/vagrant/provision-mesos-master.sh | 4 +--
examples/vagrant/provision-mesos-slave.sh | 4 +--
4 files changed, 12 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5da99925/examples/vagrant/provision-aurora-scheduler.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-aurora-scheduler.sh b/examples/vagrant/provision-aurora-scheduler.sh
index 43def01..1b5887a 100755
--- a/examples/vagrant/provision-aurora-scheduler.sh
+++ b/examples/vagrant/provision-aurora-scheduler.sh
@@ -6,8 +6,8 @@ install -m 755 /vagrant/dist/aurora_admin.pex /usr/local/bin/aurora_admin
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-trunk-d20130921_amd64.deb
-dpkg --install mesos_0.15.0-trunk-d20130921_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
+dpkg --install mesos_0.15.0-rc4_amd64.deb
# TODO(ksweeney): Make this a be part of the Aurora distribution tarball.
cat > /usr/local/sbin/aurora-scheduler.sh <<"EOF"
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5da99925/examples/vagrant/provision-dev-environment.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-environment.sh b/examples/vagrant/provision-dev-environment.sh
index 957f93d..5418708 100755
--- a/examples/vagrant/provision-dev-environment.sh
+++ b/examples/vagrant/provision-dev-environment.sh
@@ -1,43 +1,22 @@
-export TAG=0.15.0-rc4
-
apt-get update
apt-get -y install \
git automake libtool g++ java7-runtime-headless curl \
openjdk-7-jdk python-dev libsasl2-dev libcurl4-openssl-dev \
make
-echo Cloning aurora repo
if [ ! -d aurora ]; then
+ echo Cloning aurora repo
git clone /vagrant aurora
fi
pushd aurora
mkdir -p third_party
- git pull
-popd
-
-echo Cloning mesos repo
-
-if [ ! -d mesos ]; then
- git clone https://git-wip-us.apache.org/repos/asf/mesos.git
-fi
-
-if [ ! -f mesos-build/src/python/dist/*.egg ]; then
- pushd mesos
- git checkout $TAG
- sed -i~ "s/\[mesos\], \[.*\]/[mesos], [$TAG]/" configure.ac
- [[ -f ./configure ]] || ./bootstrap
- popd
-
- mkdir -p mesos-build
- pushd mesos-build
- ../mesos/configure
- make -j3
- cp src/python/dist/*.egg ../aurora/third_party
+ pushd third_party
+ wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.egg \
+ -O mesos-0.15.0_rc4-py2.7-linux-x86_64.egg
popd
-fi
+ git pull
-pushd aurora
# build scheduler
./gradlew distTar
@@ -68,4 +47,4 @@ EOF
done
popd
-sudo chown -R vagrant.vagrant mesos mesos-build aurora
+sudo chown -R vagrant:vagrant aurora
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5da99925/examples/vagrant/provision-mesos-master.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-mesos-master.sh b/examples/vagrant/provision-mesos-master.sh
index 9ee047b..0420629 100755
--- a/examples/vagrant/provision-mesos-master.sh
+++ b/examples/vagrant/provision-mesos-master.sh
@@ -1,8 +1,8 @@
#!/bin/bash -x
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-trunk-d20130921_amd64.deb
-dpkg --install mesos_0.15.0-trunk-d20130921_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
+dpkg --install mesos_0.15.0-rc4_amd64.deb
cat > /usr/local/sbin/mesos-master.sh <<EOF
#!/bin/bash
export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/5da99925/examples/vagrant/provision-mesos-slave.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-mesos-slave.sh b/examples/vagrant/provision-mesos-slave.sh
index 7cce033..fc1f46e 100755
--- a/examples/vagrant/provision-mesos-slave.sh
+++ b/examples/vagrant/provision-mesos-slave.sh
@@ -1,8 +1,8 @@
#!/bin/bash -x
apt-get update
apt-get -y install java7-runtime-headless curl
-wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-trunk-d20130921_amd64.deb
-dpkg --install mesos_0.15.0-trunk-d20130921_amd64.deb
+wget -c http://downloads.mesosphere.io/master/ubuntu/12.04/mesos_0.15.0-rc4_amd64.deb
+dpkg --install mesos_0.15.0-rc4_amd64.deb
cat > /usr/local/sbin/mesos-slave.sh <<EOF
#!/bin/bash
export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server