You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@mesos.apache.org by Zhitao Li <zh...@gmail.com> on 2017/02/03 18:55:57 UTC

Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/
-----------------------------------------------------------

(Updated Feb. 3, 2017, 6:55 p.m.)


Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.


Changes
-------

Rebase with master.


Bugs: MESOS-6808
    https://issues.apache.org/jira/browse/MESOS-6808


Repository: mesos


Description
-------

This patch creates a wrapper struct for all recognizable docker cli
options, and separate logic of creating these options to a different
common function.

This also enables us to overcome gmock's 10 argument limit.

No logic change happens in this refactoring patch.


Diffs (updated)
-----

  src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
  src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
  src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
  src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
  src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
  src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
  src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
  src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 

Diff: https://reviews.apache.org/r/54821/diff/


Testing
-------

`make check` with ROOT and DOCKER filter.


Thanks,

Zhitao Li


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by haosdent huang <ha...@apache.org>.

> On Feb. 6, 2017, 1:36 a.m., Jie Yu wrote:
> > src/docker/docker.hpp, lines 141-142
> > <https://reviews.apache.org/r/54821/diff/9/?file=1624554#file1624554line141>
> >
> >     I typically wrap comments in 70 char width. Let's do that in this file so that it's consistent with other comments in this file.
> >     
> >     This will reduce the jagdness.

```
  // See https://docs.docker.com/engine/reference/run for a complete
  // explanation of each option.
```


- haosdent


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164288
-----------------------------------------------------------


On Feb. 5, 2017, 11:09 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 5, 2017, 11:09 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Jie Yu <yu...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164288
-----------------------------------------------------------


Fix it, then Ship it!




This is a great refactor! Thanks Zhitao!


src/docker/docker.hpp (lines 141 - 142)
<https://reviews.apache.org/r/54821/#comment235967>

    I typically wrap comments in 70 char width. Let's do that in this file so that it's consistent with other comments in this file.
    
    This will reduce the jagdness.



src/docker/docker.cpp (line 781)
<https://reviews.apache.org/r/54821/#comment235975>

    `memory->bytes()`


- Jie Yu


On Feb. 5, 2017, 11:09 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 5, 2017, 11:09 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by haosdent huang <ha...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164301
-----------------------------------------------------------


Fix it, then Ship it!




Thanks a lot for @zhitao's great refactor and @jieyu's review. Let me commit it after 1.2.0 release.
I would try to see if it could backport to other active branches at that time as well.


src/docker/docker.hpp (lines 165 - 166)
<https://reviews.apache.org/r/54821/#comment235991>

    ```
        // Environment variable overrides. These overrides will be passed
        // to docker container through "--env-file" option.
    ```



src/docker/docker.cpp (line 713)
<https://reviews.apache.org/r/54821/#comment235989>

    Got error when apply the patch:
    
    ```
    Checking 8 C++ files
    src/docker/docker.cpp:713:  Lines should be <= 80 characters long  [whitespace/line_length] [2]
    Total errors found: 1
    ```



src/docker/executor.cpp (line 477)
<https://reviews.apache.org/r/54821/#comment235994>

    nits:
    
    ```
      void _stop()
      {
    ```


- haosdent huang


On Feb. 5, 2017, 11:09 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 5, 2017, 11:09 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by haosdent huang <ha...@apache.org>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review166027
-----------------------------------------------------------




src/docker/docker.cpp (line 799)
<https://reviews.apache.org/r/54821/#comment237921>

    Since we use `int_fd` now, I update to
    ```
      Try<int_fd> fd = os::open(
    ```
    here.


- haosdent huang


On Feb. 6, 2017, 9:28 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 6, 2017, 9:28 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/
-----------------------------------------------------------

(Updated Feb. 6, 2017, 9:28 p.m.)


Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.


Changes
-------

Style fixes.


Bugs: MESOS-6808
    https://issues.apache.org/jira/browse/MESOS-6808


Repository: mesos


Description
-------

