aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject aurora git commit: Updating to Mesos 0.23.0. A few notes:
Date Mon, 17 Aug 2015 21:18:41 GMT
Repository: aurora
Updated Branches:
  refs/heads/master b6e2bc34f -> 22f9cbb7e


Updating to Mesos 0.23.0. A few notes:

Bugs closed: AURORA-1429

Reviewed at https://reviews.apache.org/r/37379/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/22f9cbb7
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/22f9cbb7
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/22f9cbb7

Branch: refs/heads/master
Commit: 22f9cbb7e6b82ba6e0154bbe47d78f7a22cd3115
Parents: b6e2bc3
Author: Maxim Khutornenko <maxim@apache.org>
Authored: Mon Aug 17 13:56:40 2015 -0700
Committer: Maxim Khutornenko <maxim@apache.org>
Committed: Mon Aug 17 13:56:40 2015 -0700

----------------------------------------------------------------------
 3rdparty/python/requirements.txt                      |  4 ++--
 NEWS                                                  |  5 +++++
 build-support/python/make-mesos-native-egg            | 14 ++++++++++++--
 build.gradle                                          |  2 +-
 docs/deploying-aurora-scheduler.md                    |  2 +-
 examples/vagrant/provision-dev-cluster.sh             |  4 ++--
 .../aurora/benchmark/fakes/FakeSchedulerDriver.java   |  8 ++++++++
 .../apache/aurora/scheduler/app/local/FakeMaster.java |  8 ++++++++
 src/test/sh/org/apache/aurora/e2e/Dockerfile          |  3 +++
 9 files changed, 42 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/3rdparty/python/requirements.txt
----------------------------------------------------------------------
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
index 4bc82b8..1eeb36d 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.22.0
-mesos.native==0.22.0
+mesos.interface==0.23.0
+mesos.native==0.23.0
 mock==1.0.1
 mox==0.5.3
 pex==0.8.2

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 6c0e20f..83a1213 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@
   * A new apache.aurora.kerberos package has been introduced, containing the Kerberos-supporting
     versions of aurora and aurora_admin (kaurora and kaurora_admin).
   * Most BUILD targets under src/main have been removed, see http://s.apache.org/b8z for
