Remove superfluous node_exclusive attr from resource in store

ooici · Dec 10, 2012 · 6dcdec4 · 6dcdec4
1 parent c81c128
commit 6dcdec4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/epu/processdispatcher/core.py b/epu/processdispatcher/core.py
@@ -520,8 +520,6 @@ def ee_heartbeat(self, sender, beat):
                 #TODO? right now this will just wait for the next heartbeat
                 pass
 
-            log.debug("updating resource %s node_exclusive. was %s, now %s",
-                resource.resource_id, resource.node_exclusive, new_node_exclusive)
             node = self.store.get_node(resource.node_id)
             if not node:
                 msg = "Node %s doesn't exist, but you want to set node_exclusive?" % (
@@ -638,8 +636,9 @@ def _change_process_state(self, process, newstate, **updates):
 
     def dump(self):
         resources = {}
+        nodes = {}
         processes = {}
-        state = dict(resources=resources, processes=processes)
+        state = dict(resources=resources, processes=processes, nodes=nodes)
 
         for resource_id in self.store.get_resource_ids():
             resource = self.store.get_resource(resource_id)
@@ -653,4 +652,10 @@ def dump(self):
                 continue
             processes[process.upid] = dict(process)
 
+        for node_id in self.store.get_node_ids():
+            node = self.store.get_node(node_id)
+            if not node:
+                continue
+            nodes[node_id] = dict(node)
+
         return state
diff --git a/epu/processdispatcher/matchmaker.py b/epu/processdispatcher/matchmaker.py
@@ -325,6 +325,7 @@ def matchmake(self):
                                 matched_resource.node_id)
                         return
 
+                    log.debug("updating %s with node_exclusive %s for %s" % (matched_node.node_id, process.node_exclusive, process.upid))
                     matched_node.node_exclusive.append(process.node_exclusive)
 
                     try:
@@ -638,6 +639,7 @@ def matchmake_process(self, process, node_containers):
                     log.warning("Can't find node %s?", node_id)
                     continue
                 if not node.node_exclusive_available(process.node_exclusive):
+                    log.debug("Process %s with node_exclusive %s is not being matched to %s, which has this attribute" % (process.upid, process.node_exclusive, node_id))
                     continue
 
             # now inspect each resource in the node looking for a match

diff --git a/epu/processdispatcher/store.py b/epu/processdispatcher/store.py
@@ -1175,18 +1175,9 @@ def new(cls, resource_id, node_id, slot_count, properties=None,
         props['resource_id'] = resource_id
 
         d = dict(resource_id=resource_id, node_id=node_id, enabled=enabled,
-                 slot_count=int(slot_count), properties=props, assigned=[],
-                 node_exclusive=[])
+                 slot_count=int(slot_count), properties=props, assigned=[])
         return cls(d)
 
-    def node_exclusive_available(self, attr):
-        if attr is None:
-            return True
-        elif attr not in self.node_exclusive:
-            return True
-        else:
-            return False
-
     @property
     def available_slots(self):
         return max(0, self.slot_count - len(self.assigned))