You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wf...@apache.org on 2014/04/03 22:55:53 UTC
git commit: Fixup paths broken in previous vagrant commit,
reference builds directly in dist dir.
Repository: incubator-aurora
Updated Branches:
refs/heads/master 7845f3b20 -> d65a6f6e4
Fixup paths broken in previous vagrant commit, reference builds directly in dist dir.
Bugs closed: AURORA-299
Reviewed at https://reviews.apache.org/r/20011/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/d65a6f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/d65a6f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/d65a6f6e
Branch: refs/heads/master
Commit: d65a6f6e44716b41d6ca5dea91db506b4a2b1254
Parents: 7845f3b
Author: Bill Farner <wf...@apache.org>
Authored: Thu Apr 3 13:55:48 2014 -0700
Committer: Bill Farner <wf...@apache.org>
Committed: Thu Apr 3 13:55:48 2014 -0700
----------------------------------------------------------------------
examples/vagrant/provision-dev-cluster.sh | 33 +++++++-------------
examples/vagrant/upstart/aurora-scheduler.conf | 12 ++++---
.../upstart/aurora-thermos-observer.conf | 2 +-
3 files changed, 20 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d65a6f6e/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index 7f6000e..ec95543 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -36,8 +36,6 @@ update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
# that want to advertise the hostname to the user, or other components.
hostname 192.168.33.7
-AURORA_VERSION=$(cat /vagrant/.auroraversion | tr '[a-z]' '[A-Z]')
-
function build_all() {
if [ ! -d aurora ]; then
echo Cloning aurora repo
@@ -53,7 +51,7 @@ function build_all() {
git pull
# build scheduler
- ./gradlew distTar
+ ./gradlew installApp
# build clients
./pants src/main/python/apache/aurora/client/bin:aurora_admin
@@ -83,29 +81,24 @@ function install_mesos() {
dpkg --install mesos_0.17.0_amd64.deb
}
-function install_aurora_scheduler() {
- # The bulk of the 'install' was done by the gradle build, the result of which we access
- # through /vagrant. All that's left is to initialize the log replica.
- tar xvf ~/aurora/dist/distributions/aurora-scheduler-$AURORA_VERSION.tar -C /usr/local
+function install_aurora() {
+ # The bulk of the 'install' was done by the build, the result of which we access
+ # through /home/vagrant.
+ DIST_DIR=/home/vagrant/aurora/dist
+ AURORA_HOME=/usr/local/aurora
export LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server
- if mesos-log initialize --path="/usr/local/aurora-scheduler-$AURORA_VERSION/db"; then
+ mkdir -p $AURORA_HOME/scheduler
+ if mesos-log initialize --path="$AURORA_HOME/scheduler/db"; then
echo "Replicated log initialized."
else
echo "Replicated log initialization failed with code $? (likely already initialized)."
fi
unset LD_LIBRARY_PATH
-}
-
-function install_aurora_executors() {
- install -m 755 ~/aurora/dist/gc_executor.pex /usr/local/bin/gc_executor
- install -m 755 ~/aurora/dist/thermos_executor.pex /usr/local/bin/thermos_executor
- install -m 755 ~/aurora/dist/thermos_observer.pex /usr/local/bin/thermos_observer
-}
-function install_aurora_client() {
- install -m 755 /vagrant/dist/aurora_client.pex /usr/local/bin/aurora
- install -m 755 /vagrant/dist/aurora_admin.pex /usr/local/bin/aurora_admin
+ # Ensure clients are in the default PATH.
+ ln -s $DIST_DIR/aurora_client.pex /usr/local/bin/aurora
+ ln -s $DIST_DIR/aurora_admin.pex /usr/local/bin/aurora_admin
mkdir -p /etc/aurora
cat > /etc/aurora/clusters.json <<EOF
@@ -132,7 +125,5 @@ function start_services() {
build_all
install_mesos
-install_aurora_scheduler
-install_aurora_executors
-install_aurora_client
+install_aurora
start_services
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d65a6f6e/examples/vagrant/upstart/aurora-scheduler.conf
----------------------------------------------------------------------
diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf
index 6db8e50..ec9e1b8 100644
--- a/examples/vagrant/upstart/aurora-scheduler.conf
+++ b/examples/vagrant/upstart/aurora-scheduler.conf
@@ -21,11 +21,13 @@ post-stop exec sleep 5
env GLOG_v=0
env LIBPROCESS_PORT=8083
env LIBPROCESS_IP=192.168.33.7
+env AURORA_HOME=/usr/local/aurora
+env DIST_DIR=/home/vagrant/aurora/dist
# Flags that control the behavior of the JVM.
env JAVA_OPTS='-Djava.library.path=/usr/local/lib'
-exec /usr/local/aurora-scheduler-0.5.0-SNAPSHOT/bin/aurora-scheduler \
+exec $DIST_DIR/install/aurora-scheduler/bin/aurora-scheduler \
-cluster_name=example \
-http_port=8081 \
-thrift_port=8082 \
@@ -34,9 +36,9 @@ exec /usr/local/aurora-scheduler-0.5.0-SNAPSHOT/bin/aurora-scheduler \
-mesos_master_address=zk://localhost:2181/mesos/master \
-serverset_path=/aurora/scheduler \
-native_log_zk_group_path=/aurora/replicated-log \
- -native_log_file_path="/usr/local/aurora-scheduler-0.5.0-SNAPSHOT/db" \
- -backup_dir="/usr/local/aurora-scheduler-0.5.0-SNAPSHOT/backups" \
- -thermos_executor_path=/usr/local/bin/thermos_executor \
- -gc_executor_path=/usr/local/bin/gc_executor \
+ -native_log_file_path=$AURORA_HOME/scheduler/db \
+ -backup_dir=$AURORA_HOME/scheduler/backups \
+ -thermos_executor_path=$DIST_DIR/thermos_executor.pex \
+ -gc_executor_path=$DIST_DIR/gc_executor.pex \
-vlog=INFO \
-logtostderr
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/d65a6f6e/examples/vagrant/upstart/aurora-thermos-observer.conf
----------------------------------------------------------------------
diff --git a/examples/vagrant/upstart/aurora-thermos-observer.conf b/examples/vagrant/upstart/aurora-thermos-observer.conf
index 84d58f1..6db85aa 100644
--- a/examples/vagrant/upstart/aurora-thermos-observer.conf
+++ b/examples/vagrant/upstart/aurora-thermos-observer.conf
@@ -17,7 +17,7 @@ start on stopped rc RUNLEVEL=[2345]
respawn
post-stop exec sleep 5
-exec /usr/local/bin/thermos_observer \
+exec /usr/local/aurora/bin/thermos_observer \
--root=/var/run/thermos \
--port=1338 \
--log_to_disk=NONE \