> On Nov. 1, 2014, 6:44 p.m., Benjamin Hindman wrote: > > src/slave/containerizer/docker.cpp, lines 875-876 > > <https://reviews.apache.org/r/26736/diff/5/?file=746636#file746636line875> > > > > Can we update this comment now that we're no longer doing Docker::rm or > > Docker::kill? It should have been updated before as well, thanks for > > helping out! > > Ryan Thomas wrote: > The issue of having to retry a failed rm still exists - so I think this > TODO is still valid. The stop still has the remove boolean that will remove > the container after a stop.
Originally in the code we were doing a Docker::rm, then we changed it to doing a Docker::kill, now we've changed it again to doing a Docker::stop. I agree that we should try to do a Docker::rm if Docker::stop failed, the comment just makes it sound like we're retrying to do a Docker::rm when in fact we'd be doing it the first time. ;-) Make sense? - Benjamin ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/26736/#review59483 ----------------------------------------------------------- On Nov. 6, 2014, 9:55 p.m., Ryan Thomas wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/26736/ > ----------------------------------------------------------- > > (Updated Nov. 6, 2014, 9:55 p.m.) > > > Review request for mesos, Benjamin Hindman and Timothy Chen. > > > Bugs: MESOS-1925 > https://issues.apache.org/jira/browse/MESOS-1925 > > > Repository: mesos-git > > > Description > ------- > > Ensure docker calls stop if a docker_stop_timeout is provided Added the flag > docker_stop_timeout that defaults to 0, if the timeout is 0 the a docker kill > will be run, otherwise a docker stop with the timeout in seconds is used. A > negative value will result in a Failure. > > > Diffs > ----- > > src/docker/docker.hpp 2dc692c51d6f9d45d8d7c59f8678991fd80c6e89 > src/docker/docker.cpp 0c0a1bfd3c1260ebdf342d0a6e0e04d7b6a111a4 > src/slave/containerizer/docker.cpp a6689203adbdcb0ad12583389eaeb83329e4ef6b > src/slave/flags.hpp efbd35dd744d8c8a53c36dd5cdb8d1c50fcfec3a > src/tests/docker_containerizer_tests.cpp > 9d4ccc57f58d61c62aab5cdc79a129e987920bf6 > src/tests/docker_tests.cpp ff06a01d7f20656c05bcf5afd3bc10059dc5378d > > Diff: https://reviews.apache.org/r/26736/diff/ > > > Testing > ------- > > make check > sudo bin/mesos-tests.sh --gtest_filter="DOCKER" --verbose > support/mesos-style.py > > > Thanks, > > Ryan Thomas > >
