Changeset 29 for trunk/provisioner.py

Timestamp:

27/11/07 17:40:17 (4 years ago)

Author:

daedalus

Message:

* Manual bailout when in authoritarian mode now works correctly.
* Fixed up some of the log level and stats reporting.
* Added 'backout' mode, that will only run the backout portion of changes. More

useful for testing, but can also be used to undo provisioning by repurposing
the same set of templates used for provisioning.

Files:

• trunk/provisioner.py (modified) (9 diffs)

trunk/provisioner.py

@@ -80 +80 @@
         pass
 
-    def perform_change(self, ignored, change, namespace={}):
+    def perform_change(self, ignored, change, namespace={}, backout=False):
         """
         Perform a change on one or more (potentially) remote entities.
@@ -120 +120 @@
                 namespace.update(device.namespace)
 
-                log.debug("applying change with namespace: %s", namespace)
-                d.addCallback(self.apply_change, device, change, namespace)
-
-                d.addCallback(self.change_complete_success, change, namespace)
-                d.addErrback(self.change_failure, change, namespace)
+                if backout:
+                    # Just do the backout portion
+                    d.addCallback(self.backout_change, device, change, namespace)
+
+                else:
+                    log.debug("applying change with namespace: %s", namespace)
+                    d.addCallback(self.apply_change, device, change, namespace)
+                    
+                    d.addCallback(self.change_complete_success, change, namespace)
+                    d.addErrback(self.change_failure, change, namespace)
+                    pass
                 pass
             pass
@@ -158 +164 @@
         e = failure.check( ChangeConditionFailure, UserBailout )
         if e:
-            log.error("  failure was: %s", failure.value )
-            if isinstance(e, UserBailout):
-                log.info("User bailout detected.")
-                return defer.succeed('bailout')
+            log.error("  failure was: %s, %s", failure.type, failure.value )
+
+            # If we want to bail out, bail now
+            if failure.type == UserBailout:
+                return defer.fail(failure)
         else:
+            log.error("Unhandled failure in provisioner.change_apply_failed()")
             tlog.err(failure)
         
@@ -193 +201 @@
                 change.state = CHANGE_STATE['total_failure']
         else:
-            change.state = CHANGE_STATE['backout_failed']
-            pass
+            log.error("change_failure unhandled change state: %s", change.state)
+            raise ValueError("Invalid change state: %s" % change.state)
+
+        # Propogate a UserBailout failure
+        if failure.type == UserBailout:
+            return failure
+        
         #tlog.err(failure)
 
@@ -202 +215 @@
             log.info("Change '%s' was a success!", change.name)
         else:
+            log.error("change_complete_success in weird state: %s", change.state)
+            raise ValueError("wrong change state: %s" % change.state)
             change.state = CHANGE_STATE['backout_ok']
             log.info("Change '%s' backed out successfully", change.name)
@@ -241 +256 @@
     def backout_success(self, ignored, device, change, namespace):
         log.info("Successfully backed out change: '%s' from device '%s'", change.name, device)
+        change.state = CHANGE_STATE['backout_ok']
         self.backout_ok[device] = change
 
     def backout_failure(self, failure, device, change, namespace):
         log.critical("Backout of change '%s' failed for device '%s'!", change.name, device)
+        change.state = CHANGE_STATE['backout_failed']
         self.backout_failed[device] = change
-        tlog.err(failure)
+        #tlog.err(failure)
         return failure
 
@@ -611 +628 @@
             pass
 
-        d.addCallback(self.all_commands_done)
-        
+        d.addCallbacks(self.all_commands_done, self.all_commands_failure)
         return self.all_commands_defer
 
@@ -662 +678 @@
         log.error("Command failed: %s", errorstr)
         #self.all_commands_defer.errback( Exception(errorstr) )
-
+        return failure
+    
     def all_commands_done(self, result):
         """
@@ -669 +686 @@
         log.debug("All commands have finished.")
         self.all_commands_defer.callback( (self.exitcode, self.cmdoutput) )
+
+    def all_commands_failure(self, failure):
+        """
+        Some kind of failure in the commands occurred.
+        """
+        e = failure.check( UserBailout )
+        if e:
+            #log.error("User bailout detected.")
+            self.all_commands_defer.errback( failure )
 
 class CommandFailure(Exception):