----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/53047/#review153641 -----------------------------------------------------------
Fix it, then Ship it! src/tests/containerizer/docker_containerizer_tests.cpp (line 1450) <https://reviews.apache.org/r/53047/#comment223049> Nit: Add an extra blank line above. src/tests/containerizer/docker_containerizer_tests.cpp (line 1460) <https://reviews.apache.org/r/53047/#comment223053> Let's add ``` flags.docker_kill_orphans = true; ``` here to make it obviously. src/tests/containerizer/docker_containerizer_tests.cpp (line 1482) <https://reviews.apache.org/r/53047/#comment223054> Nit: ``` // Clean up artifacts if the container still exists. ``` The word `containers` should not use with `exists` together? src/tests/containerizer/docker_containerizer_tests.cpp (line 1489) <https://reviews.apache.org/r/53047/#comment223051> Add ``` // TODO(tnachen): Use local image to test if possible. ``` above. src/tests/containerizer/docker_containerizer_tests.cpp (line 1494) <https://reviews.apache.org/r/53047/#comment223050> Let's use `sleep 1000` here to keep consistent with other cases. We perfer to use a longer time to avoid flaky test cases because 15s may not enough on a slow machine. src/tests/containerizer/docker_containerizer_tests.cpp (lines 1507 - 1508) <https://reviews.apache.org/r/53047/#comment223052> I think may remove these because ``` ASSERT_TRUE( exists(docker, slaveId, containerId, ContainerState::RUNNING)); ``` make sure the container status is running. src/tests/containerizer/docker_containerizer_tests.cpp (line 1529) <https://reviews.apache.org/r/53047/#comment223055> Nit: For comments, we should add a peroid at the end of this. ``` // The container should still exist and should not get killed // by containerizer recovery. ``` src/tests/containerizer/docker_containerizer_tests.cpp (lines 1531 - 1533) <https://reviews.apache.org/r/53047/#comment223056> I think we should remove this because ``` ASSERT_TRUE(exists(docker, slaveId, containerId)); ``` make sure the container is still running. - haosdent huang On Oct. 21, 2016, 9:34 a.m., Manuwela Kanade wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/53047/ > ----------------------------------------------------------- > > (Updated Oct. 21, 2016, 9:34 a.m.) > > > Review request for mesos, haosdent huang, Timothy Chen, and Vinod Kone. > > > Bugs: MESOS-6212 > https://issues.apache.org/jira/browse/MESOS-6212 > > > Repository: mesos > > > Description > ------- > > MESOS-6212: name format validation for mesos managed docker containers. > > > Diffs > ----- > > 3rdparty/stout/tests/uuid_tests.cpp > fe9894af93df9cb9b12390d8d7e7885525db384d > src/slave/containerizer/docker.cpp 8ec4c0a25335fb1b36cb2ab82577f6d3e2f7f008 > src/tests/containerizer/docker_containerizer_tests.cpp > 6d26797abf6d2b5e42b9e7743789e1edc62c9c1a > > Diff: https://reviews.apache.org/r/53047/diff/ > > > Testing > ------- > > 1. Ran the "make check" > > 2. Manual Testing done as below: > Testing without changes: Created and ran an example container which is not > run using mesos : named "mesos-rsyslog" which got killed once mesos-agent > started with --containerizer=docker,mesos. > > Testing with changes: Created and ran an example container (not run using > mesos): named "mesos-rsyslog" which keeps running and mesos-agent does not > kill it thus avoiding the false positive > > 3. Added a testcase to test this scenario. Result below: > Test run with the fix passes > [==========] Running 1 test from 1 test case. > [----------] Global test environment set-up. > [----------] 1 test from DockerContainerizerTest > [ RUN ] DockerContainerizerTest.ROOT_DOCKER_SkipRecoverMalformedUUID > [ OK ] DockerContainerizerTest.ROOT_DOCKER_SkipRecoverMalformedUUID > (16142 ms) > [----------] 1 test from DockerContainerizerTest (16143 ms total) > > [----------] Global test environment tear-down > [==========] 1 test from 1 test case ran. (16157 ms total) > [ PASSED ] 1 test. > > > Test run without the fix fails, since container with malformed UUID also gets > killed: > [==========] Running 1 test from 1 test case. > [----------] Global test environment set-up. > [----------] 1 test from DockerContainerizerTest > [ RUN ] DockerContainerizerTest.ROOT_DOCKER_SkipRecoverMalformedUUID > ../../src/tests/containerizer/docker_containerizer_tests.cpp:1529: Failure > Value of: exists(docker, slaveId, containerId) > Actual: false > Expected: true > [ FAILED ] DockerContainerizerTest.ROOT_DOCKER_SkipRecoverMalformedUUID > (9054 ms) > [----------] 1 test from DockerContainerizerTest (9055 ms total) > > > Thanks, > > Manuwela Kanade > >
