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 07:25:26 UTC
svn commit: r1131751 - /incubator/mesos/trunk/src/master.cpp
Author: benh
Date: Sun Jun 5 05:25:25 2011
New Revision: 1131751
URL: http://svn.apache.org/viewvc?rev=1131751&view=rev
Log:
Making the master testable requires at least setting isFT to false, not sure if this code ever got tested via alltests before, but it's working now!
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=1131751&r1=1131750&r2=1131751&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.cpp (original)
+++ incubator/mesos/trunk/src/master.cpp Sun Jun 5 05:25:25 2011
@@ -111,7 +111,7 @@ public:
Master::Master(const string &zk)
- : masterDetector(NULL), nextFrameworkId(0), nextSlaveId(0),
+ : isFT(false), masterDetector(NULL), nextFrameworkId(0), nextSlaveId(0),
nextSlotOfferId(0), allocatorType("simple"), masterId(0)
{
if (zk != "") {
@@ -129,7 +129,7 @@ Master::Master(const string &zk)
Master::Master(const string& _allocatorType, const string &zk)
- : masterDetector(NULL), nextFrameworkId(0), nextSlaveId(0),
+ : isFT(false), masterDetector(NULL), nextFrameworkId(0), nextSlaveId(0),
nextSlotOfferId(0), allocatorType(_allocatorType), masterId(0)
{
if (zk != "") {
@@ -304,6 +304,7 @@ void Master::operator () ()
unpack<GOT_MASTER_SEQ>(mySeq);
masterId = lexical_cast<long>(mySeq);
LOG(INFO) << "Master ID:" << masterId;
+ waitingForSeq = false;
break;
}
}