> On Dec. 17, 2016, 12:09 a.m., Jie Yu wrote:
> > src/slave/containerizer/mesos/isolators/network/cni/cni.cpp, lines 250-252
> > <https://reviews.apache.org/r/54717/diff/3/?file=1587921#file1587921line250>
> >
> > In fact, can we just merge this with `getNetwork` below. We have a
> > single helper `getNetworkConfigJson` which will refresh the cache if
> > necessary.
>
> Avinash sridharan wrote:
> I was thinking about that as well. The only reason I kept them separate
> was because I was using `getNetworkConfigJSON` as is in `detach` ? In
> `detach` we are relying on the checkpointed configuration and not the
> configuration learnt from `networkConfigs.`
Would it make sense if we make the `path` and `option` so the helper would be:
```
Try<JSON::Object> NetworkCniIsolatorProcess::getNetworkConfigJSON(
251
const string& network,
252
Option<string> path = None())
```
If path is not set then we will basically search the `networkConfigs` else we
will simply get the JSON config from the path. We can then have a single helper
function here.
- Avinash
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/54717/#review159519
-----------------------------------------------------------
On Dec. 17, 2016, 8:19 a.m., Avinash sridharan wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/54717/
> -----------------------------------------------------------
>
> (Updated Dec. 17, 2016, 8:19 a.m.)
>
>
> Review request for mesos, Jie Yu and Qian Zhang.
>
>
> Bugs: MESOS-6567
> https://issues.apache.org/jira/browse/MESOS-6567
>
>
> Repository: mesos
>
>
> Description
> -------
>
> If the `network/cni` isolator sees a cache-miss during the `prepare`
> phase, it will try to look for the CNI network on disk before giving
> up. This allows for the dynamic addition of CNI networks without the
> need for agent restart.
>
> During `isolate` or `prepare` if for a given network, the isolator is
> unable to read the corresponding configuration file, or finds and
> error in the existing configuration file, it will remove the network
> from the in-memory cache. This allows dynamic deletion of CNI
> configurations from the `network/cni` isolator.
>
>
> Diffs
> -----
>
> src/slave/containerizer/mesos/isolators/network/cni/cni.hpp
> b8fc755a8dd4757d904f7e97a71d3cf7f29d2033
> src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
> ddb4d33e9ecd0ffd118e8e68cb7ec90346b08049
>
> Diff: https://reviews.apache.org/r/54717/diff/
>
>
> Testing
> -------
>
> make check
>
> Manual testing with addition of a non-existent CNI configuration.
>
>
> Thanks,
>
> Avinash sridharan
>
>
