From c8be92df805483d492acfc1ce9516daf8f1fb39e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 20 Nov 2015 21:20:10 +0000 Subject: [PATCH 1/1] 5352: Set node size on records returned from libcloud create_node --- .../nodemanager/arvnodeman/computenode/dispatch/__init__.py | 2 ++ services/nodemanager/arvnodeman/daemon.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py index 3c708778d0..b57587b083 100644 --- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py +++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py @@ -133,6 +133,8 @@ class ComputeNodeSetupActor(ComputeNodeStateChangeBase): self.cloud_size.name) self.cloud_node = self._cloud.create_node(self.cloud_size, self.arvados_node) + if not self.cloud_node.size: + self.cloud_node.size = self.cloud_size self._logger.info("Cloud node %s created.", self.cloud_node.id) self._later.post_create() diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py index dbc3273e1c..243d3bfaa4 100644 --- a/services/nodemanager/arvnodeman/daemon.py +++ b/services/nodemanager/arvnodeman/daemon.py @@ -276,6 +276,8 @@ class NodeManagerDaemonActor(actor_class): self._nodes_busy(size) + self._nodes_missing(size)) + self._logger.debug("%s: idle nodes %i, wishlist size %i", size.name, up_count, self._size_wishlist(size)) + wanted = self._size_wishlist(size) - up_count if wanted > 0 and self.max_total_price and ((total_price + (size.price*wanted)) > self.max_total_price): can_boot = int((self.max_total_price - total_price) / size.price) -- 2.30.2