(mesos) branch master updated: Fixed port_mapping isolator upgrade process.

[bmahler]

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

bmahler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new 16afd5221 Fixed port_mapping isolator upgrade process.
16afd5221 is described below

commit 16afd5221c0b3c249b2424f06dc00113babc7077
Author: Ilya Pronin <ipro...@twitter.com>
AuthorDate: Wed Nov 8 09:48:28 2017 -0800

    Fixed port_mapping isolator upgrade process.
    
    When egress rate limiting is applied to the existing container without
    it, the HTB qdisc is created with default class ID configured to 0
    (default). Because of that egress traffic from the container misses the
    rate limiting class 1:1. This fixes it by setting default class ID to 1.
---
 src/slave/containerizer/mesos/isolators/network/port_mapping.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp 
b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
index 6d0af9fff..ba1f0f8b6 100644
--- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
@@ -643,7 +643,8 @@ static Try<Nothing> updateHTB(
     Try<bool> htbQdisc = htb::create(
         eth0,
         EGRESS_ROOT,
-        CONTAINER_TX_HTB_HANDLE);
+        CONTAINER_TX_HTB_HANDLE,
+        htb::DisciplineConfig(1));
     if (htbQdisc.isError()) {
       return Error("Failed to add htb class: " + htbQdisc.error());
     }