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 fr...@apache.org on 2016/10/31 12:52:58 UTC
svn commit: r1767265 - in /jackrabbit/oak/trunk/oak-tarmk-standby/src:
main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Author: frm
Date: Mon Oct 31 12:52:57 2016
New Revision: 1767265
URL: http://svn.apache.org/viewvc?rev=1767265&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-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java?rev=1767265&r1=1767264&r2=1767265&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyApplyDiff.java Mon Oct 31 12:52:57 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/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1767265&r1=1767264&r2=1767265&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Mon Oct 31 12:52:57 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.builder(primary).build();
+
+ 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");