Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94BC717349 for ; Wed, 4 Feb 2015 23:53:15 +0000 (UTC) Received: (qmail 53003 invoked by uid 500); 4 Feb 2015 23:53:16 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 52969 invoked by uid 500); 4 Feb 2015 23:53:16 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 52960 invoked by uid 99); 4 Feb 2015 23:53:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2015 23:53:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_FILL_THIS_FORM_SHORT,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 04 Feb 2015 23:53:14 +0000 Received: (qmail 52824 invoked by uid 99); 4 Feb 2015 23:52:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Feb 2015 23:52:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E770E01DD; Wed, 4 Feb 2015 23:52:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Update mesos lib to 0.21.1 Date: Wed, 4 Feb 2015 23:52:54 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master b49e1a099 -> edcc252ce Update mesos lib to 0.21.1 Bugs closed: AURORA-1080 Reviewed at https://reviews.apache.org/r/30467/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/edcc252c Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/edcc252c Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/edcc252c Branch: refs/heads/master Commit: edcc252cebab432dd692056ff12c5529896e0e65 Parents: b49e1a0 Author: Bill Farner Authored: Wed Feb 4 15:38:43 2015 -0800 Committer: Bill Farner Committed: Wed Feb 4 15:38:43 2015 -0800 ---------------------------------------------------------------------- 3rdparty/python/requirements.txt | 4 ++-- build-support/python/make-mesos-native-egg | 6 ++++++ build.gradle | 2 +- docs/deploying-aurora-scheduler.md | 2 +- examples/vagrant/provision-dev-cluster.sh | 4 +++- examples/vagrant/upstart/aurora-scheduler.conf | 2 +- examples/vagrant/upstart/mesos-master.conf | 2 +- examples/vagrant/upstart/mesos-slave.conf | 2 +- src/test/sh/org/apache/aurora/e2e/http/http_example.aurora | 2 +- .../apache/aurora/e2e/http/http_example_docker_updated.aurora | 2 +- .../sh/org/apache/aurora/e2e/http/http_example_updated.aurora | 2 +- 11 files changed, 19 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/3rdparty/python/requirements.txt ---------------------------------------------------------------------- diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt index 0c88e4c..da600f4 100644 --- a/3rdparty/python/requirements.txt +++ b/3rdparty/python/requirements.txt @@ -1,8 +1,8 @@ bottle==0.11.6 CherryPy==3.6.0 mako==0.4.0 -mesos.interface==0.20.1 -mesos.native==0.20.1 +mesos.interface==0.21.1 +mesos.native==0.21.1 mock==1.0.1 mox==0.5.3 pex==0.8.2 http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/build-support/python/make-mesos-native-egg ---------------------------------------------------------------------- diff --git a/build-support/python/make-mesos-native-egg b/build-support/python/make-mesos-native-egg index 2cba8ed..fce53e4 100755 --- a/build-support/python/make-mesos-native-egg +++ b/build-support/python/make-mesos-native-egg @@ -62,8 +62,10 @@ EOF UBUNTU_TRUSTY64_DEPENDENCIES=( g++-4.8 + libapr1-dev libcurl4-nss-dev libsasl2-dev + libsvn-dev python-dev python-virtualenv zlib1g-dev @@ -87,11 +89,13 @@ EOF } CENTOS6_X86_64_DEPENDENCIES=( + apr-devel cyrus-sasl-devel gcc-c++ libcurl-devel patch python27-python-devel + subversion-devel zlib-devel ) build_centos6() { @@ -118,11 +122,13 @@ EOF } CENTOS7_X86_64_DEPENDENCIES=( + apr-devel cyrus-sasl-devel gcc-c++ libcurl-devel patch python-devel + subversion-devel zlib-devel ) build_centos7() { http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 8cec4a7..b4ab99f 100644 --- a/build.gradle +++ b/build.gradle @@ -254,7 +254,7 @@ dependencies { compile 'javax.servlet:servlet-api:2.5' compile "log4j:log4j:${log4jRev}" compile 'org.antlr:stringtemplate:3.2.1' - compile 'org.apache.mesos:mesos:0.20.1' + compile 'org.apache.mesos:mesos:0.21.1' compile 'org.apache.zookeeper:zookeeper:3.3.4' compile "org.eclipse.jetty:jetty-rewrite:${jettyDep}" compile "org.eclipse.jetty:jetty-server:${jettyDep}" http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/docs/deploying-aurora-scheduler.md ---------------------------------------------------------------------- diff --git a/docs/deploying-aurora-scheduler.md b/docs/deploying-aurora-scheduler.md index 9bf5b5a..d112335 100644 --- a/docs/deploying-aurora-scheduler.md +++ b/docs/deploying-aurora-scheduler.md @@ -34,7 +34,7 @@ machines. This guide helps you get the scheduler set up and troubleshoot some c ## Installing Aurora The Aurora scheduler is a standalone Java server. As part of the build process it creates a bundle of all its dependencies, with the notable exceptions of the JVM and libmesos. Each target server -should have a JVM (Java 7 or higher) and libmesos (0.20.1) installed. +should have a JVM (Java 7 or higher) and libmesos (0.21.1) installed. ### Creating the Distribution .zip File (Optional) To create a distribution for installation you will need build tools installed. On Ubuntu this can be http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/examples/vagrant/provision-dev-cluster.sh ---------------------------------------------------------------------- diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh index fa0de88..0422984 100755 --- a/examples/vagrant/provision-dev-cluster.sh +++ b/examples/vagrant/provision-dev-cluster.sh @@ -19,8 +19,10 @@ apt-get update apt-get -y install \ curl \ git \ + libapr1-dev \ libcurl4-openssl-dev \ libsasl2-dev \ + libsvn-dev \ lxc-docker \ openjdk-7-jdk \ python-dev \ @@ -33,7 +35,7 @@ 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 -MESOS_VERSION=0.20.1 +MESOS_VERSION=0.21.1 function prepare_extras() { pushd aurora http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/examples/vagrant/upstart/aurora-scheduler.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/aurora-scheduler.conf b/examples/vagrant/upstart/aurora-scheduler.conf index b31e735..f85127d 100644 --- a/examples/vagrant/upstart/aurora-scheduler.conf +++ b/examples/vagrant/upstart/aurora-scheduler.conf @@ -23,7 +23,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 -Dlog4j.configuration="file:///etc/zookeeper/conf/log4j.properties"' +env JAVA_OPTS='-Djava.library.path=/usr/lib -Dlog4j.configuration="file:///etc/zookeeper/conf/log4j.properties"' exec $DIST_DIR/install/aurora-scheduler/bin/aurora-scheduler \ -cluster_name=example \ http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/examples/vagrant/upstart/mesos-master.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/mesos-master.conf b/examples/vagrant/upstart/mesos-master.conf index 23d457b..9d7491c 100644 --- a/examples/vagrant/upstart/mesos-master.conf +++ b/examples/vagrant/upstart/mesos-master.conf @@ -19,7 +19,7 @@ env LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server env MY_HOST=192.168.33.7 env ZK_HOST=192.168.33.7 -exec /usr/local/sbin/mesos-master \ +exec /usr/sbin/mesos-master \ --zk=zk://$ZK_HOST:2181/mesos/master \ --ip=$MY_HOST \ --work_dir=/usr/local/aurora/master/db \ http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/examples/vagrant/upstart/mesos-slave.conf ---------------------------------------------------------------------- diff --git a/examples/vagrant/upstart/mesos-slave.conf b/examples/vagrant/upstart/mesos-slave.conf index e00c9fa..2b6a606 100644 --- a/examples/vagrant/upstart/mesos-slave.conf +++ b/examples/vagrant/upstart/mesos-slave.conf @@ -23,7 +23,7 @@ env ZK_HOST=192.168.33.7 # N.B. The value for --work_dir must match the value configured for the slave_root in # examples/vagrant/provision-dev-cluster.sh. C.f. AURORA-680 for the client fix to # obviate that need. -exec /usr/local/sbin/mesos-slave --master=zk://$ZK_HOST:2181/mesos/master \ +exec /usr/sbin/mesos-slave --master=zk://$ZK_HOST:2181/mesos/master \ --ip=$MY_HOST \ --hostname=$MY_HOST \ --attributes="host:$MY_HOST;rack:a" \ http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/src/test/sh/org/apache/aurora/e2e/http/http_example.aurora ---------------------------------------------------------------------- diff --git a/src/test/sh/org/apache/aurora/e2e/http/http_example.aurora b/src/test/sh/org/apache/aurora/e2e/http/http_example.aurora index 4e98929..0f64235 100644 --- a/src/test/sh/org/apache/aurora/e2e/http/http_example.aurora +++ b/src/test/sh/org/apache/aurora/e2e/http/http_example.aurora @@ -29,7 +29,7 @@ test_task = Task( processes = [stage_server, run_server], constraints = order(stage_server, run_server)) -job = Job( +job = Service( name = 'http_example', cluster = 'devcluster', instances = 2, http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/src/test/sh/org/apache/aurora/e2e/http/http_example_docker_updated.aurora ---------------------------------------------------------------------- diff --git a/src/test/sh/org/apache/aurora/e2e/http/http_example_docker_updated.aurora b/src/test/sh/org/apache/aurora/e2e/http/http_example_docker_updated.aurora index 20f604b..d987d63 100644 --- a/src/test/sh/org/apache/aurora/e2e/http/http_example_docker_updated.aurora +++ b/src/test/sh/org/apache/aurora/e2e/http/http_example_docker_updated.aurora @@ -32,7 +32,7 @@ test_task = Task( update_config = UpdateConfig(watch_secs=10, batch_size=2) health_check_config = HealthCheckConfig(initial_interval_secs=5, interval_secs=1) -job = Job( +job = Service( name = 'http_example_docker', cluster = 'devcluster', instances = 3, http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/edcc252c/src/test/sh/org/apache/aurora/e2e/http/http_example_updated.aurora ---------------------------------------------------------------------- diff --git a/src/test/sh/org/apache/aurora/e2e/http/http_example_updated.aurora b/src/test/sh/org/apache/aurora/e2e/http/http_example_updated.aurora index 98f5c47..072bbb7 100644 --- a/src/test/sh/org/apache/aurora/e2e/http/http_example_updated.aurora +++ b/src/test/sh/org/apache/aurora/e2e/http/http_example_updated.aurora @@ -32,7 +32,7 @@ test_task = Task( update_config = UpdateConfig(watch_secs=10, batch_size=2) health_check_config = HealthCheckConfig(initial_interval_secs=5, interval_secs=1) -job = Job( +job = Service( name = 'http_example', cluster = 'devcluster', instances = 3,