You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jc...@apache.org on 2016/06/29 17:46:12 UTC
aurora git commit: Upgrade to Mesos 0.28.2.
Repository: aurora
Updated Branches:
refs/heads/master 4e28b9c8b -> 6f93ae2dc
Upgrade to Mesos 0.28.2.
Release notes:
http://mesos.apache.org/blog/mesos-0-28-0-released/
http://mesos.apache.org/blog/mesos-0-28-2-released/
Reviewed at https://reviews.apache.org/r/49384/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/6f93ae2d
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/6f93ae2d
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/6f93ae2d
Branch: refs/heads/master
Commit: 6f93ae2dc9ac27d9450c2f8f4952c7674664d49f
Parents: 4e28b9c
Author: Joshua Cohen <jc...@apache.org>
Authored: Wed Jun 29 12:45:50 2016 -0500
Committer: Joshua Cohen <jc...@apache.org>
Committed: Wed Jun 29 12:45:50 2016 -0500
----------------------------------------------------------------------
3rdparty/python/BUILD | 2 +-
RELEASE-NOTES.md | 1 +
Vagrantfile | 2 +-
build-support/packer/build.sh | 2 +-
build.gradle | 2 +-
.../java/org/apache/aurora/scheduler/base/Conversions.java | 6 ++++++
6 files changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/3rdparty/python/BUILD
----------------------------------------------------------------------
diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index 85db569..a44624c 100644
--- a/3rdparty/python/BUILD
+++ b/3rdparty/python/BUILD
@@ -11,7 +11,7 @@
# limitations under the License.
#
-MESOS_REV = '0.27.2'
+MESOS_REV = '0.28.2'
python_requirement_library(
name = 'mesos.interface',
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/RELEASE-NOTES.md
----------------------------------------------------------------------
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 5beda5d..29d224d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -7,6 +7,7 @@
to contain URIs which will be passed to the Mesos Fetcher and subsequently downloaded into
the sandbox. Please note that enabling job submissions to download resources from arbitrary
URIs may have security implications.
+- Upgraded Mesos to 0.28.2.
### Deprecations and removals:
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/Vagrantfile
----------------------------------------------------------------------
diff --git a/Vagrantfile b/Vagrantfile
index e7e113d..5aa2128 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -25,7 +25,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.hostname = "aurora.local"
# See build-support/packer/README.md for instructions on updating this box.
config.vm.box = "apache-aurora/dev-environment"
- config.vm.box_version = "0.0.6"
+ config.vm.box_version = "0.0.7"
config.vm.define "devcluster" do |dev|
dev.vm.network :private_network, ip: "192.168.33.7"
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/build-support/packer/build.sh
----------------------------------------------------------------------
diff --git a/build-support/packer/build.sh b/build-support/packer/build.sh
index 2a01d77..08938ec 100644
--- a/build-support/packer/build.sh
+++ b/build-support/packer/build.sh
@@ -17,7 +17,7 @@ set -o errexit
set -o nounset
set -o verbose
-readonly MESOS_VERSION=0.27.2
+readonly MESOS_VERSION=0.28.2
function remove_unused {
# The default ubuntu/trusty64 image includes juju-core, which adds ~300 MB to our image.
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 0d0d94a..9540195 100644
--- a/build.gradle
+++ b/build.gradle
@@ -365,7 +365,7 @@ dependencies {
compile "org.apache.curator:curator-client:${curatorRev}"
compile "org.apache.curator:curator-framework:${curatorRev}"
compile "org.apache.curator:curator-recipes:${curatorRev}"
- compile 'org.apache.mesos:mesos:0.27.2'
+ compile 'org.apache.mesos:mesos:0.28.2'
compile "org.apache.shiro:shiro-guice:${shiroRev}"
compile "org.apache.shiro:shiro-web:${shiroRev}"
compile "org.apache.zookeeper:zookeeper:${zookeeperRev}"
http://git-wip-us.apache.org/repos/asf/aurora/blob/6f93ae2d/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
index f2ff7ab..66e69d4 100644
--- a/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
+++ b/src/main/java/org/apache/aurora/scheduler/base/Conversions.java
@@ -55,6 +55,12 @@ public final class Conversions {
.put(TaskState.TASK_RUNNING, ScheduleStatus.RUNNING)
.put(TaskState.TASK_FINISHED, ScheduleStatus.FINISHED)
.put(TaskState.TASK_FAILED, ScheduleStatus.FAILED)
+ // N.B. the executor does not currently send TASK_KILLING, nor do we opt in to the
+ // framework capability to receive notifications of this state. We map TaskState.KILLING
+ // to ScheduleStatus.KILLED out of an abundance of caution, to avoid potentially
+ // unexpected behavior (since ScheduleStatus.KILLING is a transient state) should this be
+ // enabled in the future.
+ .put(TaskState.TASK_KILLING, ScheduleStatus.KILLED)
.put(TaskState.TASK_KILLED, ScheduleStatus.KILLED)
.put(TaskState.TASK_LOST, ScheduleStatus.LOST)
.put(TaskState.TASK_ERROR, ScheduleStatus.LOST)