Commit 0fd0ad04 authored by Gary Wong's avatar Gary Wong

Don't count otherwise unavailable nodes against admission control.

parent 60ebe37e
......@@ -3466,12 +3466,11 @@ class node:
result = {}
# gotta enumerate the list of nodes of this type that are avail
for row in res:
avail = freecounts[ row[ 1 ] ] > 0
avail = row[2] == 1 and row[3] == 1 and row[8] == 1 and freecounts[ row[ 1 ] ] > 0
result[row[0]] = {
"node_id" : row[0],
"type" : row[1],
"free" : (avail and row[2] == 1 and row[3] == 1 and
row[8] == 1),
"free" : avail,
}
if row[4]:
result[row[0]]["site"] = row[4]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment