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 11:29:03 UTC
svn commit: r1132348 - /incubator/mesos/trunk/src/master/master.cpp
Author: benh
Date: Sun Jun 5 09:29:02 2011
New Revision: 1132348
URL: http://svn.apache.org/viewvc?rev=1132348&view=rev
Log:
Updated Master::getState similar to changes in Slave::getState (see a previous commit).
Modified:
incubator/mesos/trunk/src/master/master.cpp
Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1132348&r1=1132347&r2=1132348&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun 5 09:29:02 2011
@@ -253,14 +253,14 @@ Promise<state::MasterState*> Master::get
Resources resources(s->info.resources());
Resource::Scalar cpus;
Resource::Scalar mem;
- cpus.set_value(-1);
- mem.set_value(-1);
+ cpus.set_value(0);
+ mem.set_value(0);
cpus = resources.getScalar("cpus", cpus);
mem = resources.getScalar("mem", mem);
state::Slave* slave =
new state::Slave(s->slaveId.value(), s->info.hostname(),
- s->info.public_hostname(), cpus.value(),
+ s->info.public_hostname() + , cpus.value(),
mem.value(), s->connectTime);
state->slaves.push_back(slave);
@@ -270,8 +270,8 @@ Promise<state::MasterState*> Master::get
Resources resources(f->resources);
Resource::Scalar cpus;
Resource::Scalar mem;
- cpus.set_value(-1);
- mem.set_value(-1);
+ cpus.set_value(0);
+ mem.set_value(0);
cpus = resources.getScalar("cpus", cpus);
mem = resources.getScalar("mem", mem);
@@ -286,8 +286,8 @@ Promise<state::MasterState*> Master::get
Resources resources(t->resources());
Resource::Scalar cpus;
Resource::Scalar mem;
- cpus.set_value(-1);
- mem.set_value(-1);
+ cpus.set_value(0);
+ mem.set_value(0);
cpus = resources.getScalar("cpus", cpus);
mem = resources.getScalar("mem", mem);
@@ -308,8 +308,8 @@ Promise<state::MasterState*> Master::get
Resources resources(r.resources);
Resource::Scalar cpus;
Resource::Scalar mem;
- cpus.set_value(-1);
- mem.set_value(-1);
+ cpus.set_value(0);
+ mem.set_value(0);
cpus = resources.getScalar("cpus", cpus);
mem = resources.getScalar("mem", mem);