You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2014/12/16 16:14:06 UTC
svn commit: r1645970 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
Author: mduerig
Date: Tue Dec 16 15:14:05 2014
New Revision: 1645970
URL: http://svn.apache.org/r1645970
Log:
OAK-2192 Concurrent commit during compaction results in mixed segments
Make 10h the default segment life time
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java?rev=1645970&r1=1645969&r2=1645970&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java Tue Dec 16 15:14:05 2014
@@ -72,7 +72,7 @@ public abstract class CompactionStrategy
public static final CleanupType CLEANUP_DEFAULT = CleanupType.CLEAN_OLD;
- public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 5;
+ public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 60 + 10; // 10h
public static final byte MEMORY_THRESHOLD_DEFAULT = 5;
Re: svn commit: r1645970 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
Posted by Michael Dürig <md...@apache.org>.
Thanks for spotting! Good to have people closely looking at the commits.
Fixed it in trunk and 1.0
Michael
On 17.12.14 9:29 , Julian Sedding wrote:
> Hi Michael
>
> I believe there's a typo in this commit. I don't know the larger
> context, but from pure looks I would expect expect multiplication with
> 10 rather than addition. Can you please check? Thanks.
>
> Regards
> Julian
>
> On Tue, Dec 16, 2014 at 4:14 PM, <md...@apache.org> wrote:
>> Author: mduerig
>> Date: Tue Dec 16 15:14:05 2014
>> New Revision: 1645970
>>
>> URL: http://svn.apache.org/r1645970
>> Log:
>> OAK-2192 Concurrent commit during compaction results in mixed segments
>> Make 10h the default segment life time
>>
>> Modified:
>> jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
>>
>> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
>> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java?rev=1645970&r1=1645969&r2=1645970&view=diff
>> ==============================================================================
>> --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java (original)
>> +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java Tue Dec 16 15:14:05 2014
>> @@ -72,7 +72,7 @@ public abstract class CompactionStrategy
>>
>> public static final CleanupType CLEANUP_DEFAULT = CleanupType.CLEAN_OLD;
>>
>> - public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 5;
>> + public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 60 + 10; // 10h
>>
>> public static final byte MEMORY_THRESHOLD_DEFAULT = 5;
>>
>>
>>
Re: svn commit: r1645970 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
Posted by Julian Sedding <js...@gmail.com>.
Hi Michael
I believe there's a typo in this commit. I don't know the larger
context, but from pure looks I would expect expect multiplication with
10 rather than addition. Can you please check? Thanks.
Regards
Julian
On Tue, Dec 16, 2014 at 4:14 PM, <md...@apache.org> wrote:
> Author: mduerig
> Date: Tue Dec 16 15:14:05 2014
> New Revision: 1645970
>
> URL: http://svn.apache.org/r1645970
> Log:
> OAK-2192 Concurrent commit during compaction results in mixed segments
> Make 10h the default segment life time
>
> Modified:
> jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
>
> Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java
> URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java?rev=1645970&r1=1645969&r2=1645970&view=diff
> ==============================================================================
> --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java (original)
> +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/compaction/CompactionStrategy.java Tue Dec 16 15:14:05 2014
> @@ -72,7 +72,7 @@ public abstract class CompactionStrategy
>
> public static final CleanupType CLEANUP_DEFAULT = CleanupType.CLEAN_OLD;
>
> - public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 5;
> + public static final long TIMESTAMP_DEFAULT = 1000 * 60 * 60 + 10; // 10h
>
> public static final byte MEMORY_THRESHOLD_DEFAULT = 5;
>
>
>