cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From likit...@apache.org
Subject git commit: updated refs/heads/4.3 to 6df26fe
Date Fri, 06 Dec 2013 04:40:02 GMT
Updated Branches:
  refs/heads/4.3 e33f8f2f4 -> 6df26fe50


Since CLOUDSTACK-5336 is resolved, changing the log level to TRACE
Revert "CLOUDSTACK-5336. During regression automation management server hang with "out of
memory error"."

This reverts commit c055417589aba55b488bcfb003af7959ff2a63f5.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df26fe5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df26fe5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df26fe5

Branch: refs/heads/4.3
Commit: 6df26fe5045073d611231c43f75d088bc6cfd91d
Parents: e33f8f2
Author: Likitha Shetty <likitha.shetty@citrix.com>
Authored: Fri Dec 6 10:00:11 2013 +0530
Committer: Likitha Shetty <likitha.shetty@citrix.com>
Committed: Fri Dec 6 10:03:09 2013 +0530

----------------------------------------------------------------------
 .../cloud/hypervisor/vmware/util/VmwareContext.java    |  2 +-
 .../hypervisor/vmware/util/VmwareContextPool.java      | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df26fe5/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index f4fcfa8..c499576 100755
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -100,7 +100,7 @@ public class VmwareContext {
 		
 		registerOutstandingContext();
 		if(s_logger.isInfoEnabled())
-            s_logger.info("New VmwareContext object: " + System.identityHashCode(this) +
", current outstanding count: " + getOutstandingContextCount());
+			s_logger.info("New VmwareContext object, current outstanding count: " + getOutstandingContextCount());
 	}
 	
 	public boolean validate() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df26fe5/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
index 8db9599..c36b3a8 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContextPool.java
@@ -83,9 +83,8 @@ public class VmwareContextPool {
 				VmwareContext context = l.remove(0);
 				context.setPoolInfo(this, poolKey);
 				
-                if(s_logger.isInfoEnabled())
-                    s_logger.info("Return a VmwareContext from the idle pool: " + poolKey
+ ". current pool size: " + l.size() + ", " +
-                            "outstanding count: " + VmwareContext.getOutstandingContextCount()
+ ". context: " + System.identityHashCode(context));
+				if(s_logger.isTraceEnabled())
+					s_logger.trace("Return a VmwareContext from the idle pool: " + poolKey + ". current
pool size: " + l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount());
 				return context;
 			}
 			
@@ -108,11 +107,11 @@ public class VmwareContextPool {
 				context.clearStockObjects();
 				l.add(context);
 				
-                if(s_logger.isInfoEnabled())
-                    s_logger.info("Recycle VmwareContext into idle pool: " + context.getPoolKey()
+ ", current idle pool size: " 
-                            + l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount()
+ ". context: " + System.identityHashCode(context));
+				if(s_logger.isTraceEnabled())
+					s_logger.trace("Recycle VmwareContext into idle pool: " + context.getPoolKey() + ",
current idle pool size: " 
+						+ l.size() + ", outstanding count: " + VmwareContext.getOutstandingContextCount());
 			} else {
-				if(s_logger.isDebugEnabled())
+				if(s_logger.isTraceEnabled())
 					s_logger.trace("VmwareContextPool queue exceeds limits, queue size: " + l.size());
 				context.close();
 			}


Mime
View raw message