You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/20 06:50:44 UTC
[1/2] mesos git commit: Fixed bug in appc cache's find logic.
Repository: mesos
Updated Branches:
refs/heads/master b6ac19bf5 -> 2ec9aa3f4
Fixed bug in appc cache's find logic.
Review: https://reviews.apache.org/r/43775/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6c54067d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6c54067d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6c54067d
Branch: refs/heads/master
Commit: 6c54067df5f4df0f544001957120edd8246d9862
Parents: b6ac19b
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Fri Feb 19 21:46:08 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 19 21:46:08 2016 -0800
----------------------------------------------------------------------
src/slave/containerizer/mesos/provisioner/appc/cache.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/6c54067d/src/slave/containerizer/mesos/provisioner/appc/cache.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/appc/cache.cpp b/src/slave/containerizer/mesos/provisioner/appc/cache.cpp
index ff392ef..e075e48 100644
--- a/src/slave/containerizer/mesos/provisioner/appc/cache.cpp
+++ b/src/slave/containerizer/mesos/provisioner/appc/cache.cpp
@@ -110,7 +110,7 @@ Option<string> Cache::find(const Image::Appc& image) const
// Create a cache key from image.
Cache::Key key(image);
- if (imageIds.contains(key)) {
+ if (!imageIds.contains(key)) {
return None();
}
[2/2] mesos git commit: Increased the timeout in disk-heavy
FilesystemIsolatorTests.
Posted by ji...@apache.org.
Increased the timeout in disk-heavy FilesystemIsolatorTests.
Increases by 2x the amount of wait time in the
`LinuxFilesystemIsolatorTest.ROOT_ImageInVolumeWithRootFilesystem` and
`LinuxFilesystemIsolatorTest.ROOT_MultipleContainers` tests.
Review: https://reviews.apache.org/r/43793/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2ec9aa3f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2ec9aa3f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2ec9aa3f
Branch: refs/heads/master
Commit: 2ec9aa3f4331806fb405cb06ecc0c7c2b0123de1
Parents: 6c54067
Author: Joseph Wu <jo...@mesosphere.io>
Authored: Fri Feb 19 21:50:22 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Feb 19 21:50:22 2016 -0800
----------------------------------------------------------------------
src/tests/containerizer/filesystem_isolator_tests.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2ec9aa3f/src/tests/containerizer/filesystem_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/filesystem_isolator_tests.cpp b/src/tests/containerizer/filesystem_isolator_tests.cpp
index d8c3c81..6a60962 100644
--- a/src/tests/containerizer/filesystem_isolator_tests.cpp
+++ b/src/tests/containerizer/filesystem_isolator_tests.cpp
@@ -1051,7 +1051,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_ImageInVolumeWithRootFilesystem)
// Wait for the launch to complete.
// Need to wait for Rootfs copy.
- AWAIT_READY_FOR(launch, Seconds(120));
+ AWAIT_READY_FOR(launch, Seconds(240));
// Wait on the container.
Future<containerizer::Termination> wait =
@@ -1135,7 +1135,7 @@ TEST_F(LinuxFilesystemIsolatorTest, ROOT_MultipleContainers)
// Wait for the launch to complete.
// Need to wait for Rootfs copy.
- AWAIT_READY_FOR(launch1, Seconds(60));
+ AWAIT_READY_FOR(launch1, Seconds(120));
// Now launch container 2 which will copy the host mount table with
// container 1's work directory mount in it.