You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@aurora.apache.org by GitBox <gi...@apache.org> on 2018/11/13 21:58:37 UTC

[GitHub] rdelval closed pull request #42: Upgrade dev enviornment to Mesos 1.6.1

rdelval closed pull request #42: Upgrade dev enviornment to Mesos 1.6.1
URL: https://github.com/apache/aurora/pull/42
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/3rdparty/python/BUILD b/3rdparty/python/BUILD
index 423c8b8b9..bc17ce8d5 100644
--- a/3rdparty/python/BUILD
+++ b/3rdparty/python/BUILD
@@ -11,7 +11,7 @@
 # limitations under the License.
 #
 
-MESOS_REV = '1.5.0'
+MESOS_REV = '1.6.1'
 
 python_requirement_library(
   name = 'mesos.interface',
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7e044a100..d61729ac0 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -2,6 +2,7 @@
 ======
 
 ### New/updated:
+- Updated to Mesos 1.6.1.
 - New update strategy added: Variable Batch Update. With this strategy, a job may be updated in
   in batches of different sizes. For example, an update which modifies a total of 10 instances may
   be done in batch sizes of 2, 3, and 5. The number of updated instances must equal the size of the
diff --git a/Vagrantfile b/Vagrantfile
index cd360f22b..a019f6e27 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -23,7 +23,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.16"
+  config.vm.box_version = "0.0.17"
 
   config.vm.define "devcluster" do |dev|
     dev.vm.network :private_network, ip: "192.168.33.7", :auto_config => false
diff --git a/build-support/packer/build.sh b/build-support/packer/build.sh
index 3d25935fe..613910827 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=1.5.0
+readonly MESOS_VERSION=1.6.1
 
 function remove_unused {
   # The default bento/ubuntu-16.04 image includes juju-core, which adds ~300 MB to our image.
@@ -62,14 +62,14 @@ function install_docker {
 }
 
 function install_docker2aci {
-  DOCKER2ACI_VERSION="0.17.1"
-  GOLANG_VERSION="1.9.2"
+  DOCKER2ACI_VERSION="0.17.2"
+  GOLANG_VERSION="1.11"
 
   TEMP_PATH=$(mktemp -d)
   pushd "$TEMP_PATH"
 
   echo "Downloading go..."
-  curl -sL "https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz" | tar -xz
+  curl -sL "https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz" | tar -xz
 
   export GOROOT="$PWD/go"
   export PATH="$PATH:$GOROOT/bin"
diff --git a/build.gradle b/build.gradle
index 047d068ec..11e2c410c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -390,7 +390,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:1.5.0'
+  compile 'org.apache.mesos:mesos:1.6.1'
   compile "org.asynchttpclient:async-http-client:${asyncHttpclientRev}"
   compile "org.apache.shiro:shiro-guice:${shiroRev}"
   compile "org.apache.shiro:shiro-web:${shiroRev}"
diff --git a/src/main/python/apache/aurora/executor/common/sandbox.py b/src/main/python/apache/aurora/executor/common/sandbox.py
index a742c6fbb..5c1496ed3 100644
--- a/src/main/python/apache/aurora/executor/common/sandbox.py
+++ b/src/main/python/apache/aurora/executor/common/sandbox.py
@@ -182,6 +182,12 @@ def _create_symlinks(self):
     try:
       safe_mkdir(mesos_host_sandbox_root)
       os.symlink(os.environ['MESOS_SANDBOX'], self._mesos_dir)
+      # Restore permissions to pre Mesos 1.6.0 levels in order to retain Aurora task ssh
+      # functionality. This directory is bind mounted by Mesos therefore it'll
+      # change the permissions on the host.
+      # This is necessary since Mesos 1.6.0 (https://issues.apache.org/jira/browse/MESOS-8332).
+      # TODO(rdelvalle): Find a cleaner solution for this problem.
+      os.chmod(os.environ['MESOS_SANDBOX'], 0755)
     except (IOError, OSError) as e:
       raise self.CreationError('Failed to create the sandbox root: %s' % e)
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services