Author: reschke
Date: Fri Nov 13 11:10:26 2015
New Revision: 1714187
URL: http://svn.apache.org/viewvc?rev=1714187&view=rev
Log:
OAK-3617: RDBDocumentStore: improve retry logic in updateDocument (ported to
1.2)
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 13 11:10:26 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696190,1696194,1696
242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1711498,1712042,1712319,1
712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695905,1696190,1696194,1696
242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707435,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710811,1710816,1710972,1711248,1711282,1711296,1711498,1712042,1712319,1
712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java?rev=1714187&r1=1714186&r2=1714187&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
Fri Nov 13 11:10:26 2015
@@ -1363,14 +1363,20 @@ public class RDBDocumentStore implements
Long modcount = (Long) document.get(MODCOUNT);
Long cmodcount = (Long) document.get(COLLISIONSMODCOUNT);
boolean success = false;
+ boolean shouldRetry = true;
// every 16th update is a full rewrite
if (isAppendableUpdate(update) && modcount % 16 != 0) {
String appendData = SR.asString(update);
if (appendData.length() < tmd.getDataLimitInOctets() /
CHAR2OCTETRATIO) {
try {
- success = dbAppendingUpdate(connection, tmd,
document.getId(), modified, modifiedIsConditional, hasBinary, deletedOnce,
- modcount, cmodcount, oldmodcount, appendData);
+ success = dbAppendingUpdate(connection, tmd,
document.getId(), modified, modifiedIsConditional, hasBinary,
+ deletedOnce, modcount, cmodcount, oldmodcount,
appendData);
+ // if we get here, a retry is not going to help (the
SQL
+ // operation succeeded but simply did not select a row
+ // that could be updated, likely because of the check
on
+ // MODCOUNT
+ shouldRetry = false;
connection.commit();
} catch (SQLException ex) {
continueIfStringOverflow(ex);
@@ -1379,7 +1385,7 @@ public class RDBDocumentStore implements
}
}
}
- if (!success) {
+ if (!success && shouldRetry) {
data = SR.asString(document);
success = dbUpdate(connection, tmd, document.getId(),
modified, hasBinary, deletedOnce, modcount, cmodcount,
oldmodcount, data);
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java?rev=1714187&r1=1714186&r2=1714187&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/AbstractMultiDocumentStoreTest.java
Fri Nov 13 11:10:26 2015
@@ -36,7 +36,7 @@ public abstract class AbstractMultiDocum
ds2.dispose();
}
- @Parameterized.Parameters
+ @Parameterized.Parameters(name="{0}")
public static Collection<Object[]> fixtures() {
return fixtures(true);
}
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java?rev=1714187&r1=1714186&r2=1714187&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStorePerformanceTest.java
Fri Nov 13 11:10:26 2015
@@ -29,6 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test;
import org.slf4j.Logger;
@@ -40,7 +41,7 @@ import org.slf4j.LoggerFactory;
* These tests are disabled by default due to their long running time. On the
command line
* specify {@code -DDocumentStorePerformanceTest=true} to enable them.
*/
-public class DocumentStorePerformanceTest extends AbstractDocumentStoreTest {
+public class DocumentStorePerformanceTest extends
AbstractMultiDocumentStoreTest {
private static final Logger LOG =
LoggerFactory.getLogger(DocumentStorePerformanceTest.class);
private static final boolean ENABLED =
Boolean.getBoolean(DocumentStorePerformanceTest.class.getSimpleName());
@@ -313,4 +314,109 @@ public class DocumentStorePerformanceTes
LOG.info("document updates with property of size " + size + (growing ?
" (growing)" : "") + " for " + super.dsname + " was " + cnt + " in " + duration
+ "ms (" + (cnt / (duration / 1000f)) + "/s)");
}
+
+ @Test
+ public void testConcurrentUpdatePerf1DS() throws InterruptedException {
+ String id = this.getClass().getName() + ".testConcurrentUpdatePerf1DS";
+ concurrentUpdatePerf(id, 1);
+ }
+
+ @Test
+ public void testConcurrentUpdatePerf2DS() throws InterruptedException {
+ String id = this.getClass().getName() + ".testConcurrentUpdatePerf1DS";
+ concurrentUpdatePerf(id, 2);
+ }
+
+ private void concurrentUpdatePerf(String testName, int stores) throws
InterruptedException {
+ final String id = testName;
+ final long duration = 1000;
+
+ ds1.remove(Collection.NODES, id);
+ UpdateOp up = new UpdateOp(id, true);
+ up.set(Document.ID, id);
+ up.set(Document.MOD_COUNT, 1L);
+ up.set("c", 0L);
+ up.set("u", 0L);
+ super.ds1.create(Collection.NODES, Collections.singletonList(up));
+ removeMe.add(id);
+
+ final DocumentStore ts1 = ds1;
+ final DocumentStore ts2 = stores == 2 ? ds2 : ds1;
+
+ final AtomicBoolean threadTwoIsActive = new AtomicBoolean(false);
+ final AtomicBoolean threadOneIsDone = new AtomicBoolean(false);
+
+ Thread one = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ int failures = 0;
+ while (!threadTwoIsActive.get()) {
+ }
+ // operation that requires fetching the previous state
+ UpdateOp up = new UpdateOp(id, false);
+ up.increment("c", 1);
+ up.notEquals("qux", "qux");
+ long end = System.currentTimeMillis() + duration;
+ while (System.currentTimeMillis() < end) {
+ try {
+ ts1.update(Collection.NODES,
Collections.singletonList(id), up);
+ } catch (RuntimeException ex) {
+ failures += 1;
+ }
+ }
+ try {
+ UpdateOp up2 = new UpdateOp(id, false);
+ up2.set("cfailures", failures);
+ ts1.update(Collection.NODES,
Collections.singletonList(id), up2);
+ } catch (RuntimeException ex) {
+ }
+ threadOneIsDone.set(true);
+ }
+ }, "cond");
+
+ Thread two = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ int failures = 0;
+ // operation that does not require fetching the previous state
+ UpdateOp up = new UpdateOp(id, false);
+ up.set(Document.ID, id);
+ up.increment("u", 1);
+ while (!threadOneIsDone.get()) {
+ try {
+ ts2.update(Collection.NODES,
Collections.singletonList(id), up);
+ threadTwoIsActive.set(true);
+ } catch (RuntimeException ex) {
+ failures += 1;
+ }
+ }
+ threadTwoIsActive.set(true);
+ try {
+ UpdateOp up2 = new UpdateOp(id, false);
+ up2.set("ufailures", failures);
+ ts1.update(Collection.NODES,
Collections.singletonList(id), up2);
+ } catch (RuntimeException ex) {
+ }
+ }
+ }, "uncond");
+
+ two.start();
+ one.start();
+
+ two.join();
+ one.join();
+
+ // reading uncached because for some reason MongoDS doesn't see the
+ // changes made in ds2
+ NodeDocument nd = ds1.find(Collection.NODES, id, 0);
+ assertNotNull(nd);
+ int cc = nd.get("c") == null ? 0 :
Integer.valueOf(nd.get("c").toString());
+ int uc = nd.get("u") == null ? 0 :
Integer.valueOf(nd.get("u").toString());
+ long mc = nd.getModCount().longValue();
+ String msg = String.format(
+ "Concurrent updates %s on %s cond. updates: %d (failures: %s),
uncond. updates: %d (failures: %s), _modCount: %d, ops/sec: %d, %% of cond.
updates: %d",
+ stores == 1 ? "(one ds)" : "(two ds)", super.dsname, cc,
nd.get("cfailures"), uc, nd.get("ufailures"), mc,
+ mc * 1000 / duration, cc * 100 / mc);
+ LOG.info(msg);
+ }
}
