svn commit: r1790955 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler: LockBasedScheduler.java Scheduler.java

[mduerig]

Author: mduerig
Date: Tue Apr 11 11:10:40 2017
New Revision: 1790955

URL: http://svn.apache.org/viewvc?rev=1790955&view=rev
Log:
OAK-4122 - Replace the commit semaphore in the segment node store with a 
scheduler
Fix broken Javadoc links

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java?rev=1790955&r1=1790954&r2=1790955&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/LockBasedScheduler.java
 Tue Apr 11 11:10:40 2017
@@ -130,7 +130,7 @@ public class LockBasedScheduler implemen
      * Sets the number of seconds to wait for the attempt to grab the lock to
      * create a checkpoint
      */
-    private int checkpointsLockWaitTime = 
Integer.getInteger("oak.checkpoints.lockWaitTime", 10);
+    private final int checkpointsLockWaitTime = 
Integer.getInteger("oak.checkpoints.lockWaitTime", 10);
 
     static final String ROOT = "root";
 

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java?rev=1790955&r1=1790954&r2=1790955&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/scheduler/Scheduler.java
 Tue Apr 11 11:10:40 2017
@@ -34,13 +34,13 @@ import org.apache.jackrabbit.oak.spi.sta
  * as it guarantees all changes are applied atomically without changing
  * the semantics of the changes recorded in the {@code NodeBuilder} or
  * the semantics of the {@code CommitHook} contained in the actual {@code 
Commit} 
- * passed to the {@link #schedule(Commit, SchedulerOption) schedule}
+ * passed to the {@link #schedule(Commit, SchedulerOption...) schedule}
  * method.
  */
 public interface Scheduler {
     
     /**
-     * Scheduling options for parameterizing individual commits.
+     * Scheduling options for parametrizing individual commits.
      * (E.g. expedite, prioritize, defer, collapse, coalesce, parallelize, 
etc).
      *
      */
@@ -66,7 +66,8 @@ public interface Scheduler {
      * reference.
      * <p>
      * The {@code properties} passed to this methods are associated with the
-     * checkpoint and can be retrieved through the {@link 
#checkpointInfo(String)}
+     * checkpoint and can be retrieved through the
+     * {@link 
org.apache.jackrabbit.oak.spi.state.NodeStore#checkpointInfo(String)}
      * method. Its semantics is entirely application specific.
      *
      * @param lifetime time (in milliseconds, &gt; 0) that the checkpoint
@@ -79,7 +80,7 @@ public interface Scheduler {
     /**
      * Releases the provided checkpoint. If the provided checkpoint doesn't 
exist this method should return {@code true}.
      *
-     * @param checkpoint string reference of a checkpoint
+     * @param name string reference of a checkpoint
      * @return {@code true} if the checkpoint was successfully removed, or if 
it doesn't exist
      */
     boolean removeCheckpoint(String name);