This patch creates a wrapper struct for all recognizable docker cli
options, and separate logic of creating these options to a different
common function.

This also enables us to overcome gmock's 10 argument limit.

No logic change happens in this refactoring patch.


Diffs (updated)
-----

  src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
  src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
  src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
  src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
  src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
  src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
  src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
  src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 

Diff: https://reviews.apache.org/r/54821/diff/


Testing
-------

`make check` with ROOT and DOCKER filter.


Thanks,

Zhitao Li


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/
-----------------------------------------------------------

(Updated Feb. 5, 2017, 11:09 p.m.)


Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.


Changes
-------

Rebase.


Bugs: MESOS-6808
    https://issues.apache.org/jira/browse/MESOS-6808


Repository: mesos


Description
-------

This patch creates a wrapper struct for all recognizable docker cli
options, and separate logic of creating these options to a different
common function.

This also enables us to overcome gmock's 10 argument limit.

No logic change happens in this refactoring patch.


Diffs (updated)
-----

  src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
  src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
  src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
  src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
  src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
  src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
  src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
  src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 

Diff: https://reviews.apache.org/r/54821/diff/


Testing
-------

`make check` with ROOT and DOCKER filter.


Thanks,

Zhitao Li


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Zhitao Li <zh...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/
-----------------------------------------------------------

(Updated Feb. 4, 2017, 12:20 a.m.)


Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.


Changes
-------

Change `parameters` to a `vector<string> additionalOptions`;
Fix for missing MIN_MEMORY.


Bugs: MESOS-6808
    https://issues.apache.org/jira/browse/MESOS-6808


Repository: mesos


Description
-------

This patch creates a wrapper struct for all recognizable docker cli
options, and separate logic of creating these options to a different
common function.

This also enables us to overcome gmock's 10 argument limit.

No logic change happens in this refactoring patch.


Diffs (updated)
-----

  src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
  src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
  src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
  src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
  src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
  src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
  src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
  src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 

Diff: https://reviews.apache.org/r/54821/diff/


Testing
-------

`make check` with ROOT and DOCKER filter.


Thanks,

Zhitao Li


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Zhitao Li <zh...@gmail.com>.

> On Feb. 3, 2017, 7:28 p.m., Jie Yu wrote:
> > This is a partial review. Is there way to run this in your staging/prod environment. This patch touches the core part of Docker containerizer which we don't have a good test coverage, and has a very board impact.

I will run all tests with a `DOCKER` filter, and also use `mesos-execute` with docker containerizer to test this out.

If we want more testing, I can try to build an actual binary to test it out in our staging environment but it'll take sometime to get it done, and even that doesn't test every combinations of arguments.


> On Feb. 3, 2017, 7:28 p.m., Jie Yu wrote:
> > src/docker/docker.hpp, line 194
> > <https://reviews.apache.org/r/54821/diff/7/?file=1623559#file1623559line194>
> >
> >     I'd try to avoid mesos:: prefixed type in this file. Can this just be a map?

This could be a `vector<string>`, but a `map` would destroy initial order, which used to be sensitive to docker daemon.


> On Feb. 3, 2017, 7:28 p.m., Jie Yu wrote:
> > src/docker/docker.cpp, line 527
> > <https://reviews.apache.org/r/54821/diff/7/?file=1623560#file1623560line527>
> >
> >     This changes the logic? Where is MIN_MEMORY?

Adding the previous logic back right now.


- Zhitao


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164143
-----------------------------------------------------------


On Feb. 3, 2017, 6:55 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 3, 2017, 6:55 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Jie Yu <yu...@gmail.com>.

> On Feb. 3, 2017, 7:28 p.m., Jie Yu wrote:
> > src/docker/docker.hpp, line 194
> > <https://reviews.apache.org/r/54821/diff/7/?file=1623559#file1623559line194>
> >
> >     I'd try to avoid mesos:: prefixed type in this file. Can this just be a map?
> 
> Zhitao Li wrote:
>     This could be a `vector<string>`, but a `map` would destroy initial order, which used to be sensitive to docker daemon.

