----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/43032/#review120689 -----------------------------------------------------------
src/docker/docker.hpp (line 269) <https://reviews.apache.org/r/43032/#comment182152> What about `Version dockerVersion` src/docker/docker.cpp (lines 123 - 127) <https://reviews.apache.org/r/43032/#comment182150> What about update here as: // Get docker version. Future<Version> version = this->version(); if (!version.await(DOCKER_VERSION_WAIT_TIMEOUT)) { return Error("Timed out getting docker version"); } if (version.isFailed()) { return Error("Failed to get docker version: " + version.failure()); } dockerVersion = version.get(); src/docker/docker.cpp (lines 144 - 172) <https://reviews.apache.org/r/43032/#comment182153> why update this function, this can also get the docker version, why do you want to update the docker version to string? src/docker/docker.cpp (lines 229 - 248) <https://reviews.apache.org/r/43032/#comment182151> What about as this: Try<Nothing> Docker::validateVersion(const Version& minVersion) const { if (dockerVersion < minVersion) { string msg = "Insufficient version '" + stringify(version.get()) + "' of Docker. Please upgrade to >=' " + stringify(minVersion) + "'"; return Error(msg); } return Nothing(); } - Guangya Liu On 二月 24, 2016, 2:10 p.m., Abhishek Dasgupta wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/43032/ > ----------------------------------------------------------- > > (Updated 二月 24, 2016, 2:10 p.m.) > > > Review request for mesos, Guangya Liu, haosdent huang, Jie Yu, and Timothy > Chen. > > > Bugs: MESOS-4446 > https://issues.apache.org/jira/browse/MESOS-4446 > > > Repository: mesos > > > Description > ------- > > Set Docker labels based on TaskInfo labels. > > > Diffs > ----- > > src/docker/docker.hpp 7802f23585121d41c738cc28f6bcfa5e6dc9e972 > src/docker/docker.cpp 52728707d985517e57525af7e470ccb468039373 > src/docker/executor.cpp 1921d4a1ce3c45b4e2f81f0ef5914d5830da6866 > src/slave/containerizer/docker.cpp 0303208083f1ebd9f9df51178fd91ee4c763f61c > src/tests/containerizer/docker_containerizer_tests.cpp > a299c9e0744b5657984e5bb0afbe4874a266ddb6 > src/tests/containerizer/docker_tests.cpp > 620819330847a10d9dcd817968df9d2b180a9a29 > src/tests/health_check_tests.cpp 59ef31970af2d255abe169dfbc2e6e0314d29e9a > src/tests/mesos.hpp 242a11658c0a9ba4caced9b2b2bdbcb921f7fdd0 > src/tests/mesos.cpp e0f641c6828833de13a0a233e39ff6dc3f343d5c > > Diff: https://reviews.apache.org/r/43032/diff/ > > > Testing > ------- > > The following test cases in docker_tests have been changed: > DockerTest.ROOT_DOCKER_interface is updated to check labels are passed to > docker run command through arguments. > > > Thanks, > > Abhishek Dasgupta > >
