Author: frm
Date: Mon Oct 31 13:03:48 2016
New Revision: 1767270
URL: http://svn.apache.org/viewvc?rev=1767270&view=rev
Log:
OAK-4969 - Ensure binary properties are loaded when processing a node in the
cold standby client
Contribution by Timothee Maret.
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 31 13:03:48 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462
,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767265
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java?rev=1767270&r1=1767269&r2=1767270&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
Mon Oct 31 13:03:48 2016
@@ -164,7 +164,16 @@ class StandbyApplyDiff implements NodeSt
@Override
public boolean childNodeChanged(String name, NodeState before,
NodeState after) {
- return process(name, "childNodeChanged", before, after);
+ try {
+ return process(name, "childNodeChanged", before, after);
+ } catch (RuntimeException e) {
+ log.trace("Check binaries for node {} and retry to process
childNodeChanged", name);
+ // Attempt to load the binaries and retry, see OAK-4969
+ for (PropertyState propertyState : after.getProperties()) {
+ binaryCheck(propertyState);
+ }
+ return process(name, "childNodeChanged", before, after);
+ }
}
private boolean process(String name, String op, NodeState before,
Modified:
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1767270&r1=1767269&r2=1767270&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
(original)
+++
jackrabbit/oak/branches/1.4/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Mon Oct 31 13:03:48 2016
@@ -50,6 +50,8 @@ import org.junit.Test;
public class DataStoreTestBase extends TestBase {
+ private static final int MB = 1024 * 1024;
+
protected boolean storesCanBeEqual = false;
@Before
@@ -87,8 +89,7 @@ public class DataStoreTestBase extends T
@Test
public void testSync() throws Exception {
- final int mb = 1 * 1024 * 1024;
- final int blobSize = 5 * mb;
+ final int blobSize = 5 * MB;
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
@@ -108,8 +109,8 @@ public class DataStoreTestBase extends T
cl.close();
}
- assertTrue(primary.size() < mb);
- assertTrue(secondary.size() < mb);
+ assertTrue(primary.size() < MB);
+ assertTrue(secondary.size() < MB);
PropertyState ps = secondary.getHead().getChildNode("root")
.getChildNode("server").getProperty("testBlob");
@@ -122,6 +123,37 @@ public class DataStoreTestBase extends T
assertArrayEquals(data, testData);
}
+ /**
+ * See OAK-4969
+ */
+ @Test
+ public void testSyncUpdatedBinaryProperty() throws Exception {
+ final int blobSize = 5 * MB;
+ FileStore primary = getPrimary();
+ FileStore secondary = getSecondary();
+
+ NodeStore store =
SegmentNodeStore.newSegmentNodeStore(primary).create();
+
+ try (
+ StandbyClient client = newStandbyClient(secondary);
+ StandbyServer server = new StandbyServer(port, primary);
+ ) {
+ server.start();
+
+ addTestContent(store, "server", blobSize);
+ primary.flush();
+ client.run();
+ assertEquals(primary.getHead(), secondary.getHead());
+
+ addTestContent(store, "server", blobSize);
+ primary.flush();
+ client.run();
+ assertEquals(primary.getHead(), secondary.getHead());
+
+ }
+
+ }
+
@Test
public void testProxySkippedBytes() throws Exception {
useProxy(100, 1, -1, false);
@@ -158,8 +190,7 @@ public class DataStoreTestBase extends T
}
private void useProxy(int skipPosition, int skipBytes, int flipPosition,
boolean intermediateChange) throws Exception {
- final int mb = 1 * 1024 * 1024;
- int blobSize = 5 * mb;
+ int blobSize = 5 * MB;
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
@@ -184,7 +215,7 @@ public class DataStoreTestBase extends T
}
p.reset();
if (intermediateChange) {
- blobSize = 2 * mb;
+ blobSize = 2 * MB;
data = addTestContent(store, "server", blobSize);
primary.flush();
}
@@ -197,8 +228,8 @@ public class DataStoreTestBase extends T
p.close();
}
- assertTrue(primary.size() < mb);
- assertTrue(secondary.size() < mb);
+ assertTrue(primary.size() < MB);
+ assertTrue(secondary.size() < MB);
PropertyState ps = secondary.getHead().getChildNode("root")
.getChildNode("server").getProperty("testBlob");
