X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsyncstep.py;h=ad148b526e41b5ea59dc8cd404014d78d11181ae;hb=de947e5558937771ed148ca9001c2e13bfe29a04;hp=fc0cb0b6cd21be3f3c0ce3455fadcd827191c7a0;hpb=a358f0fb280d3da6938575be3d9c5d4a4a7e3f7a;p=plstackapi.git

diff --git a/planetstack/openstack_observer/syncstep.py b/planetstack/openstack_observer/syncstep.py
index fc0cb0b..ad148b5 100644
--- a/planetstack/openstack_observer/syncstep.py
+++ b/planetstack/openstack_observer/syncstep.py
@@ -4,6 +4,7 @@ from datetime import datetime
 from planetstack.config import Config
 from util.logger import Logger, logging
 from observer.steps import *
+from django.db.models import F, Q
 
 logger = Logger(level=logging.INFO)
 
@@ -44,15 +45,31 @@ class SyncStep:
         return
 
     def fetch_pending(self, deletion=False):
-        return []
+        # This is the most common implementation of fetch_pending
+        # Steps should override it if they have their own logic
+        # for figuring out what objects are outstanding.
+        main_obj = self.provides[0]
+        if (not deletion):
+            objs = main_obj.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+        else:
+            objs = main_obj.deleted_objects.all()
+
+        return objs
         #return Sliver.objects.filter(ip=None)
     
     def check_dependencies(self, obj, failed):
         for dep in self.dependencies:
             peer_name = dep[0].lower() + dep[1:]    # django names are camelCased with the first letter lower
-            peer_object = getattr(obj, peer_name)
-            if (peer_object.pk==failed.pk):
-                raise FailedDependency
+            try:
+                peer_object = getattr(obj, peer_name)
+            except:
+                peer_object = None
+
+            if (peer_object and peer_object.pk==failed.pk and type(peer_object)==type(failed)):
+                if (obj.backend_status!=peer_object.backend_status):
+                    obj.backend_status = peer_object.backend_status
+                    obj.save(update_fields=['backend_status'])
+                raise FailedDependency("Failed dependency for %s:%s peer %s:%s failed  %s:%s" % (obj.__class__.__name__, str(obj.pk), peer_object.__class__.__name__, str(peer_object.pk), failed.__class__.__name__, str(failed.pk)))
 
     def call(self, failed=[], deletion=False):
         pending = self.fetch_pending(deletion)
@@ -69,14 +86,22 @@ class SyncStep:
                     o.backend_status = "OK"
                     o.save(update_fields=['enacted'])
             except Exception,e:
+                logger.log_exc("sync step failed!")
+                str_e = '%r'%e
                 try:
-                    o.backend_status = self.error_map.map(str(e))
+                    o.backend_status = self.error_map.map(str_e)
                 except:
-                    o.backend_status = str(e)
+                    o.backend_status = str_e
 
-                o.save(update_fields=['backend_status'])
+                # TOFIX:
+                # DatabaseError: value too long for type character varying(140)
+                if (o.pk):
+                    try:
+                        o.save(update_fields=['backend_status'])
+                    except:
+                        print "Could not update backend status field!"
+                        pass
 
-                logger.log_exc("sync step failed!")
                 failed.append(o)
 
         return failed