projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4088-collection-show-files-filter'
[arvados.git]
/
services
/
nodemanager
/
arvnodeman
/
daemon.py
diff --git
a/services/nodemanager/arvnodeman/daemon.py
b/services/nodemanager/arvnodeman/daemon.py
index 6ea3cdf4291393edb18088d5ed26122c499fd3bf..83e3ec9fc42b51f06b08c2d663b246480619082c 100644
(file)
--- a/
services/nodemanager/arvnodeman/daemon.py
+++ b/
services/nodemanager/arvnodeman/daemon.py
@@
-187,20
+187,27
@@
class NodeManagerDaemonActor(actor_class):
self._pair_nodes(cloud_rec, arv_node)
break
self._pair_nodes(cloud_rec, arv_node)
break
- def _node
_count
(self):
+ def _node
s_up
(self):
up = sum(len(nodelist) for nodelist in
[self.cloud_nodes, self.booted, self.booting])
return up - len(self.shutdowns)
up = sum(len(nodelist) for nodelist in
[self.cloud_nodes, self.booted, self.booting])
return up - len(self.shutdowns)
+ def _nodes_busy(self):
+ return sum(1 for idle in
+ pykka.get_all(rec.actor.in_state('idle') for rec in
+ self.cloud_nodes.nodes.itervalues())
+ if idle is False)
+
def _nodes_wanted(self):
def _nodes_wanted(self):
- return len(self.last_wishlist) - self._node_count()
+ return min(len(self.last_wishlist) + self._nodes_busy(),
+ self.max_nodes) - self._nodes_up()
def _nodes_excess(self):
def _nodes_excess(self):
- return
-self._nodes_wanted(
)
+ return
self._nodes_up() - self._nodes_busy() - len(self.last_wishlist
)
def update_server_wishlist(self, wishlist):
self._update_poll_time('server_wishlist')
def update_server_wishlist(self, wishlist):
self._update_poll_time('server_wishlist')
- self.last_wishlist = wishlist
[:self.max_nodes]
+ self.last_wishlist = wishlist
nodes_wanted = self._nodes_wanted()
if nodes_wanted > 0:
self._later.start_node()
nodes_wanted = self._nodes_wanted()
if nodes_wanted > 0:
self._later.start_node()