svn commit: r1132169 - in /incubator/mesos/trunk: configure.template.ubuntu-hardy-64 src/master/simple_allocator.cpp src/master/simple_allocator.hpp

[be...@apache.org]

Author: benh
Date: Sun Jun  5 08:53:44 2011
New Revision: 1132169

URL: http://svn.apache.org/viewvc?rev=1132169&view=rev
Log:
Revert "Fixed Java path on Hardy" since I accidentally added extra files

This reverts commit 53e172dd63d9ba29f124326ef54ebcf64ac93250.

Modified:
    incubator/mesos/trunk/configure.template.ubuntu-hardy-64
    incubator/mesos/trunk/src/master/simple_allocator.cpp
    incubator/mesos/trunk/src/master/simple_allocator.hpp

Modified: incubator/mesos/trunk/configure.template.ubuntu-hardy-64
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/configure.template.ubuntu-hardy-64?rev=1132169&r1=1132168&r2=1132169&view=diff
==============================================================================
--- incubator/mesos/trunk/configure.template.ubuntu-hardy-64 (original)
+++ incubator/mesos/trunk/configure.template.ubuntu-hardy-64 Sun Jun  5 08:53:44 2011
@@ -4,6 +4,6 @@ export PYTHON=python2.5
 
 $(dirname $0)/configure \
   --with-python-headers=/usr/include/python2.5 \
-  --with-java-home=/usr/lib/jvm/java-6-openjdk \
+  --with-java-home=/usr/lib/jvm/java-6-sun \
   --with-webui \
   --with-included-zookeeper $@

Modified: incubator/mesos/trunk/src/master/simple_allocator.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/simple_allocator.cpp?rev=1132169&r1=1132168&r2=1132169&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/simple_allocator.cpp (original)
+++ incubator/mesos/trunk/src/master/simple_allocator.cpp Sun Jun  5 08:53:44 2011
@@ -23,8 +23,8 @@ void SimpleAllocator::frameworkAdded(Fra
 void SimpleAllocator::frameworkRemoved(Framework* framework)
 {
   LOG(INFO) << "Removed " << framework;
-  foreachpair (SlaveID s, unordered_set<FrameworkID>& refs, refusers)
-    refs.erase(framework->id);
+  foreachpair (Slave* s, unordered_set<Framework*>& refs, refusers)
+    refs.erase(framework);
   // TODO: Re-offer just the slaves that the framework had tasks on?
   //       Alternatively, comment this out and wait for a timer tick
   makeNewOffers();
@@ -34,7 +34,7 @@ void SimpleAllocator::frameworkRemoved(F
 void SimpleAllocator::slaveAdded(Slave* slave)
 {
   LOG(INFO) << "Added " << slave;
-  refusers[slave->id] = unordered_set<FrameworkID>();
+  refusers[slave] = unordered_set<Framework*>();
   totalResources += slave->resources;
   makeNewOffers(slave);
 }
@@ -44,7 +44,7 @@ void SimpleAllocator::slaveRemoved(Slave
 {
   LOG(INFO) << "Removed " << slave;
   totalResources -= slave->resources;
-  refusers.erase(slave->id);
+  refusers.erase(slave);
 }
 
 
@@ -54,7 +54,7 @@ void SimpleAllocator::taskRemoved(Task* 
   // Remove all refusers from this slave since it has more resources free
   Slave* slave = master->lookupSlave(task->slaveId);
   CHECK(slave != 0);
-  refusers[slave->id].clear();
+  refusers[slave].clear();
   // Re-offer the resources, unless this task was removed due to a lost
   // slave or a lost framework (in which case we'll get another callback)
   if (reason == TRR_TASK_ENDED || reason == TRR_EXECUTOR_LOST)
@@ -76,7 +76,7 @@ void SimpleAllocator::offerReturned(Slot
               << " free on " << r.slave;
       if (r.resources.cpus > 0 || r.resources.mem > 0) {
         VLOG(1) << "Inserting " << framework << " as refuser for " << r.slave;
-        refusers[r.slave->id].insert(framework->id);
+        refusers[r.slave].insert(framework);
       }
     }
   }
@@ -187,7 +187,7 @@ void SimpleAllocator::makeNewOffers(cons
   
   // Clear refusers on any slave that has been refused by everyone
   foreachpair (Slave* slave, _, freeResources) {
-    unordered_set<FrameworkID>& refs = refusers[slave->id];
+    unordered_set<Framework*>& refs = refusers[slave];
     if (refs.size() == ordering.size()) {
       VLOG(1) << "Clearing refusers for " << slave
               << " because everyone refused it";
@@ -199,11 +199,10 @@ void SimpleAllocator::makeNewOffers(cons
     // See which resources this framework can take (given filters & refusals)
     vector<SlaveResources> offerable;
     foreachpair (Slave* slave, Resources resources, freeResources) {
-      unordered_set<FrameworkID>& refs = refusers[slave->id];
-      if (refs.find(framework->id) == refs.end() &&
+      if (refusers[slave].find(framework) == refusers[slave].end() &&
           !framework->filters(slave, resources)) {
         VLOG(1) << "Offering " << resources << " on " << slave
-                << " to " << framework;
+                << " to framework " << framework->id;
         offerable.push_back(SlaveResources(slave, resources));
       }
     }

Modified: incubator/mesos/trunk/src/master/simple_allocator.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/simple_allocator.hpp?rev=1132169&r1=1132168&r2=1132169&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/simple_allocator.hpp (original)
+++ incubator/mesos/trunk/src/master/simple_allocator.hpp Sun Jun  5 08:53:44 2011
@@ -25,7 +25,7 @@ class SimpleAllocator : public Allocator
   
   // Remember which frameworks refused each slave "recently"; this is cleared
   // when the slave's free resources go up or when everyone has refused it
-  unordered_map<SlaveID, unordered_set<FrameworkID> > refusers;
+  unordered_map<Slave*, unordered_set<Framework*> > refusers;
   
 public:
   SimpleAllocator(Master* _master): master(_master) {}