From c000a1f88141c7887943a96a8a7ced3b79d70f7e Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sat, 11 Sep 2010 08:43:48 -0700 Subject: added terminated_at to volume and moved setting of terminated_at into cloud --- nova/volume/manager.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'nova/volume') diff --git a/nova/volume/manager.py b/nova/volume/manager.py index a6f4a6baf..7ca03b319 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -22,6 +22,7 @@ destroying persistent storage volumes, ala EBS. """ import logging +import datetime from twisted.internet import defer @@ -97,6 +98,8 @@ class AOEManager(manager.Manager): logging.debug("volume %s: re-exporting all values", volume_id) yield self.driver.ensure_exports() + now = datetime.datetime.utcnow() + self.db.volume_update(context, volume_id, {'launched_at': now}) logging.debug("volume %s: created successfully", volume_id) defer.returnValue(volume_id) -- cgit From c7921fd14e680288c5626294105761005684b343 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Sat, 11 Sep 2010 22:48:59 -0700 Subject: don't allow deletion or attachment of volume unless it is available --- nova/volume/manager.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'nova/volume') diff --git a/nova/volume/manager.py b/nova/volume/manager.py index 7ca03b319..034763512 100644 --- a/nova/volume/manager.py +++ b/nova/volume/manager.py @@ -90,16 +90,13 @@ class AOEManager(manager.Manager): yield self.driver.create_export(volume_ref['str_id'], shelf_id, blade_id) - # TODO(joshua): We need to trigger a fanout message - # for aoe-discover on all the nodes - - self.db.volume_update(context, volume_id, {'status': 'available'}) logging.debug("volume %s: re-exporting all values", volume_id) yield self.driver.ensure_exports() now = datetime.datetime.utcnow() - self.db.volume_update(context, volume_id, {'launched_at': now}) + self.db.volume_update(context, volume_id, {'status': 'available', + 'launched_at': now}) logging.debug("volume %s: created successfully", volume_id) defer.returnValue(volume_id) -- cgit