From 0275a62826a50d84f8f633f475c930fde96af4a4 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Thu, 14 Jun 2018 12:39:08 -0300 Subject: [PATCH] 13617: Replaces all logging about size names with size ids. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../arvnodeman/computenode/dispatch/__init__.py | 2 +- services/nodemanager/arvnodeman/daemon.py | 9 +++------ services/nodemanager/arvnodeman/jobqueue.py | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py index f7bb2cdbda..b4fec5096d 100644 --- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py +++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py @@ -130,7 +130,7 @@ class ComputeNodeSetupActor(ComputeNodeStateChangeBase): @RetryMixin._retry() def create_cloud_node(self): self._logger.info("Sending create_node request for node size %s.", - self.cloud_size.name) + self.cloud_size.id) try: self.cloud_node = self._cloud.create_node(self.cloud_size, self.arvados_node) diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py index e06c1097bc..911798e08f 100644 --- a/services/nodemanager/arvnodeman/daemon.py +++ b/services/nodemanager/arvnodeman/daemon.py @@ -318,10 +318,7 @@ class NodeManagerDaemonActor(actor_class): busy_count = counts["busy"] wishlist_count = self._size_wishlist(size) - size_name = size.name - if size.preemptable: - size_name += ' (preemptable)' - self._logger.info("%s: wishlist %i, up %i (booting %i, unpaired %i, idle %i, busy %i), down %i, shutdown %i", size_name, + self._logger.info("%s: wishlist %i, up %i (booting %i, unpaired %i, idle %i, busy %i), down %i, shutdown %i", size.id, wishlist_count, up_count, counts["booting"], @@ -341,7 +338,7 @@ class NodeManagerDaemonActor(actor_class): can_boot = int((self.max_total_price - total_price) / size.price) if can_boot == 0: self._logger.info("Not booting %s (price %s) because with it would exceed max_total_price of %s (current total_price is %s)", - size.name, size.price, self.max_total_price, total_price) + size.id, size.price, self.max_total_price, total_price) return can_boot else: return wanted @@ -395,7 +392,7 @@ class NodeManagerDaemonActor(actor_class): return None arvados_node = self.arvados_nodes.find_stale_node(self.node_stale_after) self._logger.info("Want %i more %s nodes. Booting a node.", - nodes_wanted, cloud_size.name) + nodes_wanted, cloud_size.id) new_setup = self._node_setup.start( timer_actor=self._timer, arvados_client=self._new_arvados(), diff --git a/services/nodemanager/arvnodeman/jobqueue.py b/services/nodemanager/arvnodeman/jobqueue.py index 6c7a93466c..99064b3988 100644 --- a/services/nodemanager/arvnodeman/jobqueue.py +++ b/services/nodemanager/arvnodeman/jobqueue.py @@ -248,5 +248,5 @@ class JobQueueMonitorActor(clientactor.RemotePollLoopActor): job_uuid, error) self._logger.debug("Calculated wishlist: %s", - ', '.join("%s (preemptable: %s)" % (s.name, s.preemptable) for s in server_list) or "(empty)") + ', '.join(s.id for s in server_list) or "(empty)") return super(JobQueueMonitorActor, self)._got_response(server_list) -- 2.30.2