diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2010-08-20 01:24:59 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-08-20 01:24:59 +0000 |
| commit | cfe3b2a6dd73e56652f99a573c1bb0abe5a648d4 (patch) | |
| tree | e2d169de490742905798f87c47202b59c3c6e0d7 /nova/volume | |
| parent | 49ef2b293429c9f9b3d7444402e3f7d3d0570d48 (diff) | |
| parent | e5a448a616173cd391aaf458f5e0e5ff94a42c89 (diff) | |
Check exit codes when spawning processes by default
Also pass --fail to curl so that it sets exit code when download fails
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/service.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nova/volume/service.py b/nova/volume/service.py index 104bafe90..be62f621d 100644 --- a/nova/volume/service.py +++ b/nova/volume/service.py @@ -131,8 +131,10 @@ class VolumeService(service.Service): if FLAGS.fake_storage: return # NOTE(vish): these commands sometimes sends output to stderr for warnings - yield process.simple_execute("sudo vblade-persist auto all", error_ok=1) - yield process.simple_execute("sudo vblade-persist start all", error_ok=1) + yield process.simple_execute( "sudo vblade-persist auto all", + terminate_on_stderr=False) + yield process.simple_execute( "sudo vblade-persist start all", + terminate_on_stderr=False) @defer.inlineCallbacks def _init_volume_group(self): @@ -247,13 +249,14 @@ class Volume(datastore.BasicModel): "sudo lvcreate -L %s -n %s %s" % (sizestr, self['volume_id'], FLAGS.volume_group), - error_ok=1) + terminate_on_stderr=False) @defer.inlineCallbacks def _delete_lv(self): yield process.simple_execute( "sudo lvremove -f %s/%s" % (FLAGS.volume_group, - self['volume_id']), error_ok=1) + self['volume_id']), + terminate_on_stderr=False) @property def __devices_key(self): @@ -281,7 +284,8 @@ class Volume(datastore.BasicModel): self['blade_id'], FLAGS.aoe_eth_dev, FLAGS.volume_group, - self['volume_id']), error_ok=1) + self['volume_id']), + terminate_on_stderr=False) @defer.inlineCallbacks def _remove_export(self): @@ -294,10 +298,12 @@ class Volume(datastore.BasicModel): def _exec_remove_export(self): yield process.simple_execute( "sudo vblade-persist stop %s %s" % (self['shelf_id'], - self['blade_id']), error_ok=1) + self['blade_id']), + terminate_on_stderr=False) yield process.simple_execute( "sudo vblade-persist destroy %s %s" % (self['shelf_id'], - self['blade_id']), error_ok=1) + self['blade_id']), + terminate_on_stderr=False) class FakeVolume(Volume): |