You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:36:07 UTC

[26/48] mesos git commit: Don't remove IP from the logger's environment.

Don't remove IP from the logger's environment.

Unsetting the `LIBPROCESS_IP` was originally unnecessary, as this
variable does not result in port conflicts.  Unsetting this environment
variable may cause the subprocess to exit if DNS cannot resolve the
agent's hostname.

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


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

Branch: refs/heads/0.27.x
Commit: 9f4fa0ea52788fa1c7938caab059f4d3843becda
Parents: dce4c7b
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Fri Feb 5 03:54:24 2016 +0100
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Feb 16 18:21:09 2016 -0500

----------------------------------------------------------------------
 src/slave/container_loggers/lib_logrotate.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/9f4fa0ea/src/slave/container_loggers/lib_logrotate.cpp
----------------------------------------------------------------------
diff --git a/src/slave/container_loggers/lib_logrotate.cpp b/src/slave/container_loggers/lib_logrotate.cpp
index 8d2f895..01a3ff0 100644
--- a/src/slave/container_loggers/lib_logrotate.cpp
+++ b/src/slave/container_loggers/lib_logrotate.cpp
@@ -81,12 +81,10 @@ public:
     // Inherit most, but not all of the agent's environment.
     // Since the subprocess links to libmesos, it will need some of the
     // same environment used to launch the agent (also uses libmesos).
-    // The libprocess IP and port are explicitly removed because these
+    // The libprocess port is explicitly removed because this
     // will conflict with the already-running agent.
     std::map<std::string, std::string> environment = os::environment();
-    environment.erase("LIBPROCESS_IP");
     environment.erase("LIBPROCESS_PORT");
-    environment.erase("LIBPROCESS_ADVERTISE_IP");
     environment.erase("LIBPROCESS_ADVERTISE_PORT");
 
     // NOTE: We manually construct a pipe here instead of using