Can you give an example which flags are order sensitive. I am just curious.

If that's the case, use LinkedHashMap in stout?


- Jie


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164143
-----------------------------------------------------------


On Feb. 3, 2017, 6:55 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 3, 2017, 6:55 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Zhitao Li <zh...@gmail.com>.

> On Feb. 3, 2017, 7:28 p.m., Jie Yu wrote:
> > src/docker/docker.hpp, line 194
> > <https://reviews.apache.org/r/54821/diff/7/?file=1623559#file1623559line194>
> >
> >     I'd try to avoid mesos:: prefixed type in this file. Can this just be a map?
> 
> Zhitao Li wrote:
>     This could be a `vector<string>`, but a `map` would destroy initial order, which used to be sensitive to docker daemon.
> 
> Jie Yu wrote:
>     Can you give an example which flags are order sensitive. I am just curious.
>     
>     If that's the case, use LinkedHashMap in stout?

`--volumeDriver` and `--volume` are two options whose order has to be maintained.

Another reason not to use map is that certain options can be repeating (i.e. `--label` or `--env`. Using map would be a bit awkward.


- Zhitao


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164143
-----------------------------------------------------------


On Feb. 4, 2017, 12:20 a.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 4, 2017, 12:20 a.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>


Re: Review Request 54821: Refactored Docker::run() to make it only aware of docker cli options.

Posted by Jie Yu <yu...@gmail.com>.
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54821/#review164143
-----------------------------------------------------------



This is a partial review. Is there way to run this in your staging/prod environment. This patch touches the core part of Docker containerizer which we don't have a good test coverage, and has a very board impact.


src/docker/docker.hpp (line 194)
<https://reviews.apache.org/r/54821/#comment235730>

    I'd try to avoid mesos:: prefixed type in this file. Can this just be a map?



src/docker/docker.cpp (line 516)
<https://reviews.apache.org/r/54821/#comment235731>

    This changes the logic? Where is MIN_MEMORY?


- Jie Yu


On Feb. 3, 2017, 6:55 p.m., Zhitao Li wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54821/
> -----------------------------------------------------------
> 
> (Updated Feb. 3, 2017, 6:55 p.m.)
> 
> 
> Review request for mesos, Xiaojian Huang, haosdent huang, and Jie Yu.
> 
> 
> Bugs: MESOS-6808
>     https://issues.apache.org/jira/browse/MESOS-6808
> 
> 
> Repository: mesos
> 
> 
> Description
> -------
> 
> This patch creates a wrapper struct for all recognizable docker cli
> options, and separate logic of creating these options to a different
> common function.
> 
> This also enables us to overcome gmock's 10 argument limit.
> 
> No logic change happens in this refactoring patch.
> 
> 
> Diffs
> -----
> 
>   src/docker/docker.hpp 9093371afc8ea792ba94f61c6875703e547ea6b0 
>   src/docker/docker.cpp b63b060ba1c1d39dc1702368cf667831edbd39bd 
>   src/docker/executor.cpp d8c72b081fb9a37b3927b73cea3b47956a076691 
>   src/slave/containerizer/docker.cpp 886528f0f706ef2a3c07246406f3ee1ebc45565d 
>   src/tests/containerizer/docker_containerizer_tests.cpp 31d63b1f239055d82470ace9024b584a2096dce4 
>   src/tests/containerizer/docker_tests.cpp 9667d434486c1832f180a297a39a3d5dae6a26bd 
>   src/tests/mock_docker.hpp 829a760d54ad8c7b88256ae5df4c88c9fb18df71 
>   src/tests/mock_docker.cpp 02b6065a01e7e52b0edb38676dfb1bb475584502 
> 
> Diff: https://reviews.apache.org/r/54821/diff/
> 
> 
> Testing
> -------
> 
> `make check` with ROOT and DOCKER filter.
> 
> 
> Thanks,
> 
> Zhitao Li
> 
>