Eduardo has uploaded a new change for review. Change subject: Fix races in sd.createMasterDir() ......................................................................
Fix races in sd.createMasterDir() Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6 Signed-off-by: Eduardo <[email protected]> --- M vdsm/storage/sd.py M vdsm/storage/sp.py 2 files changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/12806/1 diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 9ce836b..48ee7d5 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -601,20 +601,16 @@ return vmsInfo - def createMasterTree(self, log=False): + def createMasterTree(self): """ + Make tasks and vms directories on master directory. """ - # Build new 'master' tree - pdir = self.getVMsDir() - if not os.path.exists(pdir): - if log: - self.log.warning("vms dir not found, creating (%s)" % pdir) - os.makedirs(pdir) # FIXME remove if not a pdir - pdir = self.getTasksDir() - if not os.path.exists(pdir): - if log: - self.log.warning("tasks dir not found, creating (%s)" % pdir) - os.makedirs(pdir) + vmsDir = self.getVMsDir() + self.log.debug("creating vms dir: %s" % vmsDir) + self.oop.fileUtils.createdir(vmsDir) + tasksDir = self.getTasksDir() + self.log.debug("creating task dir: %s" % tasksDir) + self.oop.fileUtils.createdir(tasksDir) def activate(self): """ diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 7a64bf5..516d3fe 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -291,7 +291,7 @@ self._upgradePool(expectedDomVersion, __securityOverride=True) self.masterDomain.mountMaster() - self.masterDomain.createMasterTree(log=True) + self.masterDomain.createMasterTree() self.tasksDir = os.path.join(self.poolPath, POOL_MASTER_DOMAIN, sd.MASTER_FS_DIR, sd.TASKS_DIR) -- To view, visit http://gerrit.ovirt.org/12806 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
