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:38:22 UTC
svn commit: r1131830 - /incubator/mesos/trunk/src/master.cpp
Author: benh
Date: Sun Jun 5 05:38:21 2011
New Revision: 1131830
URL: http://svn.apache.org/viewvc?rev=1131830&view=rev
Log:
Fixing indentation from my last commit (and in a few more places).
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=1131830&r1=1131829&r2=1131830&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master.cpp (original)
+++ incubator/mesos/trunk/src/master.cpp Sun Jun 5 05:38:21 2011
@@ -309,29 +309,29 @@ void Master::operator () ()
framework->name,
framework->user,
framework->executorInfo,
- failover);
+ failover);
if (framework->id == "") {
- LOG(ERROR) << "Framework reconnect/failover without an id!";
- send(framework->pid, pack<M2F_ERROR>(1, "Missing framework id"));
- delete framework;
- break;
+ LOG(ERROR) << "Framework reconnect/failover without an id!";
+ send(framework->pid, pack<M2F_ERROR>(1, "Missing framework id"));
+ delete framework;
+ break;
}
LOG(INFO) << "Reregistering " << framework << " at " << framework->pid;
if (frameworks.find(framework->id) != frameworks.end()) {
- if (failover) {
- replaceFramework(frameworks[framework->id], framework);
- } else {
- LOG(INFO) << "Framework reregistering with an already used id!";
- send(framework->pid, pack<M2F_ERROR>(1, "Framework id in use"));
- delete framework;
- break;
- }
+ if (failover) {
+ replaceFramework(frameworks[framework->id], framework);
+ } else {
+ LOG(INFO) << "Framework reregistering with an already used id!";
+ send(framework->pid, pack<M2F_ERROR>(1, "Framework id in use"));
+ delete framework;
+ break;
+ }
} else {
- addFramework(framework);
- updateFrameworkTasks();
+ addFramework(framework);
+ updateFrameworkTasks();
}
break;
}
@@ -342,7 +342,7 @@ void Master::operator () ()
LOG(INFO) << "Asked to unregister framework " << fid;
Framework *framework = lookupFramework(fid);
if (framework != NULL)
- removeFramework(framework);
+ removeFramework(framework);
break;
}
@@ -354,17 +354,17 @@ void Master::operator () ()
unpack<F2M_SLOT_OFFER_REPLY>(fid, oid, tasks, params);
Framework *framework = lookupFramework(fid);
if (framework != NULL) {
- SlotOffer *offer = lookupSlotOffer(oid);
- if (offer != NULL) {
- processOfferReply(offer, tasks, params);
- } else {
- // The slot offer is gone, meaning that we rescinded it or that
- // the slave was lost; immediately report any tasks in it as lost
- foreach (TaskDescription &t, tasks) {
- send(framework->pid,
- pack<M2F_STATUS_UPDATE>(t.taskId, TASK_LOST, ""));
- }
- }
+ SlotOffer *offer = lookupSlotOffer(oid);
+ if (offer != NULL) {
+ processOfferReply(offer, tasks, params);
+ } else {
+ // The slot offer is gone, meaning that we rescinded it or that
+ // the slave was lost; immediately report any tasks in it as lost
+ foreach (TaskDescription &t, tasks) {
+ send(framework->pid,
+ pack<M2F_STATUS_UPDATE>(t.taskId, TASK_LOST, ""));
+ }
+ }
}
break;
}
@@ -374,9 +374,9 @@ void Master::operator () ()
unpack<F2M_REVIVE_OFFERS>(fid);
Framework *framework = lookupFramework(fid);
if (framework != NULL) {
- LOG(INFO) << "Reviving offers for " << framework;
- framework->slaveFilter.clear();
- allocator->offersRevived(framework);
+ LOG(INFO) << "Reviving offers for " << framework;
+ framework->slaveFilter.clear();
+ allocator->offersRevived(framework);
}
break;
}
@@ -387,11 +387,11 @@ void Master::operator () ()
unpack<F2M_KILL_TASK>(fid, tid);
Framework *framework = lookupFramework(fid);
if (framework != NULL) {
- Task *task = framework->lookupTask(tid);
- if (task != NULL) {
- LOG(INFO) << "Asked to kill " << task << " by its framework";
- killTask(task);
- }
+ Task *task = framework->lookupTask(tid);
+ if (task != NULL) {
+ LOG(INFO) << "Asked to kill " << task << " by its framework";
+ killTask(task);
+ }
}
break;
}
@@ -401,7 +401,7 @@ void Master::operator () ()
Slave *slave = new Slave(from(), slaveId);
unpack<S2M_REGISTER_SLAVE>(slave->hostname, slave->publicDns,
- slave->resources);
+ slave->resources);
LOG(INFO) << "Registering " << slave << " at " << slave->pid;
slaves[slave->id] = slave;
pidToSid[slave->pid] = slave->id;
@@ -425,7 +425,7 @@ void Master::operator () ()
foreach(Task &ti, taskVec) {
Task *tip = new Task(ti);
- slave->addTask(tip);
+ slave->addTask(tip);
updateFrameworkTasks(tip);
}
@@ -454,7 +454,7 @@ void Master::operator () ()
LOG(INFO) << "Asked to unregister slave " << sid;
Slave *slave = lookupSlave(sid);
if (slave != NULL)
- removeSlave(slave);
+ removeSlave(slave);
break;
}
@@ -468,8 +468,8 @@ void Master::operator () ()
unpack<S2M_FT_STATUS_UPDATE>(sid, fid, tid, state, data);
DLOG(INFO) << "FT: prepare relay seq:"<< seq() << " from: "<< from();
if (Slave *slave = lookupSlave(sid)) {
- if (Framework *framework = lookupFramework(fid)) {
- // Pass on the status update to the framework.
+ if (Framework *framework = lookupFramework(fid)) {
+ // Pass on the status update to the framework.
forward(framework->pid);
if (duplicate()) {
LOG(WARNING) << "FT: Locally ignoring duplicate message with id:" << seq();
@@ -487,7 +487,7 @@ void Master::operator () ()
removeTask(task, TRR_TASK_ENDED);
}
}
- } else
+ } else
DLOG(INFO) << "S2M_STATUS_UPDATE error: couldn't lookup framework id" << fid;
} else
DLOG(INFO) << "S2M_STATUS_UPDATE error: couldn't lookup slave id" << sid;
@@ -503,26 +503,26 @@ void Master::operator () ()
string data;
unpack<S2M_STATUS_UPDATE>(sid, fid, tid, state, data);
if (Slave *slave = lookupSlave(sid)) {
- if (Framework *framework = lookupFramework(fid)) {
- // Pass on the status update to the framework
- send(framework->pid, pack<M2F_STATUS_UPDATE>(tid, state, data));
- // Update the task state locally
- Task *task = slave->lookupTask(fid, tid);
- if (task != NULL) {
- LOG(INFO) << "Status update: " << task << " is in state " << state;
- task->state = state;
- // Remove the task if it finished or failed
- if (state == TASK_FINISHED || state == TASK_FAILED ||
- state == TASK_KILLED || state == TASK_LOST) {
- LOG(INFO) << "Removing " << task << " because it's done";
- removeTask(task, TRR_TASK_ENDED);
- }
- }
- } else
+ if (Framework *framework = lookupFramework(fid)) {
+ // Pass on the status update to the framework
+ send(framework->pid, pack<M2F_STATUS_UPDATE>(tid, state, data));
+ // Update the task state locally
+ Task *task = slave->lookupTask(fid, tid);
+ if (task != NULL) {
+ LOG(INFO) << "Status update: " << task << " is in state " << state;
+ task->state = state;
+ // Remove the task if it finished or failed
+ if (state == TASK_FINISHED || state == TASK_FAILED ||
+ state == TASK_KILLED || state == TASK_LOST) {
+ LOG(INFO) << "Removing " << task << " because it's done";
+ removeTask(task, TRR_TASK_ENDED);
+ }
+ }
+ } else
DLOG(INFO) << "S2M_STATUS_UPDATE error: couldn't lookup framework id" << fid;
} else
DLOG(INFO) << "S2M_STATUS_UPDATE error: couldn't lookup slave id" << sid;
- break;
+ break;
}
case S2M_FRAMEWORK_MESSAGE: {
@@ -532,9 +532,9 @@ void Master::operator () ()
unpack<S2M_FRAMEWORK_MESSAGE>(sid, fid, message);
Slave *slave = lookupSlave(sid);
if (slave != NULL) {
- Framework *framework = lookupFramework(fid);
- if (framework != NULL)
- send(framework->pid, pack<M2F_FRAMEWORK_MESSAGE>(message));
+ Framework *framework = lookupFramework(fid);
+ if (framework != NULL)
+ send(framework->pid, pack<M2F_FRAMEWORK_MESSAGE>(message));
}
break;
}
@@ -548,32 +548,32 @@ void Master::operator () ()
if (slave != NULL) {
Framework *framework = lookupFramework(fid);
if (framework != NULL) {
- // TODO(benh): Send the framework it's executor's exit status?
+ // TODO(benh): Send the framework it's executor's exit status?
if (status == -1) {
LOG(INFO) << "Executor on " << slave << " (" << slave->hostname
- << ") disconnected";
+ << ") disconnected";
} else {
LOG(INFO) << "Executor on " << slave << " (" << slave->hostname
- << ") exited with status " << status;
+ << ") exited with status " << status;
}
- // Collect all the lost tasks for this framework.
- set<Task*> tasks;
- foreachpair (_, Task* task, framework->tasks)
- if (task->slaveId == slave->id)
- tasks.insert(task);
-
- // Tell the framework they have been lost and remove them.
- foreach (Task* task, tasks) {
- send(framework->pid, pack<M2F_STATUS_UPDATE>(task->id, TASK_LOST,
- task->message));
-
- LOG(INFO) << "Removing " << task << " because of lost executor";
- removeTask(task, TRR_EXECUTOR_LOST);
- }
+ // Collect all the lost tasks for this framework.
+ set<Task*> tasks;
+ foreachpair (_, Task* task, framework->tasks)
+ if (task->slaveId == slave->id)
+ tasks.insert(task);
+
+ // Tell the framework they have been lost and remove them.
+ foreach (Task* task, tasks) {
+ send(framework->pid, pack<M2F_STATUS_UPDATE>(task->id, TASK_LOST,
+ task->message));
+
+ LOG(INFO) << "Removing " << task << " because of lost executor";
+ removeTask(task, TRR_EXECUTOR_LOST);
+ }
- // TODO(benh): Might we still want something like M2F_EXECUTOR_LOST?
- }
+ // TODO(benh): Might we still want something like M2F_EXECUTOR_LOST?
+ }
}
break;
}
@@ -594,10 +594,10 @@ void Master::operator () ()
case M2M_TIMER_TICK: {
unordered_map<SlaveID, Slave *> slavesCopy = slaves;
foreachpair (_, Slave *slave, slavesCopy) {
- if (slave->lastHeartbeat + HEARTBEAT_TIMEOUT <= time(NULL)) {
- LOG(INFO) << slave << " missing heartbeats ... considering disconnected";
- removeSlave(slave);
- }
+ if (slave->lastHeartbeat + HEARTBEAT_TIMEOUT <= time(NULL)) {
+ LOG(INFO) << slave << " missing heartbeats ... considering disconnected";
+ removeSlave(slave);
+ }
}
// Check which framework filters can be expired.
@@ -621,8 +621,8 @@ void Master::operator () ()
FrameworkID fid = pidToFid[from()];
if (Framework *framework = lookupFramework(fid)) {
LOG(INFO) << framework << " disconnected";
- // TODO(benh): Wait for a framework failover.
- removeFramework(framework);
+ // TODO(benh): Wait for a framework failover.
+ removeFramework(framework);
}
} else if (pidToSid.find(from()) != pidToSid.end()) {
SlaveID sid = pidToSid[from()];