Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0

[plstackapi.git] / planetstack / observer / syncstep.py

diff --git a/planetstack/observer/syncstep.py b/planetstack/observer/syncstep.py
index c41628a..fc0cb0b 100644 (file)
--- a/planetstack/observer/syncstep.py
+++ b/planetstack/observer/syncstep.py
@@ -3,6 +3,7 @@ import base64
 from datetime import datetime
 from planetstack.config import Config
 from util.logger import Logger, logging
+from observer.steps import *
 
 logger = Logger(level=logging.INFO)
 
@@ -33,6 +34,8 @@ class SyncStep:
         """
         dependencies = []
         self.driver = args.get('driver')
+        self.error_map = args.get('error_map')
+
         try:
             self.soft_deadline = int(self.get_prop('soft_deadline_seconds'))
         except:
@@ -40,7 +43,7 @@ class SyncStep:
 
         return
 
-    def fetch_pending(self):
+    def fetch_pending(self, deletion=False):
         return []
         #return Sliver.objects.filter(ip=None)
     
@@ -51,17 +54,29 @@ class SyncStep:
             if (peer_object.pk==failed.pk):
                 raise FailedDependency
 
-    def call(self, failed=[]):
-        pending = self.fetch_pending()
+    def call(self, failed=[], deletion=False):
+        pending = self.fetch_pending(deletion)
         for o in pending:
             try:
                 for f in failed:
                     self.check_dependencies(o,f) # Raises exception if failed
-                self.sync_record(o)
-                o.enacted = datetime.now() # Is this the same timezone? XXX
-                o.save(update_fields=['enacted'])
-            except:
-                logger.log_exc("sync step %s failed!" % self.__name__)
+                if (deletion):
+                    self.delete_record(o)
+                    o.delete(purge=True)
+                else:
+                    self.sync_record(o)
+                    o.enacted = datetime.now() # Is this the same timezone? XXX
+                    o.backend_status = "OK"
+                    o.save(update_fields=['enacted'])
+            except Exception,e:
+                try:
+                    o.backend_status = self.error_map.map(str(e))
+                except:
+                    o.backend_status = str(e)
+
+                o.save(update_fields=['backend_status'])
+
+                logger.log_exc("sync step failed!")
                 failed.append(o)
 
         return failed