From: Anirudha Bose <ani07nov@gmail.com>
Date: Wed, 17 Aug 2016 06:45:25 +0000 (+0530)
Subject: ceph-disk: Set space_symlink to the path, not file object
X-Git-Tag: v10.2.4~16^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e200b17016a1a7cd103affde2d2b265916755498;p=ceph.git

ceph-disk: Set space_symlink to the path, not file object

Signed-off-by: Anirudha Bose <ani07nov@gmail.com>
(cherry picked from commit d290454cf5f660c1681eefd70a38e79da683525f)
---

diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 9f4a2f03a0b0..f81425f9c902 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -1990,21 +1990,22 @@ class PrepareSpace(object):
             raise Error('unexpected type ', self.type)
 
     def prepare_file(self):
-        if not os.path.exists(getattr(self.args, self.name)):
+        space_filename = getattr(self.args, self.name)
+        if not os.path.exists(space_filename):
             LOG.debug('Creating %s file %s with size 0'
                       ' (ceph-osd will resize and allocate)',
                       self.name,
-                      getattr(self.args, self.name))
-            with open(getattr(self.args, self.name), 'wb') as space_file:
-                pass
+                      space_filename)
+            space_file = open(space_filename, 'wb')
+            space_file.close()
 
         LOG.debug('%s is file %s',
                   self.name.capitalize(),
-                  getattr(self.args, self.name))
+                  space_filename)
         LOG.warning('OSD will not be hot-swappable if %s is '
                     'not the same device as the osd data' %
                     self.name)
-        self.space_symlink = space_file
+        self.space_symlink = space_filename
 
     def prepare_device(self):
         reusing_partition = False