> On May 27, 2015, 5:50 p.m., Benjamin Hindman wrote: > > src/docker/executor.cpp, line 154 > > <https://reviews.apache.org/r/34654/diff/2/?file=971807#file971807line154> > > > > Why back to MergeFrom instead of CopyFrom?
Ah sorry merge conflict! > On May 27, 2015, 5:50 p.m., Benjamin Hindman wrote: > > src/docker/executor.cpp, line 198 > > <https://reviews.apache.org/r/34654/diff/2/?file=971807#file971807line198> > > > > You should be able to drop the parameter all together, in the lambdas > > below as well. Can you give that a shot and let me know if it doesn't work > > please? This gives me a build error, will be leaving them as-is for now. > On May 27, 2015, 5:50 p.m., Benjamin Hindman wrote: > > src/docker/docker.hpp, lines 56-57 > > <https://reviews.apache.org/r/34654/diff/2/?file=971805#file971805line56> > > > > My expectation based on our design discussions was that we were going > > to save just the JSON and then send the stringified version of the JSON > > back in the 'TaskStatus.data'. While saving the output from 'docker > > inspect' effectively does the same thing it seems weird to pass two > > parameters to the create function that represent the same data. Why not > > just hold on to the JSON as a field 'json' here and then stringify that in > > docker/executor.cpp? The thing that was especially wierd to me about the > > current code is that it relies on the invariant in our 'docker inspect' > > that the output only has an array of 1 JSON object which isn't captured in > > the code or as an invariant and if ever changed could cause a subtle bug. > > Maybe I'm missing something though? The current docker inspect output is in this format [{...}] so I'm not sure if we should extract it the single json object, and I'm not aware why it's wrapped in a array too. I tend to want to stay with whatever that docker client outputs since we no longer control the format. I think I'll follow what you said, but hold on to a JSON::Array and stringify it when we need a string representation. - Timothy ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/34654/#review85390 ----------------------------------------------------------- On May 26, 2015, 6:14 p.m., Timothy Chen wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/34654/ > ----------------------------------------------------------- > > (Updated May 26, 2015, 6:14 p.m.) > > > Review request for mesos and Benjamin Hindman. > > > Bugs: MESOS-2368 > https://issues.apache.org/jira/browse/MESOS-2368 > > > Repository: mesos > > > Description > ------- > > Send docker inspect output with TaskStatus data. > > > Diffs > ----- > > src/docker/docker.hpp d06c73a > src/docker/docker.cpp ee74da5 > src/docker/executor.cpp 075c6b5 > src/tests/docker_containerizer_tests.cpp 7524803 > > Diff: https://reviews.apache.org/r/34654/diff/ > > > Testing > ------- > > make check > > > Thanks, > > Timothy Chen > >
