Author: frm
Date: Mon Oct 31 12:44:35 2016
New Revision: 1767263
URL: http://svn.apache.org/viewvc?rev=1767263&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/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java?rev=1767263&r1=1767262&r2=1767263&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/standby/client/StandbyDiff.java
Mon Oct 31 12:44:35 2016
@@ -183,7 +183,16 @@ class StandbyDiff implements NodeStateDi
@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,
NodeState after) {
Modified:
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java?rev=1767263&r1=1767262&r2=1767263&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/standby/DataStoreTestBase.java
Mon Oct 31 12:44:35 2016
@@ -47,6 +47,8 @@ import org.junit.Test;
public abstract class DataStoreTestBase extends TestBase {
+ private static final int MB = 1024 * 1024;
+
abstract FileStore getPrimary();
abstract FileStore getSecondary();
@@ -70,8 +72,7 @@ public abstract class DataStoreTestBase
@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();
@@ -87,8 +88,8 @@ public abstract class DataStoreTestBase
assertEquals(primary.getHead(), secondary.getHead());
}
- assertTrue(primary.getStats().getApproximateSize() < mb);
- assertTrue(secondary.getStats().getApproximateSize() < mb);
+ assertTrue(primary.getStats().getApproximateSize() < MB);
+ assertTrue(secondary.getStats().getApproximateSize() < MB);
PropertyState ps = secondary.getHead().getChildNode("root")
.getChildNode("server").getProperty("testBlob");
@@ -101,6 +102,35 @@ public abstract class DataStoreTestBase
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 = SegmentNodeStoreBuilders.builder(primary).build();
+ try (
+ StandbyServerSync serverSync = new
StandbyServerSync(getServerPort(), primary);
+ StandbyClientSync clientSync = newStandbyClientSync(secondary)
+ ) {
+ serverSync.start();
+
+ addTestContent(store, "server", blobSize);
+ primary.flush();
+ clientSync.run();
+ assertEquals(primary.getHead(), secondary.getHead());
+
+ addTestContent(store, "server", blobSize);
+ primary.flush();
+ clientSync.run();
+ assertEquals(primary.getHead(), secondary.getHead());
+ }
+ }
+
@Test
public void testProxySkippedBytes() throws Exception {
useProxy(100, 1, -1, false);
@@ -137,8 +167,7 @@ public abstract class DataStoreTestBase
}
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();
@@ -164,7 +193,7 @@ public abstract class DataStoreTestBase
}
p.reset();
if (intermediateChange) {
- blobSize = 2 * mb;
+ blobSize = 2 * MB;
data = addTestContent(store, "server", blobSize);
primary.flush();
}
@@ -173,8 +202,8 @@ public abstract class DataStoreTestBase
assertEquals(primary.getHead(), secondary.getHead());
}
- assertTrue(primary.getStats().getApproximateSize() < mb);
- assertTrue(secondary.getStats().getApproximateSize() < mb);
+ assertTrue(primary.getStats().getApproximateSize() < MB);
+ assertTrue(secondary.getStats().getApproximateSize() < MB);
PropertyState ps = secondary.getHead().getChildNode("root")
.getChildNode("server").getProperty("testBlob");
