Merge branch 'node_list_error' into 'master'

Node list error

See merge request !399

circle/dashboard/views/node.py

@@ -210,9 +210,20 @@ class NodeList(LoginRequiredMixin, GraphMixin, SingleTableView):
             return super(NodeList, self).get(*args, **kwargs)
             return super(NodeList, self).get(*args, **kwargs)
 
 
     def get_queryset(self):
     def get_queryset(self):
+        self.wrong_nodes_message()
         return Node.objects.annotate(
         return Node.objects.annotate(
             number_of_VMs=Count('instance_set')).select_related('host')
             number_of_VMs=Count('instance_set')).select_related('host')
 
 
+    def wrong_nodes_message(self):
+        wrong_nodes = []
+        for node in Node.objects.all():
+            if node.monitor_info is None:
+                wrong_nodes.append(node.name)
+        message = ', '.join(wrong_nodes)
+        if wrong_nodes:
+            messages.error(self.request,
+                           "Can't reach " + message + " monitor info")
+
 
 
 class NodeCreate(LoginRequiredMixin, SuperuserRequiredMixin, TemplateView):
 class NodeCreate(LoginRequiredMixin, SuperuserRequiredMixin, TemplateView):
 
 

circle/vm/models/node.py

@@ -35,7 +35,7 @@ from django.db.models import (
 from django.utils import timezone
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _
 
 
-from celery.exceptions import TimeoutError
+from celery.exceptions import TimeoutError, TaskRevokedError
 from model_utils.models import TimeStampedModel
 from model_utils.models import TimeStampedModel
 from taggit.managers import TaggableManager
 from taggit.managers import TaggableManager
 
 
@@ -315,7 +315,7 @@ class Node(OperatedMixin, TimeStampedModel):
                 queue=self.get_remote_queue_name('vm', priority),
                 queue=self.get_remote_queue_name('vm', priority),
                 expires=timeout + 60)
                 expires=timeout + 60)
             return r.get(timeout=timeout)
             return r.get(timeout=timeout)
-        except (TimeoutError, WorkerNotFound):
+        except (TimeoutError, WorkerNotFound, TaskRevokedError):
             if raise_:
             if raise_:
                 raise
                 raise
             else:
             else:
@@ -363,15 +363,27 @@ class Node(OperatedMixin, TimeStampedModel):
     def driver_version(self):
     def driver_version(self):
         return self.info.get('driver_version')
         return self.info.get('driver_version')
 
 
+    def get_monitor_info(self, metric):
+        # return with the metric value if the monitor info not none
+        # or return 0 if its None or the metric unreachable
+        if self.monitor_info is None:
+            logger.warning('Monitor info is None')
+            return 0
+        elif self.monitor_info.get(metric) is None:
+            logger.warning('Unreachable monitor info of: ' + metric)
+            return 0
+        else:
+            return self.monitor_info.get(metric)
+
     @property
     @property
     @node_available
     @node_available
     def cpu_usage(self):
     def cpu_usage(self):
-        return self.monitor_info.get('cpu.percent') / 100
+        return self.get_monitor_info('cpu.percent') / 100
 
 
     @property
     @property
     @node_available
     @node_available
     def ram_usage(self):
     def ram_usage(self):
-        return self.monitor_info.get('memory.usage') / 100
+        return self.get_monitor_info('memory.usage') / 100
 
 
     @property
     @property
     @node_available
     @node_available