Change in vdsm[master]: Fix races in sd.createMasterDir()

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 <ewarszaw(a)redhat.com&gt;
---
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 <ewarszaw(a)redhat.com&gt;

Daniel Paikov has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Paikov <paikov(a)gmail.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1: Verified

Build Successful 

http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1501/ : SUCCESS

http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1464/ : SUCCESS

--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1464/ (2/2)

--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Fix races in sd.createMasterDir()

Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Signed-off-by: Eduardo <ewarszaw(a)redhat.com&gt;
---
M vdsm/storage/sd.py
M vdsm/storage/sp.py
2 files changed, 9 insertions(+), 13 deletions(-)

Approvals:
  Daniel Paikov: Verified
  oVirt Jenkins CI Server: Verified
  Dan Kenigsberg: Looks good to me, approved


--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Paikov <paikov(a)gmail.com&gt;
Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1: Looks good to me, approved

--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Paikov <paikov(a)gmail.com&gt;
Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Haim Ateya]

Haim Ateya has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1: (1 inline comment)

....................................................
File vdsm/storage/sd.py
Line 608:         vmsDir = self.getVMsDir()
Line 609:         self.log.debug("creating vms dir: %s" % vmsDir)
Line 610:         self.oop.fileUtils.createdir(vmsDir)
Line 611:         tasksDir = self.getTasksDir()
Line 612:         self.log.debug("creating task dir: %s" % tasksDir)
s/task/tasks/g
Line 613:         self.oop.fileUtils.createdir(tasksDir)
Line 614: 
Line 615:     def activate(self):
Line 616:         """


--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Daniel Paikov <paikov(a)gmail.com&gt;
Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com&gt;
Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server

[Jenkins CI RO]

oVirt Jenkins CI Server has posted comments on this change.

Change subject: Fix races in sd.createMasterDir()
......................................................................


Patch Set 1:

Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1501/ (1/2)

--
To view, visit http://gerrit.ovirt.org/12806
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I6a79b620853663bc7ab7e33633bd6dc9f67759e6
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;
Gerrit-Reviewer: oVirt Jenkins CI Server