summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-08-26 16:04:34 -0700
committerChris Behrens <cbehrens@codestud.com>2011-08-26 16:04:34 -0700
commit3c835ebe4bb6e0aa61da2a2e44a6b19bc92fc72a (patch)
tree622ecefb394b93e783f97cd9d64f48e2f3e419c4
parent1c5031ca6f89de4ac8a7dac271aff9942fc9602a (diff)
downloadnova-3c835ebe4bb6e0aa61da2a2e44a6b19bc92fc72a.tar.gz
nova-3c835ebe4bb6e0aa61da2a2e44a6b19bc92fc72a.tar.xz
nova-3c835ebe4bb6e0aa61da2a2e44a6b19bc92fc72a.zip
flag for kombu connection backoff on retries
-rw-r--r--nova/flags.py1
-rw-r--r--nova/rpc/impl_kombu.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 95000df1b..ac70386e7 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -303,6 +303,7 @@ DEFINE_string('rabbit_userid', 'guest', 'rabbit userid')
DEFINE_string('rabbit_password', 'guest', 'rabbit password')
DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host')
DEFINE_integer('rabbit_retry_interval', 10, 'rabbit connection retry interval')
+DEFINE_integer('rabbit_interval_stepping', 2, 'rabbit connection retry backoff in seconds')
DEFINE_integer('rabbit_max_retries', 12, 'rabbit connection attempts')
DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to')
DEFINE_boolean('rabbit_durable_queues', False, 'use durable queues')
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
index cfef421c6..65199808e 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -289,7 +289,7 @@ class Connection(object):
self.queues = []
self.max_retries = FLAGS.rabbit_max_retries
self.interval_start = FLAGS.rabbit_retry_interval
- self.interval_stepping = 0
+ self.interval_stepping = FLAGS.rabbit_interval_stepping
self.interval_max = FLAGS.rabbit_retry_interval
self.params = dict(hostname=FLAGS.rabbit_host,