Repository: mesos Updated Branches: refs/heads/master 304ad5e14 -> fe30f3db7
Allowed turning off network socket statistics collection. Review: https://reviews.apache.org/r/28295 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/fe30f3db Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/fe30f3db Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/fe30f3db Branch: refs/heads/master Commit: fe30f3db73437e7fdb7743dbfeec10758b1fe6d4 Parents: 304ad5e Author: Jie Yu <[email protected]> Authored: Thu Nov 20 11:46:25 2014 -0800 Committer: Jie Yu <[email protected]> Committed: Thu Nov 20 12:03:15 2014 -0800 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 4 ++++ src/slave/flags.hpp | 7 +++++++ src/tests/port_mapping_tests.cpp | 1 + 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/fe30f3db/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 8436bf7..3755413 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -2037,6 +2037,10 @@ Future<ResourceStatistics> PortMappingIsolatorProcess::usage( result.set_net_tx_dropped(tx_dropped.get()); } + if (!flags.network_enable_socket_statistics) { + return result; + } + // Retrieve the socket information from inside the container. PortMappingStatistics statistics; statistics.flags.pid = info->pid.get(); http://git-wip-us.apache.org/repos/asf/mesos/blob/fe30f3db/src/slave/flags.hpp ---------------------------------------------------------------------- diff --git a/src/slave/flags.hpp b/src/slave/flags.hpp index fee79e0..4f5b8b4 100644 --- a/src/slave/flags.hpp +++ b/src/slave/flags.hpp @@ -362,6 +362,12 @@ public: "If not specified or specified as zero, the network isolator will\n" "impose no limits to containers' egress traffic throughput.\n" "This flag uses the Bytes type, defined in stout."); + + add(&Flags::network_enable_socket_statistics, + "network_enable_socket_statistics", + "Whether to collect socket statistics (e.g., TCP RTT) for\n" + "each container.", + false); #endif // WITH_NETWORK_ISOLATOR // This help message for --modules flag is the same for @@ -466,6 +472,7 @@ public: Option<std::string> eth0_name; Option<std::string> lo_name; Option<Bytes> egress_rate_limit_per_container; + bool network_enable_socket_statistics; #endif Option<Modules> modules; std::string authenticatee; http://git-wip-us.apache.org/repos/asf/mesos/blob/fe30f3db/src/tests/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp index 0af695b..eb82993 100644 --- a/src/tests/port_mapping_tests.cpp +++ b/src/tests/port_mapping_tests.cpp @@ -1415,6 +1415,7 @@ TEST_F(PortMappingIsolatorTest, ROOT_ExportRTTTest) // Use a very small egress limit. flags.egress_rate_limit_per_container = rate; + flags.network_enable_socket_statistics = true; Try<Isolator*> isolator = PortMappingIsolatorProcess::create(flags); CHECK_SOME(isolator);
