Return-Path: X-Original-To: apmail-jackrabbit-dev-archive@www.apache.org Delivered-To: apmail-jackrabbit-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9BCF37628 for ; Fri, 14 Oct 2011 14:05:23 +0000 (UTC) Received: (qmail 75369 invoked by uid 500); 14 Oct 2011 14:05:23 -0000 Delivered-To: apmail-jackrabbit-dev-archive@jackrabbit.apache.org Received: (qmail 75327 invoked by uid 500); 14 Oct 2011 14:05:23 -0000 Mailing-List: contact dev-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list dev@jackrabbit.apache.org Received: (qmail 75320 invoked by uid 99); 14 Oct 2011 14:05:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 14:05:23 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of alex.parvulescu@gmail.com designates 209.85.216.170 as permitted sender) Received: from [209.85.216.170] (HELO mail-qy0-f170.google.com) (209.85.216.170) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Oct 2011 14:05:16 +0000 Received: by qyl16 with SMTP id 16so1645541qyl.1 for ; Fri, 14 Oct 2011 07:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; bh=hukw+N04EQfjuObP+qpf2E3tfKTCxfCNqVCxUrhsZYY=; b=uDAmPpgGFZnW6nwRaUJ4p/+0pfTB+zasaX1r7km+wjv1kcUeU2M2rV/oFZ6rs+h1yf r9Cjdd8lUIMDWgq3u4oVUDoR8yFhkIZ9al2NbFJb/hTVS695xlokVCArNIFJsu0xkI85 qI9Km12ZBOG/A1UiUJZqv5w/gkdDM641X2HqI= MIME-Version: 1.0 Received: by 10.229.67.218 with SMTP id s26mr1935376qci.133.1318601093102; Fri, 14 Oct 2011 07:04:53 -0700 (PDT) Received: by 10.229.232.197 with HTTP; Fri, 14 Oct 2011 07:04:53 -0700 (PDT) In-Reply-To: <20111014140059.B5E792388A02@eris.apache.org> References: <20111014140059.B5E792388A02@eris.apache.org> Date: Fri, 14 Oct 2011 16:04:53 +0200 Message-ID: Subject: Re: svn commit: r1183364 - in /jackrabbit/branches/2.2/jackrabbit-core: ./ src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java From: Alex Parvulescu To: dev@jackrabbit.apache.org Content-Type: multipart/alternative; boundary=0016e64de504c13c4504af42bd8d X-Virus-Checked: Checked by ClamAV on apache.org --0016e64de504c13c4504af42bd8d Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable ok, what is all this props change stuff? I did a fresh checkout of jackrabbit-core 2.2, a svn merge -c 1183240 and svn commit. Do I need to rollback something? alex On Fri, Oct 14, 2011 at 4:00 PM, wrote: > Author: alexparvulescu > Date: Fri Oct 14 14:00:59 2011 > New Revision: 1183364 > > URL: http://svn.apache.org/viewvc?rev=3D1183364&view=3Drev > Log: > JCR-3098: adjusting log levels - backport to 2.2 > > Modified: > jackrabbit/branches/2.2/jackrabbit-core/ (props changed) > > jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrab= bit/core/cache/CacheManager.java > > Propchange: jackrabbit/branches/2.2/jackrabbit-core/ > > -------------------------------------------------------------------------= ----- > --- svn:mergeinfo (original) > +++ svn:mergeinfo Fri Oct 14 14:00:59 2011 > @@ -3,4 +3,4 @@ > /jackrabbit/sandbox/JCR-1456/jackrabbit-core:774917-886178 > /jackrabbit/sandbox/JCR-2170/jackrabbit-core:812417-816332 > /jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-core:795441-795863 > > -/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,103906= 4,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1= 040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042= 978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554= ,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,10= 44613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,10498= 78,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-= 1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,105= 0212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,105512= 7,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1= 065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079= 317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117= ,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,11= 00286,1101046,110 > > 2601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,114= 1141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,115717= 5,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1= 177249,1177340,1179548,1180922,1182713,1182835 > > +/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,103906= 4,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1= 040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042= 978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554= ,1043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,10= 44613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,10498= 78,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-= 1049911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,105= 0212,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,105512= 7,1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,1= 065622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,1079= 317,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117= ,1092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,11= 00286,1101046,110 > > 2601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,114= 1141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,115717= 5,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1= 177249,1177340,1179548,1180922,1182713,1182835,1183240 > > Modified: > jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabb= it/core/cache/CacheManager.java > URL: > http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-core/src/= main/java/org/apache/jackrabbit/core/cache/CacheManager.java?rev=3D1183364&= r1=3D1183363&r2=3D1183364&view=3Ddiff > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabb= it/core/cache/CacheManager.java > (original) > +++ > jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackrabb= it/core/cache/CacheManager.java > Fri Oct 14 14:00:59 2011 > @@ -156,13 +156,13 @@ public class CacheManager implements Cac > * Log info about the caches. > */ > private void logCacheStats() { > - if (log.isInfoEnabled()) { > + if (log.isDebugEnabled()) { > long now =3D System.currentTimeMillis(); > if (now < nextLogStats) { > return; > } > for (Cache cache : caches.keySet()) { > - log.info(cache.getCacheInfoAsString()); > + log.debug(cache.getCacheInfoAsString()); > } > nextLogStats =3D now + minLogStatsInterval; > } > @@ -172,8 +172,8 @@ public class CacheManager implements Cac > * Re-calculate the maximum memory for each cache, and set the new > limits. > */ > private void resizeAll() { > - if (log.isDebugEnabled()) { > - log.debug("resizeAll size=3D" + caches.size()); > + if (log.isTraceEnabled()) { > + log.trace("resizeAll size=3D" + caches.size()); > } > // get strong references > // entries in a weak hash map may disappear any time > @@ -238,8 +238,8 @@ public class CacheManager implements Cac > // set the new limit > for (CacheInfo info : infos) { > Cache cache =3D info.getCache(); > - if (log.isDebugEnabled()) { > - log.debug(cache + " now:" + cache.getMaxMemorySize() + " > used:" > + if (log.isTraceEnabled()) { > + log.trace(cache + " now:" + cache.getMaxMemorySize() + " > used:" > + info.getMemoryUsed() + " access:" + > info.getAccessCount() > + " new:" + info.getMemory()); > } > > > --0016e64de504c13c4504af42bd8d Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable ok,

