You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2015/06/18 01:32:46 UTC

[2/2] mesos git commit: Removed the guard for launching the network statistics helper subprocess in port mapping isolator.

Removed the guard for launching the network statistics helper
subprocess in port mapping isolator.

Review: https://reviews.apache.org/r/35257


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/869b8f06
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/869b8f06
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/869b8f06

Branch: refs/heads/master
Commit: 869b8f06b270e3a05888b9ec026a6a29030eb9f5
Parents: 541bba7
Author: Paul Brett <pa...@twopensource.com>
Authored: Wed Jun 17 16:26:16 2015 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Jun 17 16:26:16 2015 -0700

----------------------------------------------------------------------
 src/slave/containerizer/isolators/network/port_mapping.cpp | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/869b8f06/src/slave/containerizer/isolators/network/port_mapping.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp
index 85a84df..137cdc9 100644
--- a/src/slave/containerizer/isolators/network/port_mapping.cpp
+++ b/src/slave/containerizer/isolators/network/port_mapping.cpp
@@ -2772,11 +2772,6 @@ Future<ResourceStatistics> PortMappingIsolatorProcess::usage(
     result.set_net_tx_dropped(tx_dropped.get());
   }
 
-  if (!flags.network_enable_socket_statistics_summary &&
-      !flags.network_enable_socket_statistics_details) {
-    return result;
-  }
-
   // Retrieve the socket information from inside the container.
   PortMappingStatistics statistics;
   statistics.flags.pid = info->pid.get();