svn commit: r1132106 - in /incubator/mesos/trunk/src: master/master.cpp sched/sched.cpp

[be...@apache.org]

Author: benh
Date: Sun Jun  5 08:42:15 2011
New Revision: 1132106

URL: http://svn.apache.org/viewvc?rev=1132106&view=rev
Log:
Fixes a bug that was causing framework messages not to be sent from schedulers to executors

Modified:
    incubator/mesos/trunk/src/master/master.cpp
    incubator/mesos/trunk/src/sched/sched.cpp

Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1132106&r1=1132105&r2=1132106&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun  5 08:42:15 2011
@@ -775,7 +775,7 @@ OfferID Master::makeOffer(Framework *fra
     params.set("mem", r.resources.mem);
     SlaveOffer offer(r.slave->id, r.slave->hostname, params.getMap());
     offers.push_back(offer);
-    pids[r.slave->id, r.slave->pid];
+    pids[r.slave->id] = r.slave->pid;
   }
   send(framework->pid, pack<M2F_SLOT_OFFER>(oid, offers, pids));
   return oid;

Modified: incubator/mesos/trunk/src/sched/sched.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/sched/sched.cpp?rev=1132106&r1=1132105&r2=1132106&view=diff
==============================================================================
--- incubator/mesos/trunk/src/sched/sched.cpp (original)
+++ incubator/mesos/trunk/src/sched/sched.cpp Sun Jun  5 08:42:15 2011
@@ -253,10 +253,14 @@ protected:
       case F2F_FRAMEWORK_MESSAGE: {
         FrameworkMessage msg;
         tie(msg) = unpack<F2F_FRAMEWORK_MESSAGE>(body());
-        if (savedSlavePids.count(msg.slaveId) > 0)
+        VLOG(1) << "Asked to send framework message to slave " << msg.slaveId;
+        if (savedSlavePids.count(msg.slaveId) > 0) {
+          VLOG(1) << "Saved slave PID is " << savedSlavePids[msg.slaveId];
           send(savedSlavePids[msg.slaveId], pack<M2S_FRAMEWORK_MESSAGE>(fid, msg));
-        else
+        } else {
+          VLOG(1) << "No PID is saved for that slave; sending through master";
           send(master, pack<F2M_FRAMEWORK_MESSAGE>(fid, msg));
+        }
         break;
       }