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 to...@apache.org on 2016/07/14 11:14:38 UTC

svn commit: r1752619 - /jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java

Author: tomekr
Date: Thu Jul 14 11:14:38 2016
New Revision: 1752619

URL: http://svn.apache.org/viewvc?rev=1752619&view=rev
Log:
OAK-4169: Make the bulk createOrUpdate retry count configurable in Mongo

Modified:
    jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java

Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java?rev=1752619&r1=1752618&r2=1752619&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java Thu Jul 14 11:14:38 2016
@@ -180,6 +180,15 @@ public class MongoDocumentStore implemen
     private int bulkSize =
             Integer.getInteger("oak.mongo.bulkSize", 30);
 
+    /**
+     * How many times should be the bulk update request retries in case of
+     * a conflict.
+     * <p>
+     * Default is 0 (no retries).
+     */
+    private int bulkRetries =
+            Integer.getInteger("oak.mongo.bulkRetries", 0);
+
     private String lastReadWriteMode;
 
     private final Map<String, String> metadata;
@@ -854,7 +863,7 @@ public class MongoDocumentStore implemen
                 oldDocs.putAll((Map<String, T>) getCachedNodes(operationsToCover.keySet()));
             }
 
-            for (int i = 0; i < 3; i++) {
+            for (int i = 0; i <= bulkRetries; i++) {
                 if (operationsToCover.size() <= 2) {
                     // bulkUpdate() method invokes Mongo twice, so sending 2 updates
                     // in bulk mode wouldn't result in any performance gain