You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gr...@apache.org on 2018/08/03 23:22:14 UTC

[mesos] branch 1.5.x updated (74a6f3c -> 8a1bd29)

This is an automated email from the ASF dual-hosted git repository.

grag pushed a change to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.


    from 74a6f3c  Added balloon framework metric for tasks which were running.
     new 5510d85  Added missing iptables argument in CNI port mapper.
     new 8a1bd29  Added MESOS-9125 to the 1.5.2 CHANGELOG.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CHANGELOG                                                               | 1 +
 .../mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


[mesos] 02/02: Added MESOS-9125 to the 1.5.2 CHANGELOG.

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

grag pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 8a1bd29e9ff862fc7e1563ddf4df42c9e30e5acc
Author: Greg Mann <gr...@gmail.com>
AuthorDate: Fri Aug 3 16:21:45 2018 -0700

    Added MESOS-9125 to the 1.5.2 CHANGELOG.
---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d0c97e1..bc1b62d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ Release Notes - Mesos - Version 1.5.2 (WIP)
   * [MESOS-8987] - Master asks agent to shutdown upon auth errors.
   * [MESOS-9024] - Mesos master segfaults with stack overflow under load.
   * [MESOS-9049] - Agent GC could unmount a dangling persistent volume multiple times.
+  * [MESOS-9125] - Port mapper CNI plugin might fail with "Resource temporarily unavailable"
 
 
 Release Notes - Mesos - Version 1.5.1


[mesos] 01/02: Added missing iptables argument in CNI port mapper.

Posted by gr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

grag pushed a commit to branch 1.5.x
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit 5510d85998e302880f92401fdb0467d10712e963
Author: Greg Mann <gr...@mesosphere.io>
AuthorDate: Fri Aug 3 13:41:33 2018 -0700

    Added missing iptables argument in CNI port mapper.
    
    Previously, the CNI port mapper was using the `-w` option in all
    invocations of `iptables` except one. This option ensures that if
    an application is currently holding the xtables lock, then `iptables`
    will wait for the lock to be released and then continue execution.
    Without setting the `-w` option, `iptables` will fail immediately if
    the lock is currently held.
    
    This patch adds the missing `-w` option to the port mapper code.
    
    Review: https://reviews.apache.org/r/68152/
---
 .../mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
index c40b57f..b6a619f 100644
--- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
@@ -342,7 +342,7 @@ Try<Nothing> PortMapper::addPortMapping(
 
       # Within the `chain` go ahead and install the DNAT rule, if it
       # does not exist.
-      (iptables -w -t nat -C %s || iptables -t nat -A %s))~",
+      (iptables -w -t nat -C %s || iptables -w -t nat -A %s))~",
       chain,
       chain,
       chain,