Skip to content

Commit

Permalink
Check if dir exists before calling listdir
Browse files Browse the repository at this point in the history
Changes along the way to how we clean up and detach after
copying an image to a volume exposed a problem in the cleanup
of the brick/initiator routines.

The clean up in the initiator detach was doing a blind listdir
of /dev/disk/by-path, however due to detach and cleanup being
called upon completion of the image download to the volume if
there are no other devices mapped in this directory the directory
is removed.

The result was that even though the create and copy of the image
was succesful, the HostDriver code called os.lisdir on a directory
that doesn't exist any longer and raises an unhandled exception that
cause the taskflow mechanism to mark the volume as failed.

Change-Id: I488755c1a49a77f42efbb58a7a4eb6f4f084df07
Closes-bug: #1243980
(cherry picked from commit 1766a5a)
  • Loading branch information
j-griffith committed Oct 24, 2013
1 parent eedc8ed commit fb8db56
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion cinder/brick/initiator/host_driver.py
Expand Up @@ -22,8 +22,10 @@ class HostDriver(object):

def get_all_block_devices(self):
"""Get the list of all block devices seen in /dev/disk/by-path/."""
files = []
dir = "/dev/disk/by-path/"
files = os.listdir(dir)
if os.path.isdir(dir):
files = os.listdir(dir)
devices = []
for file in files:
devices.append(dir + file)
Expand Down

0 comments on commit fb8db56

Please sign in to comment.