what is all this props change stuff?

<= /div>
I did a fresh checkout of jackrabbit-core 2.2, a=A0svn merge -c 1= 183240 and svn commit.

Do I need to rollback somet= hing?

alex


On Fr= i, Oct 14, 2011 at 4:00 PM, <alexparvulescu@apache.org> wrote:
Author: alexparvulescu
Date: Fri Oct 14 14:00:59 2011
New Revision: 1183364

URL: http://svn.apache.org/viewvc?rev=3D1183364&view=3Drev=
Log:
JCR-3098: adjusting log levels - backport to 2.2

Modified:
=A0 =A0jackrabbit/branches/2.2/jackrabbit-core/ =A0 (props changed)
=A0 =A0jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/ja= ckrabbit/core/cache/CacheManager.java

Propchange: jackrabbit/branches/2.2/jackrabbit-core/
---------------------------------------------------------------------------= ---
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 14 14:00:59 2011
@@ -3,4 +3,4 @@
=A0/jackrabbit/sandbox/JCR-1456/jackrabbit-core:774917-886178
=A0/jackrabbit/sandbox/JCR-2170/jackrabbit-core:812417-816332
=A0/jackrabbit/sandbox/tripod-JCR-2209/jackrabbit-core:795441-795863
-/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,1039064,= 1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,104= 0601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,104297= 8-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1= 043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044= 613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878= ,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-10= 49911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,10502= 12,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,= 1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,106= 5622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,107931= 7,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1= 092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100= 286,1101046,110
=A02601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,114= 1141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,115717= 5,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1= 177249,1177340,1179548,1180922,1182713,1182835
+/jackrabbit/trunk/jackrabbit-core:1038201,1038203,1038205,1038657,1039064,= 1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,104= 0601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,104297= 8-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1= 043616,1043618,1043637,1043656,1043893,1043897,1044239,1044312,1044451,1044= 613,1049473,1049491,1049514,1049518,1049520,1049859,1049870,1049874,1049878= ,1049880,1049883,1049889,1049891,1049894-1049895,1049899-1049901,1049909-10= 49911,1049915-1049916,1049919,1049923,1049925,1049931,1049936,1049939,10502= 12,1050298,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,= 1055134,1055164,1055498,1060431,1060434,1060753,1063756,1064670,1065599,106= 5622,1066059,1066071,1069831,1071562,1071573,1071680,1074140,1079314,107931= 7,1080186,1080540,1087304,1088991,1089032,1089053,1089436,1092106,1092117,1= 092683,1097363,1097513-1097514,1098963-1098964,1099033,1099172,1100242,1100= 286,1101046,110
=A02601,1104027,1128175,1130192,1130228,1132993,1136353,1136360,1138511,114= 1141,1141717,1143396,1143738,1144332,1144338,1144695,1152258,1155431,115717= 5,1165609,1173196,1174822,1174887,1175988,1176423,1176465,1176515,1176546,1= 177249,1177340,1179548,1180922,1182713,1182835,1183240

