[NEW PATCH] BZ#699976 Related, use RHEVM leasetime and timeout (via gerrit-bot)

[Federico Simoncelli]

New patch submitted by Federico Simoncelli ([e-mail])

You can review this change at: http://gerrit.usersys.redhat.com/677

commit 65f4e23172e8cb2b2a6ca505bdef8006c97b83b6
Author: Federico Simoncelli 
Date:   Thu Jul 7 14:04:05 2011 +0000

BZ#699976 Related, use RHEVM leasetime and timeout

Use the values provided by RHEV-M for LOCK_RENEWAL_INTERVAL, LEASE_TIME,
    LEASE_RETRIES and IO_OP_TIMEOUT.

Change-Id: If326eb1955e771e303f4a39943142b3007187c6c

diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index 41363ba..4422487 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -192,7 +192,7 @@ def sizeStr2Int(size_str):

def intOrDefault(default, val):
     try:
-        int(val)
+        return int(val)
     except ValueError:
         return default

@@ -388,6 +388,12 @@ class StorageDomain:

def acquireClusterLock(self, hostID):
         self.refresh()
+        self._clusterLock.setParams(
+            self.getMetaParam(DMDK_LOCK_RENEWAL_INTERVAL_SEC),
+            self.getMetaParam(DMDK_LEASE_TIME_SEC),
+            self.getMetaParam(DMDK_LEASE_RETRIES),
+            self.getMetaParam(DMDK_IO_OP_TIMEOUT_SEC)
+        )
         self._clusterLock.acquire(hostID)

def releaseClusterLock(self):