From d8ad3e32bc6ee41d576fa99473834485a5266f93 Mon Sep 17 00:00:00 2001 From: Anthony Xu Date: Tue, 23 Sep 2014 17:35:47 -0700 Subject: [PATCH] throw timeout exception when lock acquire times out --- framework/db/src/com/cloud/utils/db/Merovingian2.java | 7 +++---- 1 file changed, 3 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 f6df4934a9f..a930dffdb5e 100644 --- a/framework/db/src/com/cloud/utils/db/Merovingian2.java +++ b/framework/db/src/com/cloud/utils/db/Merovingian2.java @@ -138,10 +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)); - } - return false; + String msg = "Timed out on acquiring lock " + key + " . Waited for " + ((InaccurateClock.getTime() - startTime)/1000) + "seconds"; + s_logger.warn(msg); + throw new CloudRuntimeException(msg); } protected boolean increment(String key, String threadName, int threadId) {