diff options
| author | Josh Kearney <josh@jk0.org> | 2011-09-14 14:38:40 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-09-14 14:38:40 -0500 |
| commit | 7e379f6a77f53ad4d6ddc98fbb30cd853933bb08 (patch) | |
| tree | 47ca781ab97fedf754613fa99f2198cbf5b58e89 /nova/compute | |
| parent | 89736bf13562811cebb42cd6e3377d7f9e0a0b9c (diff) | |
Initial pass at automatically confirming resizes after a given window.
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 7915830ec..6ddbb20b0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -81,6 +81,9 @@ flags.DEFINE_integer('live_migration_retry_count', 30, flags.DEFINE_integer("rescue_timeout", 0, "Automatically unrescue an instance after N seconds." " Set to 0 to disable.") +flags.DEFINE_integer("resize_confirm_window", 0, + "Automatically confirm resizes after N seconds." + " Set to 0 to disable.") flags.DEFINE_integer('host_state_interval', 120, 'Interval in seconds for querying the host status') @@ -1644,14 +1647,23 @@ class ComputeManager(manager.SchedulerDependentManager): self.driver.poll_rescued_instances(FLAGS.rescue_timeout) except Exception as ex: LOG.warning(_("Error during poll_rescued_instances: %s"), - unicode(ex)) + unicode(ex)) + error_list.append(ex) + + try: + if FLAGS.resize_confirm_window > 0: + self.driver.poll_unconfirmed_resizes( + FLAGS.resize_confirm_window) + except Exception as ex: + LOG.warning(_("Error during poll_unconfirmed_resizes: %s"), + unicode(ex)) error_list.append(ex) try: self._report_driver_status() except Exception as ex: LOG.warning(_("Error during report_driver_status(): %s"), - unicode(ex)) + unicode(ex)) error_list.append(ex) try: |