Commit 03dfa658 authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix the _RemoveBlockDevLinks() function

This is a forward-port of commit 1163 on the 1.2 branch:
  This fixes the removal of the instance symlinks (probably breakage from
  the glob changes).

  Reviewed-by: imsnah
parent 3c9c571d
......@@ -768,12 +768,14 @@ def _RemoveBlockDevLinks(instance_name):
"""Remove the block device symlinks belonging to the given instance.
"""
for i in os.listdir(constants.DISK_LINKS_DIR):
if os.path.islink(i) and i.startswith('%s-' % instance_name):
for short_name in os.listdir(constants.DISK_LINKS_DIR):
link_name = os.path.join(constants.DISK_LINKS_DIR, short_name)
if (os.path.islink(link_name) and
short_name.startswith('%s-' % instance_name)):
try:
os.remove(link)
except OSError, e:
pass # Ignore errors when removing the symlinks
os.remove(link_name)
except OSError:
logging.exception("Can't remove symlink '%s'", link_name)
def _GatherAndLinkBlockDevs(instance):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment