NoneType 'retry' parameter causes TypeError in impl_rabbit

[Dan Prince]

Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root Traceback (most recent call last):
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_utils/excutils.py", line 95, in inner_func
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root return infunc(*args, **kwargs)
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_messaging/_executors/impl_eventlet.py", line 96, in _executor_thread
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root incoming = self.listener.poll()
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_messaging/_drivers/amqpdriver.py", line 122, in poll
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root self.conn.consume(limit=1, timeout=timeout)
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_messaging/_drivers/impl_rabbit.py", line 1146, in consume
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root six.next(it)
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_messaging/_drivers/impl_rabbit.py", line 1044, in iterconsume
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root error_callback=_error_callback)
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root File "/usr/lib/python2.7/site-packages/oslo_messaging/_drivers/impl_rabbit.py", line 868, in ensure
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root 'retry': retry}
Apr 01 15:00:09 host-192-168-1-133 ironic-conductor[4259]: 2015-04-01 15:00:09.358 4259 TRACE root TypeError: %d format: a number is required, not NoneType

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/170856

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/170856
Committed: https://git.openstack.org/cgit/openstack/oslo.messaging/commit/?id=48441a64a6c0a0f715771b5e197317ad8d5a7974
Submitter: Jenkins
Branch: master

commit 48441a64a6c0a0f715771b5e197317ad8d5a7974
Author: Dan Prince <email address hidden>
Date: Mon Apr 6 10:27:34 2015 -0400

    Fix TypeError caused by err_msg formatting

    The retry variable can be None which causes this exception to be
    formatted incorrectly. Switching from %(retry)d to %(retry)s
    should handle the case where retry is None more gracefully.

    Change-Id: I592ea3e44506afb4a676d8dbe1e659a0e649424e
    Closes-bug: #1440755