----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/36282/#review90822 -----------------------------------------------------------
Ship it! Looks like a simpler, more generic fix. Maybe external_containerizer will want to use includeOsEnvironment flag too. src/slave/containerizer/containerizer.cpp (lines 248 - 253) <https://reviews.apache.org/r/36282/#comment143962> Seems like one of these could be an else if, since they both wipe `environment` and start from scratch. I would probably start with `if(flags.executor_environment_variables)` then `else if(includeOsEnvironment)`. - Adam B On July 7, 2015, 4:05 p.m., Timothy Chen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/36282/ > ----------------------------------------------------------- > > (Updated July 7, 2015, 4:05 p.m.) > > > Review request for mesos, Adam B, Benjamin Hindman, and Joerg Schad. > > > Bugs: MESOS-2996 > https://issues.apache.org/jira/browse/MESOS-2996 > > > Repository: mesos > > > Description > ------- > > Remove os environment when calling executorEnvironment when running docker > executors, since all the environment variables will be > passed into the container and causes bad behavior such as overriding hostname. > > > Diffs > ----- > > src/slave/containerizer/containerizer.hpp > 0ee17e6bc52d1e3acefad6bda3a1b7ba64a8a54b > src/slave/containerizer/containerizer.cpp > 69dfac04cfd9c388fc908b68ac7abbc14304e621 > src/slave/containerizer/docker.hpp 646a277be21deaded47324bea5474bd68699f25f > src/slave/containerizer/docker.cpp 6eb1c84b1a6ef17c3e2ea2028e2f2d75110176ba > > Diff: https://reviews.apache.org/r/36282/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Timothy Chen > >
