From d036168ecb3a70c6205638e5c65937be8daffa46 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Wed, 24 Sep 2014 10:28:04 -0700 Subject: [PATCH] cleaning up more conflicts --- framework/db/src/com/cloud/utils/db/Merovingian2.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java b/framework/db/src/com/cloud/utils/db/Merovingian2.java index 66215d3781e..0c76fb5886d 100644 --- a/framework/db/src/com/cloud/utils/db/Merovingian2.java +++ b/framework/db/src/com/cloud/utils/db/Merovingian2.java @@ -138,9 +138,9 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean { } 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 class Merovingian2 extends StandardMBean implements MerovingianMBean { 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) {