diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-22 14:07:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-22 14:07:09 +0000 |
| commit | 7680b5ef0e3608b2c45f057f65337c4af3d5659d (patch) | |
| tree | d8dfab911ff8dfb88a4c809504694df9aa912f66 | |
| parent | 47605e6c137e3934c052be5fb084198735d9697c (diff) | |
| parent | 3e7b8cf83af78d05f247e7113d560746ef5dde61 (diff) | |
| download | trove-7680b5ef0e3608b2c45f057f65337c4af3d5659d.tar.gz | |
Merge "Fix delete instance" into stable/train
| -rw-r--r-- | devstack/plugin.sh | 2 | ||||
| -rwxr-xr-x | trove/taskmanager/models.py | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3d4b28de..840760ca 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -555,7 +555,7 @@ function config_trove_network { sudo ip route # Now make sure the conf settings are right - iniset $TROVE_CONF DEFAULT network_label_regex ${PRIVATE_NETWORK_NAME} + iniset $TROVE_CONF DEFAULT network_label_regex "" iniset $TROVE_CONF DEFAULT ip_regex "" iniset $TROVE_CONF DEFAULT black_list_regex "" iniset $TROVE_CONF DEFAULT management_networks ${mgmt_net_id} diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index c1b3d220..8d480188 100755 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -433,20 +433,22 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): TroveInstanceCreate(instance=self, instance_size=flavor['ram']).notify() except (TroveError, PollTimeOut) as ex: - LOG.exception("Failed to create instance %s.", self.id) + LOG.error("Failed to create instance %s, error: %s.", + self.id, str(ex)) self.update_statuses_on_time_out() error_message = "%s" % ex error_details = traceback.format_exc() except Exception as ex: - LOG.exception("Failed to send usage create-event for " - "instance %s.", self.id) + LOG.error("Failed to send usage create-event for instance %s, " + "error: %s", self.id, str(ex)) error_message = "%s" % ex error_details = traceback.format_exc() finally: if error_message: inst_models.save_instance_fault( self.id, error_message, error_details, - skip_delta=CONF.usage_sleep_time + 1) + skip_delta=CONF.usage_sleep_time + 1 + ) def _create_port(self, network, security_groups, is_mgmt=False, is_public=False): @@ -774,7 +776,15 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin): raise TroveError(_("Service not active, status: %s") % status) c_id = self.db_info.compute_instance_id - server = self.nova_client.servers.get(c_id) + try: + server = self.nova_client.servers.get(c_id) + except Exception as e: + raise TroveError( + _("Failed to get server %(server)s for instance %(instance)s, " + "error: %(error)s"), + server=c_id, instance=self.id, error=str(e) + ) + server_status = server.status LOG.debug("Server status of instance %s is %s", self.id, server_status) if server_status in [InstanceStatus.ERROR, |