snbuback
diff --git a/‎framework/db/src/com/cloud/utils/db/Merovingian2.java‎
Lines changed: 6 additions & 4 deletions b/‎framework/db/src/com/cloud/utils/db/Merovingian2.java‎
Lines changed: 6 additions & 4 deletions
@@ -138,9 +138,9 @@ public boolean acquire(String key, int timeInSeconds) {
             } catch (InterruptedException e) {
             }
         }
-        if (s_logger.isTraceEnabled()) {
-            s_logger.trace("Timed out on acquiring lock " + key + ".  Waited for " + (InaccurateClock.getTime() - startTime));
-        }
+        String msg = "Timed out on acquiring lock " + key + " .  Waited for " + ((InaccurateClock.getTime() - startTime)/1000) +  "seconds";
+        Exception e = new CloudRuntimeException(msg);
+        s_logger.warn(msg, e);
         return false;
     }
 
@@ -270,7 +270,9 @@ public boolean release(String key) {
                     throw new CloudRuntimeException("release:Exception:"+ e.getMessage(), e);
                 }
             } else if (rows < 1) {
-                s_logger.warn("Was unable to find lock for the key " + key + " and thread id " + threadId);
+                String msg = ("Was unable to find lock for the key " + key + " and thread id " + threadId);
+                Exception e = new CloudRuntimeException(msg);
+                s_logger.warn(msg, e);
             }
             return rows == 1;
         } catch (Exception e) {
Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,9 @@ public boolean acquire(String key, int timeInSeconds) {`
`138`	`138`	`} catch (InterruptedException e) {`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- if (s_logger.isTraceEnabled()) {`
`142`		`- s_logger.trace("Timed out on acquiring lock " + key + ". Waited for " + (InaccurateClock.getTime() - startTime));`
`143`		`- }`
	`141`	`+ String msg = "Timed out on acquiring lock " + key + " . Waited for " + ((InaccurateClock.getTime() - startTime)/1000) + "seconds";`
	`142`	`+ Exception e = new CloudRuntimeException(msg);`
	`143`	`+ s_logger.warn(msg, e);`
`144`	`144`	`return false;`
`145`	`145`	`}`
`146`	`146`
`@@ -270,7 +270,9 @@ public boolean release(String key) {`
`270`	`270`	`throw new CloudRuntimeException("release:Exception:"+ e.getMessage(), e);`
`271`	`271`	`}`
`272`	`272`	`} else if (rows < 1) {`
`273`		`- s_logger.warn("Was unable to find lock for the key " + key + " and thread id " + threadId);`
	`273`	`+ String msg = ("Was unable to find lock for the key " + key + " and thread id " + threadId);`
	`274`	`+ Exception e = new CloudRuntimeException(msg);`
	`275`	`+ s_logger.warn(msg, e);`
`274`	`276`	`}`
`275`	`277`	`return rows == 1;`
`276`	`278`	`} catch (Exception e) {`