Change in vdsm[master]: clusterlock: Add reference counting
gerrit-hooks has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 11: * Update tracker: IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: clusterlock: Add reference counting
Jenkins CI RO has abandoned this change. Change subject: clusterlock: Add reference counting .. Abandoned Abandoned due to no activity - please restore if still relevant -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org
Change in vdsm[master]: clusterlock: Add reference counting
Adam Litke has restored this change. Change subject: clusterlock: Add reference counting .. Restored -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: restore Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
Jenkins CI RO has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 11: Abandoned due to no activity - please restore if still relevant -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
Jenkins CI RO has abandoned this change. Change subject: clusterlock: Add reference counting .. Abandoned Abandoned due to no activity - please restore if still relevant -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
gerrit-hooks has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 11: * Update tracker: IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenkins CI RO Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 11: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 11 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 10: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 10 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 9: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 9 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 8: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 8 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 7: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 6: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
oVirt Jenkins CI Server has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/18314/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/1544/ : SUCCESS -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
oVirt Jenkins CI Server has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 1: Build Started (2/2) -> http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/1544/ -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
oVirt Jenkins CI Server has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 1: Build Started (1/2) -> http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/18314/ -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
automat...@ovirt.org has posted comments on this change. Change subject: clusterlock: Add reference counting .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/40378 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: clusterlock: Add reference counting
Adam Litke has uploaded a new change for review. Change subject: clusterlock: Add reference counting .. clusterlock: Add reference counting The clusterLock can now be acquired by multiple threads of execution since it is used by SDM verbs now. We need reference counting to ensure that one thread does not release the clusterLock while another thread still needs it. Change-Id: I846116ae16e88a51bdce20f97ddf22859dea3086 Signed-off-by: Adam Litke --- M vdsm/storage/clusterlock.py 1 file changed, 55 insertions(+), 45 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/40378/1 diff --git a/vdsm/storage/clusterlock.py b/vdsm/storage/clusterlock.py index 86d47ad..96bba2b 100644 --- a/vdsm/storage/clusterlock.py +++ b/vdsm/storage/clusterlock.py @@ -211,6 +211,7 @@ def __init__(self, sdUUID, idsPath, leasesPath, *args): self._lock = threading.Lock() +self._clusterLockUsers = 0 self._sdUUID = sdUUID self._idsPath = idsPath self._leasesPath = leasesPath @@ -302,16 +303,22 @@ # ClusterLock. We could consider to remove it in the future but keeping it # for logging purpose is desirable. def acquireClusterLock(self, hostId): -self.log.info("Acquiring cluster lock for domain %s (id: %s)", - self._sdUUID, hostId) -self._acquire(SDM_LEASE_NAME, self.getLockDisk()) -self.log.debug("Cluster lock for domain %s successfully acquired " - "(id: %s)", self._sdUUID, hostId) +with nested(self._lock, SANLock._sanlock_lock): +self.log.info("Acquiring cluster lock for domain %s (id: %s)", + self._sdUUID, hostId) +if self._clusterLockUsers == 0: +self._acquire(SDM_LEASE_NAME, self.getLockDisk()) +self._clusterLockUsers = self._clusterLockUsers + 1 +self.log.debug("Cluster lock for domain %s successfully acquired " + "(id: %s, users: %i)", self._sdUUID, hostId, + self._clusterLockUsers) def acquireResource(self, resource, lockDisk, shared=False): -self.log.info("Acquiring resource lock for %s", resource) -self._acquire(resource, lockDisk, shared) -self.log.debug("Resource lock for %s successfully acquired", resource) +with nested(self._lock, SANLock._sanlock_lock): +self.log.info("Acquiring resource lock for %s", resource) +self._acquire(resource, lockDisk, shared) +self.log.debug("Resource lock for %s successfully acquired", + resource) def inquireClusterLock(self): resource, owners = self._inquire(SDM_LEASE_NAME, self.getLockDisk()) @@ -330,43 +337,47 @@ [owner.get("host_id") for owner in owners]) def releaseClusterLock(self): -self.log.info("Releasing cluster lock for domain %s", self._sdUUID) -self._release(SDM_LEASE_NAME, self.getLockDisk()) -self.log.debug("Cluster lock for domain %s successfully released", - self._sdUUID) +with self._lock: +self.log.info("Releasing cluster lock for domain %s", self._sdUUID) +if self._clusterLockUsers == 1: +self._release(SDM_LEASE_NAME, self.getLockDisk()) +self._clusterLockUsers = self._clusterLockUsers - 1 +self.log.debug("Cluster lock for domain %s successfully released " + "(users: %i)", self._sdUUID, self._clusterLockUsers) def releaseResource(self, resource, lockDisk): -self.log.info("Releasing resource lock for %s", resource) -self._release(resource, lockDisk) -self.log.debug("Resource lock for %s successfully released", resource) +with self._lock: +self.log.info("Releasing resource lock for %s", resource) +self._release(resource, lockDisk) +self.log.debug("Resource lock for %s successfully released", + resource) def _acquire(self, resource, lockDisk, shared=False): -with nested(self._lock, SANLock._sanlock_lock): -self.log.info("Acquiring resource %s, shared=%s", resource, shared) +self.log.info("Acquiring resource %s, shared=%s", resource, shared) -while True: -if SANLock._sanlock_fd is None: -try: -SANLock._sanlock_fd = sanlock.register() -except sanlock.SanlockException as e: -raise se.AcquireLockFailure( -self._sdUUID, e.errno, -"Cannot register to sanlock", str(e)) - +while True: +if SANLock._sanlock_fd is None: try: -sanlock.acquire(self._sdUUID, resource, lockDisk, -