13497: Merge branch 'master' into 13497-controller

[arvados.git] / services / nodemanager / arvnodeman / computenode / driver / __init__.py

diff --git a/services/nodemanager/arvnodeman/computenode/driver/__init__.py b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
index fb8db517337465a40a83dd53ae9878d419850ca7..9e38d13eb7f4788d8af485a7e5b4b6589c9f324c 100644 (file)
--- a/services/nodemanager/arvnodeman/computenode/driver/__init__.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/__init__.py
@@ -127,7 +127,7 @@ class BaseComputeNodeDriver(RetryMixin):
         try:
             return self.real.list_nodes(**l)
         except CLOUD_ERRORS:
-            tracker.counter_add('cloud_errors')
+            tracker.counter_add('list_nodes_errors')
             raise
 
     def create_cloud_name(self, arvados_node):
@@ -174,7 +174,7 @@ class BaseComputeNodeDriver(RetryMixin):
         try:
             kwargs = self.create_kwargs.copy()
             kwargs.update(self.arvados_create_kwargs(size, arvados_node))
-            kwargs['size'] = size
+            kwargs['size'] = size.real
             return self.real.create_node(**kwargs)
         except CLOUD_ERRORS as create_error:
             # Workaround for bug #6702: sometimes the create node request
@@ -186,7 +186,7 @@ class BaseComputeNodeDriver(RetryMixin):
             try:
                 return self.search_for_now(kwargs['name'], 'list_nodes', self._name_key)
             except ValueError:
-                tracker.counter_add('cloud_errors')
+                tracker.counter_add('create_node_errors')
                 raise create_error
 
     def post_create_node(self, cloud_node):
@@ -229,7 +229,7 @@ class BaseComputeNodeDriver(RetryMixin):
                 # it, which means destroy_node actually succeeded.
                 return True
             # The node is still on the list.  Re-raise.
-            tracker.counter_add('cloud_errors')
+            tracker.counter_add('destroy_node_errors')
             raise
 
     # Now that we've defined all our own methods, delegate generic, public