You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/11/05 23:22:54 UTC
[1/2] git commit: Fixed a pid comparison in the scheduler driver.
Updated Branches:
refs/heads/master 063376d3a -> e3df54c99
Fixed a pid comparison in the scheduler driver.
Review: https://reviews.apache.org/r/15065
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e3df54c9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e3df54c9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e3df54c9
Branch: refs/heads/master
Commit: e3df54c991710fe64c8758f4933835dd2365ccb6
Parents: 8864014
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Tue Oct 29 15:03:10 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Nov 5 14:19:26 2013 -0800
----------------------------------------------------------------------
src/sched/sched.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e3df54c9/src/sched/sched.cpp
----------------------------------------------------------------------
diff --git a/src/sched/sched.cpp b/src/sched/sched.cpp
index 0422068..3abe72f 100644
--- a/src/sched/sched.cpp
+++ b/src/sched/sched.cpp
@@ -552,7 +552,7 @@ protected:
// we want to avoid sending the ACK if the driver was aborted when we
// made the statusUpdate call. This works because, the 'abort' message will
// be enqueued before the ACK message is processed.
- if (pid > 0) {
+ if (pid != UPID()) {
dispatch(self(), &Self::statusUpdateAcknowledgement, update, pid);
}
}
[2/2] git commit: Removed an incorrect TODO.
Posted by bm...@apache.org.
Removed an incorrect TODO.
Review: https://reviews.apache.org/r/15044
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/88640146
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/88640146
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/88640146
Branch: refs/heads/master
Commit: 88640146a630a3d31ea3b4e5d92c15299f68eead
Parents: 063376d
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Fri Oct 25 11:48:34 2013 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Nov 5 14:19:26 2013 -0800
----------------------------------------------------------------------
3rdparty/libprocess/src/process.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/88640146/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 8102636..9952dd1 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -2983,7 +2983,7 @@ Timer Timer::create(
const Duration& duration,
const lambda::function<void(void)>& thunk)
{
- static uint64_t id = 1; // Start at 1 since Timer() instances start with 0.
+ static uint64_t id = 1; // Start at 1 since Timer() instances use id 0.
// Assumes Clock::now() does Clock::now(__process__).
Timeout timeout = Timeout::in(duration);
@@ -3020,8 +3020,6 @@ bool Timer::cancel(const Timer& timer)
// Check if the timeout is still pending, and if so, erase it. In
// addition, erase an empty list if we just removed the last
// timeout.
- // TODO(benh): If two timers are created with the same timeout,
- // this will erase *both*. Fix this!
Time time = timer.timeout().time();
if (timeouts->count(time) > 0) {
canceled = true;