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 al...@apache.org on 2014/12/05 13:23:44 UTC
svn commit: r1643257 - in /jackrabbit/oak/branches/1.0: ./
oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/
oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/
Author: alexparvulescu
Date: Fri Dec 5 12:23:44 2014
New Revision: 1643257
URL: http://svn.apache.org/viewvc?rev=1643257&view=rev
Log:
OAK-2260 TarMK Cold Standby can corrupt bulk segments
- merged rev 1637815
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (contents, props changed)
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 5 12:23:44 2014
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231,1593245
,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611
041,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1
631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959
+/jackrabbit/oak/trunk:1584578,1584602,1584614,1584616,1584709,1584781,1584937,1585297,1585304-1585305,1585420,1585424,1585427,1585448,1585465,1585468,1585486,1585497,1585509,1585647,1585655-1585656,1585661,1585665-1585666,1585669-1585670,1585673,1585680,1585719,1585763,1585770,1585896,1585904,1585907,1585940,1585949,1585951,1585956,1585962,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1588033,1588042,1588046,1588066,1588201,1589025,1589101,1589137,1589141,1589263,1589440,1589442,1589484,1589488,1589661,1589664,1589682,1589708,1589741,1589748,1589789,1589794,1589850,1589864,1590628,1590660,1590684,1590697,1590701,1590980,1590988,1591101,1591226,1591229,1591293,1591314,1591317,1591362,1591374,1591381,1591438,1591467,1591552,1591704,1591713,1591715,1591723,1591874,1592487,1592512,1592658,1592665,1592677,1592742,1592744,1592787,1592809,1592955,1593036,1593048,1593061,1593133,1593210-1593211,1593231,1593245
,1593250,1593294,1593304,1593317,1593342,1593554,1594158-1594164,1594166-1594167,1594169,1594237,1594800,1594808,1594835,1594888,1595147,1595457,1595856,1596241,1596474,1596534,1596844,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,1602796-1602797,1602800,1602809,1602853,1602872,1602914,1603155,1603307,1603401,1603441,1603748,1604166,1605030,1605036,1605038,1605292,1605447,1605526,1605670,1605725,1605831,1605852,1606077,1606079,1606087,1606638,1606641,1606644,1606708,1606711,1607031-1607032,1607077,1607127,1607141,1607152,1607185,1607196,1607331,1607362,1607366,1607392,1607526,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611
041,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,1614265,1614272,1614344-1614345,1614384-1614385,1614397,1614405-1614406,1614574,1614591,1614593,1614596,1614604,1614689,1614807,1614835,1614891,1615417-1615418,1616182,1616236,1616463,1616719,1617417,1617451,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,1624973,1624993-1624994,1625025,1625036,1625158,1625224,1625237,1625299,1625348,1625620,1625916,1625962-1625963,1626021,1626053,1626163,1626168,1626175,1626191,1626265,1626770,1627047,1627052,1627228,1627346,1627470,1627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1630338,1630773,1
631283-1631284,1631333-1631334,1631617-1631619,1631630,1631699,1631704,1631711,1631967-1631969,1631986,1631990,1631999,1632002-1632003,1632017,1632258,1632264,1632270,1632293,1632303,1632592,1632605,1633315,1633559-1633560,1633562,1633567,1633571,1633598,1633608,1633641,1633687,1633697,1633768,1633783,1634505,1634513,1634774,1634779,1634781,1634792,1634803,1634814,1634816,1634838,1634841,1634852,1634864,1634896,1634898,1635044-1635045,1635060,1635077,1635089,1635102,1635108,1635218,1635387,1635435,1635518,1635563,1635586,1636336,1636348,1636505,1636585,1636799,1637368,1637382,1637413,1637651,1637815,1638779-1638783,1639260,1639577,1639622,1639963,1639966,1639973,1640134,1640143,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java?rev=1643257&r1=1643256&r2=1643257&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java Fri Dec 5 12:23:44 2014
@@ -133,7 +133,7 @@ public class SegmentLoaderHandler extend
@Override
public Segment readSegment(final String id) {
ctx.writeAndFlush(newGetSegmentReq(this.clientID, id));
- return getSegment();
+ return getSegment(id);
}
@Override
@@ -145,15 +145,18 @@ public class SegmentLoaderHandler extend
// implementation of RemoteSegmentLoader
- public Segment getSegment() {
+ public Segment getSegment(final String id) {
boolean interrupted = false;
try {
for (;;) {
try {
- // log.debug("polling segment");
Segment s = segment.poll(timeoutMs, TimeUnit.MILLISECONDS);
- // log.debug("returning segment " + s.getSegmentId());
- return s;
+ if (s == null) {
+ return null;
+ }
+ if (s.getSegmentId().toString().equals(id)) {
+ return s;
+ }
} catch (InterruptedException ignore) {
interrupted = true;
}
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java?rev=1643257&r1=1643256&r2=1643257&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java Fri Dec 5 12:23:44 2014
@@ -18,21 +18,35 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
+import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
+import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.io.ByteStreams;
+
public class FailoverTest extends TestBase {
@Before
@@ -47,22 +61,54 @@ public class FailoverTest extends TestBa
@Test
public void testFailover() throws Exception {
+ final int mb = 1 * 1024 * 1024;
+ final int blobSize = 5 * mb;
+ FileStore primary = getPrimary();
+ FileStore secondary = getSecondary();
- NodeStore store = new SegmentNodeStore(storeS);
- final StandbyServer server = new StandbyServer(port, storeS);
+ NodeStore store = new SegmentNodeStore(primary);
+ final StandbyServer server = new StandbyServer(getPort(), primary);
server.start();
- addTestContent(store, "server");
+ byte[] data = addTestContent(store, "server", blobSize);
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
+ StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
cl.run();
try {
- assertEquals(storeS.getHead(), storeC.getHead());
+ assertEquals(primary.getHead(), secondary.getHead());
} finally {
server.close();
cl.close();
}
+ assertTrue(primary.size() > blobSize);
+ assertTrue(secondary.size() > blobSize);
+
+ PropertyState ps = secondary.getHead().getChildNode("root")
+ .getChildNode("server").getProperty("testBlob");
+ assertNotNull(ps);
+ assertEquals(Type.BINARY.tag(), ps.getType().tag());
+ Blob b = ps.getValue(Type.BINARY);
+ assertEquals(blobSize, b.length());
+
+ byte[] testData = new byte[blobSize];
+ ByteStreams.readFully(b.getNewStream(), testData);
+ assertArrayEquals(data, testData);
+
+ }
+
+ private static byte[] addTestContent(NodeStore store, String child, int size)
+ throws CommitFailedException, IOException {
+ NodeBuilder builder = store.getRoot().builder();
+ builder.child(child).setProperty("ts", System.currentTimeMillis());
+
+ byte[] data = new byte[size];
+ new Random().nextBytes(data);
+ Blob blob = store.createBlob(new ByteArrayInputStream(data));
+ builder.child(child).setProperty("testBlob", blob);
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ return data;
}
public static void main(String[] args) throws Exception {
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1643257&r1=1643256&r2=1643257&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Fri Dec 5 12:23:44 2014
@@ -1,84 +1,104 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.jackrabbit.oak.plugins.segment.standby;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
-
-public class TestBase {
- int port = Integer.valueOf(System.getProperty("standby.server.port", "52808"));
- final static String LOCALHOST = "127.0.0.1";
-
- File directoryS;
- FileStore storeS;
-
- File directoryC;
- FileStore storeC;
-
- File directoryC2;
- FileStore storeC2;
-
- /*
- Java 6 on Windows doesn't support dual IP stacks, so we will skip our IPv6
- tests.
- */
- protected final boolean noDualStackSupport = SystemUtils.IS_OS_WINDOWS && SystemUtils.IS_JAVA_1_6;
-
- public void setUpServerAndClient() throws IOException {
- // server
- directoryS = createTmpTargetDir("FailoverServerTest");
- storeS = new FileStore(directoryS, 1, false);
-
- // client
- directoryC = createTmpTargetDir("FailoverClientTest");
- storeC = new FileStore(directoryC, 1, false);
- }
-
- public void setUpServerAndTwoClients() throws Exception {
- setUpServerAndClient();
-
- directoryC2 = createTmpTargetDir("FailoverClient2Test");
- storeC2 = new FileStore(directoryC2, 1, false);
- }
-
- public void closeServerAndClient() {
- storeS.close();
- storeC.close();
- try {
- FileUtils.deleteDirectory(directoryS);
- FileUtils.deleteDirectory(directoryC);
- } catch (IOException e) {
- }
- }
-
- public void closeServerAndTwoClients() {
- closeServerAndClient();
- storeC2.close();
- try {
- FileUtils.deleteDirectory(directoryC2);
- } catch (IOException e) {
- }
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.segment.standby;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+
+import java.io.File;
+import java.io.IOException;
+
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+
+public class TestBase {
+ int port = Integer.valueOf(System.getProperty("standby.server.port", "52808"));
+ final static String LOCALHOST = "127.0.0.1";
+
+ File directoryS;
+ FileStore storeS;
+
+ File directoryC;
+ FileStore storeC;
+
+ File directoryC2;
+ FileStore storeC2;
+
+ /*
+ Java 6 on Windows doesn't support dual IP stacks, so we will skip our IPv6
+ tests.
+ */
+ protected final boolean noDualStackSupport = SystemUtils.IS_OS_WINDOWS && SystemUtils.IS_JAVA_1_6;
+
+ public void setUpServerAndClient() throws IOException {
+ // server
+ directoryS = createTmpTargetDir("FailoverServerTest");
+ storeS = setupPrimary(directoryS);
+
+ // client
+ directoryC = createTmpTargetDir("FailoverClientTest");
+ storeC = setupSecondary(directoryC);
+ }
+
+ protected FileStore setupPrimary(File directory) throws IOException {
+ return new FileStore(directory, 1, false);
+ }
+
+ protected FileStore getPrimary() {
+ return storeS;
+ }
+
+ protected FileStore setupSecondary(File directory) throws IOException {
+ return new FileStore(directoryC, 1, false);
+ }
+
+ protected FileStore getSecondary() {
+ return storeC;
+ }
+
+ protected int getPort() {
+ return port;
+ }
+
+ public void setUpServerAndTwoClients() throws Exception {
+ setUpServerAndClient();
+
+ directoryC2 = createTmpTargetDir("FailoverClient2Test");
+ storeC2 = new FileStore(directoryC2, 1, false);
+ }
+
+ public void closeServerAndClient() {
+ storeS.close();
+ storeC.close();
+ try {
+ FileUtils.deleteDirectory(directoryS);
+ FileUtils.deleteDirectory(directoryC);
+ } catch (IOException e) {
+ }
+ }
+
+ public void closeServerAndTwoClients() {
+ closeServerAndClient();
+ storeC2.close();
+ try {
+ FileUtils.deleteDirectory(directoryC2);
+ } catch (IOException e) {
+ }
+ }
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
------------------------------------------------------------------------------
svn:eol-style = native