Return-Path: X-Original-To: apmail-incubator-drill-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-drill-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FB2B17C99 for ; Sat, 8 Nov 2014 00:03:03 +0000 (UTC) Received: (qmail 3508 invoked by uid 500); 8 Nov 2014 00:03:03 -0000 Delivered-To: apmail-incubator-drill-commits-archive@incubator.apache.org Received: (qmail 3422 invoked by uid 500); 8 Nov 2014 00:03:03 -0000 Mailing-List: contact drill-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: drill-commits@incubator.apache.org Delivered-To: mailing list drill-commits@incubator.apache.org Received: (qmail 3361 invoked by uid 99); 8 Nov 2014 00:03:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Nov 2014 00:03:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 00FE699E477; Sat, 8 Nov 2014 00:03:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jni@apache.org To: drill-commits@incubator.apache.org Date: Sat, 08 Nov 2014 00:03:10 -0000 Message-Id: <83ac9778fe0a4347a2d84f7a0fcd573a@git.apache.org> In-Reply-To: <69ed953a43704593b811e967e6b7bc35@git.apache.org> References: <69ed953a43704593b811e967e6b7bc35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/16] incubator-drill git commit: DRILL-1578: Accountor message should be trace messages DRILL-1578: Accountor message should be trace messages Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/30c40eac Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/30c40eac Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/30c40eac Branch: refs/heads/master Commit: 30c40eac72d53b4c75631a313376a31a1b68efbb Parents: 1d7f621 Author: Parth Chandra Authored: Thu Nov 6 14:47:26 2014 -0800 Committer: Jinfeng Ni Committed: Fri Nov 7 10:50:56 2014 -0800 ---------------------------------------------------------------------- .../org/apache/drill/exec/memory/Accountor.java | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/30c40eac/exec/java-exec/src/main/java/org/apache/drill/exec/memory/Accountor.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/Accountor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/Accountor.java index 0874585..0a8c405 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/memory/Accountor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/memory/Accountor.java @@ -133,7 +133,7 @@ public class Accountor { } public boolean reserve(long size) { - logger.debug("Fragment:"+fragmentStr+" Reserved "+size+" bytes. Total Allocated: "+getAllocation()); + logger.trace("Fragment:"+fragmentStr+" Reserved "+size+" bytes. Total Allocated: "+getAllocation()); return remainder.get(size, this.applyFragmentLimit); } @@ -188,7 +188,7 @@ public class Accountor { if (parent != null){ parent.addFragmentContext(c); }else { - if(logger.isDebugEnabled()) { + if(logger.isTraceEnabled()) { FragmentHandle hndle; String fragStr; if(c!=null) { @@ -205,7 +205,7 @@ public class Accountor { sb.append("\n"); } - logger.debug("Fragment " + fragStr + " added to root accountor.\n"+sb.toString()); + logger.trace("Fragment " + fragStr + " added to root accountor.\n"+sb.toString()); } synchronized(this) { fragmentContexts.add(c); @@ -230,7 +230,7 @@ public class Accountor { fragStr = "[Null Context]"; } fragStr += " (Object Id: " + System.identityHashCode(c) + ")"; - logger.debug("Fragment " + fragStr + " removed from root accountor"); + logger.trace("Fragment " + fragStr + " removed from root accountor"); } synchronized(this) { fragmentContexts.remove(c); @@ -261,8 +261,8 @@ public class Accountor { allocatedMemory += fragment.getAllocator().getAllocatedMemory(); } } - if(logger.isDebugEnabled()) { - logger.info("Resetting Fragment Memory Limit: total Available memory== "+total + if(logger.isTraceEnabled()) { + logger.trace("Resetting Fragment Memory Limit: total Available memory== "+total +" Total Allocated Memory :"+allocatedMemory +" Number of fragments: "+nFragments + " fragmentMemOvercommitFactor: "+fragmentMemOvercommitFactor @@ -275,14 +275,14 @@ public class Accountor { fragment.setFragmentLimit((long) (rem * fragmentMemOvercommitFactor)); } } - if(logger.isDebugEnabled() && false){ + if(logger.isTraceEnabled() && false){ StringBuffer sb= new StringBuffer(); sb.append("[root](0:0)"); sb.append("Allocated memory: "); sb.append(this.getAllocation()); sb.append(" Fragment Limit: "); sb.append(this.getFragmentLimit()); - logger.debug(sb.toString()); + logger.trace(sb.toString()); for(FragmentContext fragment: fragmentContexts){ sb= new StringBuffer(); if (handle != null) { @@ -300,9 +300,9 @@ public class Accountor { sb.append(fragment.getAllocator().getAllocatedMemory()); sb.append(" Fragment Limit: "); sb.append(fragment.getAllocator().getFragmentLimit()); - logger.debug(sb.toString()); + logger.trace(sb.toString()); } - logger.debug("Resetting Complete"); + logger.trace("Resetting Complete"); } } } @@ -374,7 +374,7 @@ public class Accountor { if (parent != null && parent.parent==null) { // This is a fragment level accountor this.fragmentLimit=getAllocation()+add; this.remainder.setLimit(this.fragmentLimit); - logger.debug("Fragment "+fragmentStr+" memory limit set to "+this.fragmentLimit); + logger.trace("Fragment "+fragmentStr+" memory limit set to "+this.fragmentLimit); } }