Modified: jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/= jackrabbit/core/cache/CacheManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-cor= e/src/main/java/org/apache/jackrabbit/core/cache/CacheManager.java?rev=3D11= 83364&r1=3D1183363&r2=3D1183364&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D
--- jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackra= bbit/core/cache/CacheManager.java (original)
+++ jackrabbit/branches/2.2/jackrabbit-core/src/main/java/org/apache/jackra= bbit/core/cache/CacheManager.java Fri Oct 14 14:00:59 2011
@@ -156,13 +156,13 @@ public class CacheManager implements Cac
=A0 =A0 =A0* Log info about the caches.
=A0 =A0 =A0*/
=A0 =A0 private void logCacheStats() {
- =A0 =A0 =A0 =A0if (log.isInfoEnabled()) {
+ =A0 =A0 =A0 =A0if (log.isDebugEnabled()) {
=A0 =A0 =A0 =A0 =A0 =A0 long now =3D System.currentTimeMillis();
=A0 =A0 =A0 =A0 =A0 =A0 if (now < nextLogStats) {
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return;
=A0 =A0 =A0 =A0 =A0 =A0 }
=A0 =A0 =A0 =A0 =A0 =A0 for (Cache cache : caches.keySet()) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0log.info(cache.getCacheInfoAsString());
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0log.debug(cache.getCacheInfoAsString()); =A0 =A0 =A0 =A0 =A0 =A0 }
=A0 =A0 =A0 =A0 =A0 =A0 nextLogStats =3D now + minLogStatsInterval;
=A0 =A0 =A0 =A0 }
@@ -172,8 +172,8 @@ public class CacheManager implements Cac
=A0 =A0 =A0* Re-calculate the maximum memory for each cache, and set the n= ew limits.
=A0 =A0 =A0*/
=A0 =A0 private void resizeAll() {
- =A0 =A0 =A0 =A0if (log.isDebugEnabled()) {
- =A0 =A0 =A0 =A0 =A0 =A0log.debug("resizeAll size=3D" + caches.s= ize());
+ =A0 =A0 =A0 =A0if (log.isTraceEnabled()) {
+ =A0 =A0 =A0 =A0 =A0 =A0log.trace("resizeAll size=3D" + caches.s= ize());
=A0 =A0 =A0 =A0 }
=A0 =A0 =A0 =A0 // get strong references
=A0 =A0 =A0 =A0 // entries in a weak hash map may disappear any time
@@ -238,8 +238,8 @@ public class CacheManager implements Cac
=A0 =A0 =A0 =A0 // set the new limit
=A0 =A0 =A0 =A0 for (CacheInfo info : infos) {
=A0 =A0 =A0 =A0 =A0 =A0 Cache cache =3D info.getCache();
- =A0 =A0 =A0 =A0 =A0 =A0if (log.isDebugEnabled()) {
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0log.debug(cache + " now:" + cach= e.getMaxMemorySize() + " used:"
+ =A0 =A0 =A0 =A0 =A0 =A0if (log.isTraceEnabled()) {
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0log.trace(cache + " now:" + cach= e.getMaxMemorySize() + " used:"
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 + info.getMemoryUsed() + &= quot; access:" + info.getAccessCount()
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 + " new:" + info= .getMemory());
=A0 =A0 =A0 =A0 =A0 =A0 }



--0016e64de504c13c4504af42bd8d--