Stop instance even if buildout/reporting is wrong.

8c964853 · Cédric de Saint Martin · 92cb399d · 8c964853
Commit 8c964853 authored Nov 27, 2012 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

slapos/grid/slapgrid.py slapos/grid/slapgrid.py +8 -3

No files found.
--- a/slapos/grid/slapgrid.py
+++ b/slapos/grid/slapgrid.py
@@ -780,9 +780,14 @@ class Slapgrid(object):
      self._checkPromises(computer_partition)
      computer_partition.started()
    elif computer_partition_state == "stopped":
-      local_partition.install()
+      try:
-      computer_partition.available()
+        local_partition.install()
-      local_partition.stop()
+        computer_partition.available()
+      except Exception:
+        raise
+      finally:
+        # Instance has to be stopped even if buildout/reporting is wrong.
+        local_partition.stop()
      computer_partition.stopped()
    elif computer_partition_state == COMPUTER_PARTITION_DESTROYED_STATE:
      local_partition.stop()