You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2017/07/07 00:07:06 UTC
[3/4] mesos git commit: Updated v6 address for containers running on
host network.
Updated v6 address for containers running on host network.
Currently the agent is populating only the v4 address for containers
running on the host network. However, clusters running on a dual stack
network need to report v4 and v6 address for containers running on the
host network. This change allows v6 address specified by operators to be
advertised for containers running on the host network.
Review: https://reviews.apache.org/r/59233/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/114bd98a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/114bd98a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/114bd98a
Branch: refs/heads/master
Commit: 114bd98a04e05665c647c4a9c94e595ef104ec64
Parents: 8d9929a
Author: Avinash sridharan <av...@mesosphere.io>
Authored: Thu Jul 6 17:01:37 2017 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Thu Jul 6 17:01:37 2017 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 2 +-
include/mesos/v1/mesos.proto | 2 +-
src/slave/slave.cpp | 12 ++++++++++++
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/114bd98a/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index ab2a372..d70ac9e 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -2537,7 +2537,7 @@ message NetworkInfo {
// request the network isolator on the Agent to assign an IP address to the
// container being launched. If a specific IP address is specified in
// ip_address, this field should not be set.
- optional Protocol protocol = 1;
+ optional Protocol protocol = 1 [default = IPv4];
// Statically assigned IP provided by the Framework. This IP will be
// assigned to the container by the network isolator module on the Agent.
http://git-wip-us.apache.org/repos/asf/mesos/blob/114bd98a/include/mesos/v1/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/v1/mesos.proto b/include/mesos/v1/mesos.proto
index 5e92e5d..fee8b0c 100644
--- a/include/mesos/v1/mesos.proto
+++ b/include/mesos/v1/mesos.proto
@@ -2520,7 +2520,7 @@ message NetworkInfo {
// request the network isolator on the Agent to assign an IP address to the
// container being launched. If a specific IP address is specified in
// ip_address, this field should not be set.
- optional Protocol protocol = 1;
+ optional Protocol protocol = 1 [default = IPv4];
// Statically assigned IP provided by the Framework. This IP will be
// assigned to the container by the network isolator module on the Agent.
http://git-wip-us.apache.org/repos/asf/mesos/blob/114bd98a/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 0e24b8c..52f6736 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -4560,7 +4560,19 @@ void Slave::_statusUpdate(
if (containerStatus->network_infos().size() == 0) {
NetworkInfo* networkInfo = containerStatus->add_network_infos();
NetworkInfo::IPAddress* ipAddress = networkInfo->add_ip_addresses();
+
+ // Set up IPv4 address.
+ //
+ // NOTE: By default the protocol is set to IPv4 and therefore we
+ // don't explicitly set the protocol here.
ipAddress->set_ip_address(stringify(self().address.ip));
+
+ // Set up IPv6 address.
+ if (self().addresses.v6.isSome()) {
+ ipAddress = networkInfo->add_ip_addresses();
+ ipAddress->set_ip_address(stringify(self().addresses.v6->ip));
+ ipAddress->set_protocol(NetworkInfo::IPv6);
+ }
}
}