Merge lp:~sandy-walsh/nova/LP699878 into lp:~hudson-openstack/nova/trunk

[Sandy Walsh]

adds a timeout on session.login_with_password()

Adds a timeout on session.login_with_password()

[lp:~sandy-walsh/nova/LP699878]

952. By Sandy Walsh on 2011-04-07

better error message

[Brian Waldon (bcwaldon)]

What versions of python are we officially supporting? I ask because I think the "with timeout" would have to change to a try/except for versions < 2.5

review: Needs Information

[Josh Kearney (jk0)]

> What versions of python are we officially supporting? I ask because I think
> the "with timeout" would have to change to a try/except for versions < 2.5

2.6+ for now. No 2.5 support.

[Brian Waldon (bcwaldon)]

> > What versions of python are we officially supporting? I ask because I think
> > the "with timeout" would have to change to a try/except for versions < 2.5
>
> 2.6+ for now. No 2.5 support.

Great. Approves all around

review: Approve

[Cory Wright (corywright)]

lgtm.

review: Approve

[Josh Kearney (jk0)]

Nice work.

review: Approve

=== modified file 'nova/virt/xenapi_conn.py'
--- nova/virt/xenapi_conn.py	2011-03-24 22:39:39 +0000
+++ nova/virt/xenapi_conn.py	2011-04-07 15:01:09 +0000
@@ -63,6 +63,7 @@
 
 from eventlet import event
 from eventlet import tpool
+from eventlet import timeout
 
 from nova import context
 from nova import db
@@ -140,6 +141,9 @@
 flags.DEFINE_string('xenapi_remap_vbd_dev_prefix', 'sd',
                     'Specify prefix to remap VBD dev to '
                     '(ex. /dev/xvdb -> /dev/sdb)')
+flags.DEFINE_integer('xenapi_login_timeout',
+                     10,
+                     'Timeout in seconds for XenAPI login.')
 
 
 def get_connection(_):
@@ -318,7 +322,10 @@
     def __init__(self, url, user, pw):
         self.XenAPI = self.get_imported_xenapi()
         self._session = self._create_session(url)
-        self._session.login_with_password(user, pw)
+        exception = self.XenAPI.Failure(_("Unable to log in to XenAPI "
+                            "(is the Dom0 disk full?)"))
+        with timeout.Timeout(FLAGS.xenapi_login_timeout, exception):
+            self._session.login_with_password(user, pw)
         self.loop = None
 
     def get_imported_xenapi(self):