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/04/07 01:20:44 UTC
[1/2] mesos git commit: Fixed flakiness in
PersistentVolumeTest.AccessPersistentVolume.
Repository: mesos
Updated Branches:
refs/heads/master 5442cad09 -> b1dbc63f3
Fixed flakiness in PersistentVolumeTest.AccessPersistentVolume.
Review: https://reviews.apache.org/r/45818/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b1dbc63f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b1dbc63f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b1dbc63f
Branch: refs/heads/master
Commit: b1dbc63f374174a4b0bb418e1fa21fa76366dffc
Parents: 365c326
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 6 16:20:29 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 6 16:20:40 2016 -0700
----------------------------------------------------------------------
src/tests/persistent_volume_tests.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b1dbc63f/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index ade1c08..d246f35 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -782,6 +782,12 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
.WillOnce(FutureArg<1>(&status1))
.WillOnce(FutureArg<1>(&status2));
+ Future<Nothing> statusUpdateAcknowledgement1 =
+ FUTURE_DISPATCH(slave.get()->pid, &Slave::_statusUpdateAcknowledgement);
+
+ Future<Nothing> statusUpdateAcknowledgement2 =
+ FUTURE_DISPATCH(slave.get()->pid, &Slave::_statusUpdateAcknowledgement);
+
driver.acceptOffers(
{offer.id()},
{CREATE(volume),
@@ -820,6 +826,13 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
EXPECT_SOME_EQ("abc\n", os::read(filePath1));
+ // Ensure that the slave has received the acknowledgment of the
+ // TASK_FINISHED status update; this implies the acknowledgement
+ // reached the master, which is necessary for the task's resources
+ // to be recovered by the allocator.
+ AWAIT_READY(statusUpdateAcknowledgement1);
+ AWAIT_READY(statusUpdateAcknowledgement2);
+
// Expect an offer containing the persistent volume.
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
[2/2] mesos git commit: Cleaned up some comments.
Posted by ji...@apache.org.
Cleaned up some comments.
Review: https://reviews.apache.org/r/45817/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/365c326f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/365c326f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/365c326f
Branch: refs/heads/master
Commit: 365c326f7aa21606af1e6bb18a44e19073fed5d9
Parents: 5442cad
Author: Neil Conway <ne...@gmail.com>
Authored: Wed Apr 6 16:20:25 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Wed Apr 6 16:20:40 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.hpp | 4 ++--
src/tests/persistent_volume_tests.cpp | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/365c326f/src/slave/containerizer/mesos/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.hpp b/src/slave/containerizer/mesos/containerizer.hpp
index a6e3a8b..13399f0 100644
--- a/src/slave/containerizer/mesos/containerizer.hpp
+++ b/src/slave/containerizer/mesos/containerizer.hpp
@@ -310,13 +310,13 @@ private:
// We keep track of the future that is waiting for all the
// isolators' prepare futures, so that destroy will only start
- // calling cleanup after all isolators has finished preparing.
+ // calling cleanup after all isolators have finished preparing.
process::Future<std::list<Option<mesos::slave::ContainerLaunchInfo>>>
launchInfos;
// We keep track of the future that is waiting for all the
// isolators' isolate futures, so that destroy will only start
- // calling cleanup after all isolators has finished isolating.
+ // calling cleanup after all isolators have finished isolating.
process::Future<std::list<Nothing>> isolation;
// We keep track of any limitations received from each isolator so we can
http://git-wip-us.apache.org/repos/asf/mesos/blob/365c326f/src/tests/persistent_volume_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/persistent_volume_tests.cpp b/src/tests/persistent_volume_tests.cpp
index 764fa84..ade1c08 100644
--- a/src/tests/persistent_volume_tests.cpp
+++ b/src/tests/persistent_volume_tests.cpp
@@ -436,7 +436,7 @@ TEST_P(PersistentVolumeTest, ResourcesCheckpointing)
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();
@@ -501,7 +501,7 @@ TEST_P(PersistentVolumeTest, PreparePersistentVolume)
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();
@@ -568,7 +568,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
Future<vector<Offer>> offers1;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers1))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();
@@ -610,7 +610,7 @@ TEST_P(PersistentVolumeTest, MasterFailover)
Future<vector<Offer>> offers2;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers2))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
master = StartMaster(masterFlags);
ASSERT_SOME(master);
@@ -663,7 +663,7 @@ TEST_P(PersistentVolumeTest, IncompatibleCheckpointedResources)
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();
@@ -751,7 +751,7 @@ TEST_P(PersistentVolumeTest, AccessPersistentVolume)
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();
@@ -902,7 +902,7 @@ TEST_P(PersistentVolumeTest, SlaveRecovery)
Future<vector<Offer>> offers;
EXPECT_CALL(sched, resourceOffers(&driver, _))
.WillOnce(FutureArg<1>(&offers))
- .WillRepeatedly(Return()); // Ignore subsequent offers.
+ .WillRepeatedly(Return()); // Ignore subsequent offers.
driver.start();