You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2011/06/05 08:42:16 UTC
svn commit: r1131962 - /incubator/mesos/trunk/src/master.cpp
Author: benh
Date: Sun Jun 5 06:42:15 2011
New Revision: 1131962
URL: http://svn.apache.org/viewvc?rev=1131962&view=rev
Log:
Bugs in manual merge.
Modified:
incubator/mesos/trunk/src/master.cpp
Modified: incubator/mesos/trunk/src/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master.cpp?rev=1131962&r1=1131961&r2=1131962&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.cpp (original)
+++ incubator/mesos/trunk/src/master.cpp Sun Jun 5 06:42:15 2011
@@ -669,7 +669,7 @@ void Master::operator () ()
} else {
foreachpair (_, Framework *framework, frameworks) {
if (framework->failoverTimer != NULL &&
- framework->failoverTimer->getPID() == from()) {
+ framework->failoverTimer->self() == from()) {
LOG(INFO) << "Lost framework failover timer, removing framework "
<< framework;
removeFramework(framework);
@@ -780,7 +780,7 @@ void Master::processOfferReply(SlotOffer
idsInResponse.find(t.taskId) != idsInResponse.end()) {
terminateFramework(framework, 0,
"Duplicate task ID: " + lexical_cast<string>(t.taskId));
- return;
+ return;
}
idsInResponse.insert(t.taskId);
}