details.
+- Upgraded Mesos to 0.23.0. NOTE: Aurora executor now requires openssl runtime dependencies
that
+  were not previously enforced. You will need libcurl available on every Mesos slave (or
Docker
+  container) to successfully launch Aurora executor. See
+  https://github.com/apache/mesos/blob/ebcf8cc2f2f6c236f6e9315447c247e6348141e1/docs/getting-started.md
+  for more details on Mesos runtime dependencies.
 
 0.9.0
 -----

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/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 fce53e4..47438c5 100755
--- a/build-support/python/make-mesos-native-egg
+++ b/build-support/python/make-mesos-native-egg
@@ -20,7 +20,7 @@ EOF
 }
 
 setup_tempdir() {
-  TMPDIR=""
+  TMPDIR="/tmp"
   cleanup() {
     if [[ -f Vagrantfile ]]; then
       vagrant destroy -f
@@ -91,7 +91,10 @@ EOF
 CENTOS6_X86_64_DEPENDENCIES=(
   apr-devel
   cyrus-sasl-devel
-  gcc-c++
+  cyrus-sasl-md5
+  devtoolset-2-binutils
+  devtoolset-2-gcc
+  devtoolset-2-gcc-c++
   libcurl-devel
   patch
   python27-python-devel
@@ -111,7 +114,13 @@ build_centos6() {
 
     # We need Software Collections for Python 2.7 (we dropped support for 2.6).
     sudo yum -y install centos-release-SCL
+
+    # Mesos requires gcc 4.8, which is available in devtools-2 on centos 6.
+    # TODO(maxim): Consider using signed packages when/if available.
+    sudo wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo
+
     sudo yum -y install ${CENTOS6_X86_64_DEPENDENCIES[*]}
+    scl enable devtoolset-2 bash
     scl enable python27 - <<EOS
         $(fetch_and_build_mesos "$mesos_version")
 EOS
@@ -124,6 +133,7 @@ EOF
 CENTOS7_X86_64_DEPENDENCIES=(
   apr-devel
   cyrus-sasl-devel
+  cyrus-sasl-md5
   gcc-c++
   libcurl-devel
   patch

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index afb9b80..57fec4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -282,7 +282,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.22.0'
+  compile 'org.apache.mesos:mesos:0.23.0'
   compile("org.apache.shiro:shiro-guice:${shiroRev}") {
     // TODO(ksweeney): Remove this exclusion when https://issues.apache.org/jira/browse/SHIRO-496
is resolved.
     exclude group: 'com.google.guava'

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/docs/deploying-aurora-scheduler.md
----------------------------------------------------------------------
diff --git a/docs/deploying-aurora-scheduler.md b/docs/deploying-aurora-scheduler.md
index 11155b9..8a1e68e 100644
--- a/docs/deploying-aurora-scheduler.md
+++ b/docs/deploying-aurora-scheduler.md
@@ -35,7 +35,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.22.0) installed.
+should have a JVM (Java 7 or higher) and libmesos (0.23.0) 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/aurora/blob/22f9cbb7/examples/vagrant/provision-dev-cluster.sh
----------------------------------------------------------------------
diff --git a/examples/vagrant/provision-dev-cluster.sh b/examples/vagrant/provision-dev-cluster.sh
index fc53885..16ae8d1 100755
--- a/examples/vagrant/provision-dev-cluster.sh
+++ b/examples/vagrant/provision-dev-cluster.sh
@@ -22,7 +22,7 @@ apt-get -y install \
     curl \
     git \
     libapr1-dev \
-    libcurl4-openssl-dev \
+    libcurl4-nss-dev \
     libsasl2-dev \
     libsvn-dev \
     lxc-docker \
@@ -34,7 +34,7 @@ update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
 
 readonly IP_ADDRESS=192.168.33.7
 
-readonly MESOS_VERSION=0.22.0
+readonly MESOS_VERSION=0.23.0
 
 function prepare_extras() {
   pushd aurora

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
index 23c0e53..2b24578 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/fakes/FakeSchedulerDriver.java
@@ -92,6 +92,14 @@ public class FakeSchedulerDriver implements SchedulerDriver {
   }
 
   @Override
+  public Protos.Status acceptOffers(
+      Collection<Protos.OfferID> offerIds,
+      Collection<Protos.Offer.Operation> operations,
+      Protos.Filters filters) {
+    return null;
+  }
+
+  @Override
   public Protos.Status declineOffer(
       Protos.OfferID offerId,
       Protos.Filters filters) {

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
index aeb8946..c9e1c13 100644
--- a/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
+++ b/src/test/java/org/apache/aurora/scheduler/app/local/FakeMaster.java
@@ -306,6 +306,14 @@ public class FakeMaster implements SchedulerDriver, DriverFactory {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public Status acceptOffers(
+      Collection<OfferID> offerIds,
+      Collection<Offer.Operation> operations,
+      Filters filters) {
+    throw new UnsupportedOperationException();
+  }
+
   private static final class Task {
     private final Offer offer;
     private final TaskInfo task;

http://git-wip-us.apache.org/repos/asf/aurora/blob/22f9cbb7/src/test/sh/org/apache/aurora/e2e/Dockerfile
----------------------------------------------------------------------
diff --git a/src/test/sh/org/apache/aurora/e2e/Dockerfile b/src/test/sh/org/apache/aurora/e2e/Dockerfile
index e7f7f54..b2557b5 100644
--- a/src/test/sh/org/apache/aurora/e2e/Dockerfile
+++ b/src/test/sh/org/apache/aurora/e2e/Dockerfile
@@ -14,4 +14,7 @@
 
 FROM python:2.7
 
+# mesos.native requires libcurl-nss to initialize MesosExecutorDriver
+RUN apt-get update && apt-get -y install libcurl4-nss-dev
+
 COPY http_example.py /tmp/


Mime
View raw message