Merge lp:~thedac/charms/precise/gunicorn/make-apt-install-fatal into lp:~charmers/charms/precise/gunicorn/trunk

[David Ames]

Make fetch.apt_install() calls fatal on failure

[Celso Providelo (cprov)]

TBH, I wonder if it doesn't belong in the charmhelpers codebase, because it's seems to me that, considering the racing between the main and its subordinates charms, package installing should be retried by default. On 'main' charms the retrying would be rarely (never) reached.

Also, IMO, 'fatal' doesn't transmit well what the code does, A better alternative would be 'retry' which could modify the hardcoded "30 times 10s wait" retry behaviour or just stick more suitable defaults.

review: Needs Information

[Tom Haddon (mthaddon)]

The version of charmhelpers installed on the instance that failed didn't have the retry code in it . We should update the version of charmhelpers in the gunicorn charm so that it does have this (this was introduced in revno 149 of charmhelpers), and we should then be in good shape. See http://paste.ubuntu.com/7549696/

review: Disapprove

[Charles Butler (lazypower)]

David,

Thank you for this merge proposal, as Tom Haddon has recommended, there is retry code already baked into charmhelpers that superseeds the version embedded here. It would be a great idea to update that charm-helpers embedded lib and give it another go.

All the best,

Charles

review: Disapprove

Unmerged revisions

33. By David Ames on 2014-05-29

Make fetch.apt_install() calls fatal if they fail

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-05-01 13:14:53 +0000
+++ hooks/hooks.py	2014-05-29 19:03:07 +0000
@@ -54,7 +54,7 @@
 
 def ensure_packages():
     fetch.apt_update()
-    fetch.apt_install(CHARM_PACKAGES)
+    fetch.apt_install(CHARM_PACKAGES, fatal = True)
 
 
 def remove_old_services():
@@ -138,11 +138,11 @@
             wsgi_config[key] = relation_value
 
     if wsgi_config['wsgi_worker_class'] == 'eventlet':
-        fetch.apt_install('python-eventlet')
+        fetch.apt_install('python-eventlet', fatal = True)
     elif wsgi_config['wsgi_worker_class'] == 'gevent':
-        fetch.apt_install('python-gevent')
+        fetch.apt_install('python-gevent', fatal = True)
     elif wsgi_config['wsgi_worker_class'] == 'tornado':
-        fetch.apt_install('python-tornado')
+        fetch.apt_install('python-tornado', fatal = True)
 
     if str(wsgi_config['wsgi_workers']) == '0':
         wsgi_config['wsgi_workers'] = cpu_count() + 1