mesos git commit: Added LIBPROCESS_PORT environment removal for mesos-fetcher.

[ti...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master aa76317e4 -> 32487ac8e


Added LIBPROCESS_PORT environment removal for mesos-fetcher.

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


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

Branch: refs/heads/master
Commit: 32487ac8e6004aefa8f20c1f384a92239eeafa4c
Parents: aa76317
Author: Shuai Lin <li...@gmail.com>
Authored: Fri Feb 5 04:38:28 2016 +0100
Committer: Till Toenshoff <to...@me.com>
Committed: Fri Feb 5 04:42:15 2016 +0100

----------------------------------------------------------------------
 src/slave/containerizer/fetcher.cpp | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/32487ac8/src/slave/containerizer/fetcher.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/fetcher.cpp b/src/slave/containerizer/fetcher.cpp
index dbf968d..33dfcad 100644
--- a/src/slave/containerizer/fetcher.cpp
+++ b/src/slave/containerizer/fetcher.cpp
@@ -752,6 +752,11 @@ Future<Nothing> FetcherProcess::run(
   // environment variable.
   map<string, string> environment = os::environment();
 
+  // The libprocess port is explicitly removed because this will conflict
+  // with the already-running agent.
+  environment.erase("LIBPROCESS_PORT");
+  environment.erase("LIBPROCESS_ADVERTISE_PORT");
+
   environment["MESOS_FETCHER_INFO"] = stringify(JSON::protobuf(info));
 
   if (!flags.hadoop_home.empty()) {