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 2015/01/22 11:31:17 UTC
svn commit: r1653803 [1/2] - in /jackrabbit/oak/branches/1.0: ./
oak-tarmk-standby/
oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/
oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/stan...
Author: alexparvulescu
Date: Thu Jan 22 10:31:16 2015
New Revision: 1653803
URL: http://svn.apache.org/r1653803
Log:
OAK-2372 TARMK Cold Standby improve test cases for FSDS mirroring
- merged r1646684, r1651652, r1652024, r1652035, r1652058, r1652127
Added:
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (contents, props changed)
- copied, changed from r1646684, jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalPrivateStoreIT.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTest.java (contents, props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 10:31:16 2015
@@ -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-1585963,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,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610
658,1610664,1611021,1611041,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,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,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-1
630057,1630156,1630299,1630338,1630773,1631283-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,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,164317
8,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651730,1651988-1651989,1651996,1652059,1652467,1652965,1652971,1653207,1653446,1653463,1653572,1653579,1653591
+/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-1585963,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,1607557,1607664,1607737,1608560,1608731,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610
658,1610664,1611021,1611041,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,1617463,1617711,1618158,1618613,1618624,1618709,1619222,1619411,1619695,1619800,1619808,1619815,1619823-1619824,1620512,1620581,1620585,1620634,1620898,1620905,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-1
630057,1630156,1630299,1630338,1630773,1631283-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,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,164317
8,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652127,1652467,1652965,1652971,1653207,1653446,1653463,1653572,1653579,1653591
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/pom.xml Thu Jan 22 10:31:16 2015
@@ -74,6 +74,7 @@
<configuration>
<portNames>
<portName>standby.server.port</portName>
+ <portName>standby.proxy.port</portName>
</portNames>
</configuration>
</execution>
@@ -82,8 +83,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <systemPropertyVariables combine.children="append">
+ <systemPropertyVariables>
<standby.server.port>${standby.server.port}</standby.server.port>
+ <standby.proxy.port>${standby.poxy.port}</standby.proxy.port>
</systemPropertyVariables>
<excludes>
<!-- excluding long running tests -->
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.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/StandbyClient.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Thu Jan 22 10:31:16 2015
@@ -214,6 +214,7 @@ public final class StandbyClient impleme
@Override
public void start() {
running.set(true);
+ state = STATUS_RUNNING;
}
@Override
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.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/server/StandbyServer.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java Thu Jan 22 10:31:16 2015
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.oak.plugins
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.management.InstanceNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
@@ -147,9 +148,10 @@ public class StandbyServer implements St
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
try {
jmxServer.unregisterMBean(new ObjectName(this.getMBeanName()));
- }
- catch (Exception e) {
- log.error("can unregister standby status mbean", e);
+ } catch (InstanceNotFoundException e) {
+ // ignore
+ } catch (Exception e) {
+ log.error("can't unregister standby status mbean", e);
}
if (bossGroup != null && !bossGroup.isShuttingDown()) {
bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
@@ -163,7 +165,6 @@ public class StandbyServer implements St
private void start(boolean wait) {
if (running) return;
- running = true;
this.handler.state = STATUS_STARTING;
final Thread close = new Thread() {
@@ -184,8 +185,8 @@ public class StandbyServer implements St
if (future.isSuccess()) {
close.start();
} else {
- log.error("Server failed to start, will be canceled",
- future.cause());
+ log.error("Server failed to start on port " + port
+ + ", will be canceled", future.cause());
future.channel().close();
new Thread() {
@Override
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java Thu Jan 22 10:31:16 2015
@@ -1,85 +1,85 @@
-/*
- * 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;
-
-import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.spi.blob.BlobStore;
-
-import javax.annotation.Nonnull;
-
-public class DebugSegmentStore implements SegmentStore {
-
- private final SegmentStore target;
- public boolean createReadErrors;
-
- public DebugSegmentStore(SegmentStore targetStore) {
- this.target = targetStore;
- }
-
- @Override
- public SegmentTracker getTracker() {
- return this.target.getTracker();
- }
-
- @Nonnull
- @Override
- public SegmentNodeState getHead() {
- return this.target.getHead();
- }
-
- @Override
- public boolean setHead(SegmentNodeState base, SegmentNodeState head) {
- return this.target.setHead(base, head);
- }
-
- @Override
- public boolean containsSegment(SegmentId id) {
- return this.target.containsSegment(id);
- }
-
- @Override
- public Segment readSegment(SegmentId segmentId) {
- return createReadErrors ? null : this.target.readSegment(segmentId);
- }
-
- @Override
- public void writeSegment(SegmentId id, byte[] bytes, int offset, int length) {
- this.target.writeSegment(id, bytes, offset, length);
- }
-
- @Override
- public void close() {
- this.target.close();
- }
-
- @Override
- public Blob readBlob(String reference) {
- return this.target.readBlob(reference);
- }
-
- @Override
- public BlobStore getBlobStore() {
- return this.target.getBlobStore();
- }
-
- @Override
- public void gc() {
- this.target.gc();
- }
-}
+/*
+ * 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;
+
+import org.apache.jackrabbit.oak.api.Blob;
+import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+
+import javax.annotation.Nonnull;
+
+public class DebugSegmentStore implements SegmentStore {
+
+ private final SegmentStore target;
+ public boolean createReadErrors;
+
+ public DebugSegmentStore(SegmentStore targetStore) {
+ this.target = targetStore;
+ }
+
+ @Override
+ public SegmentTracker getTracker() {
+ return this.target.getTracker();
+ }
+
+ @Nonnull
+ @Override
+ public SegmentNodeState getHead() {
+ return this.target.getHead();
+ }
+
+ @Override
+ public boolean setHead(SegmentNodeState base, SegmentNodeState head) {
+ return this.target.setHead(base, head);
+ }
+
+ @Override
+ public boolean containsSegment(SegmentId id) {
+ return this.target.containsSegment(id);
+ }
+
+ @Override
+ public Segment readSegment(SegmentId segmentId) {
+ return createReadErrors ? null : this.target.readSegment(segmentId);
+ }
+
+ @Override
+ public void writeSegment(SegmentId id, byte[] bytes, int offset, int length) {
+ this.target.writeSegment(id, bytes, offset, length);
+ }
+
+ @Override
+ public void close() {
+ this.target.close();
+ }
+
+ @Override
+ public Blob readBlob(String reference) {
+ return this.target.readBlob(reference);
+ }
+
+ @Override
+ public BlobStore getBlobStore() {
+ return this.target.getBlobStore();
+ }
+
+ @Override
+ public void gc() {
+ this.target.gc();
+ }
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/DebugSegmentStore.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java Thu Jan 22 10:31:16 2015
@@ -1,291 +1,298 @@
-/*
- * 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;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.bootstrap.ServerBootstrap;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.*;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.TimeUnit;
-
-public class NetworkErrorProxy {
- private static final Logger log = LoggerFactory
- .getLogger(NetworkErrorProxy.class);
-
- private final int inboundPort;
- private final int outboundPort;
- private final String host;
- private ChannelFuture f;
-
- private ForwardHandler fh;
-
- EventLoopGroup bossGroup = new NioEventLoopGroup();
- EventLoopGroup workerGroup = new NioEventLoopGroup();
-
- public NetworkErrorProxy(int inboundPort, String outboundHost, int outboundPort) {
- this.inboundPort = inboundPort;
- this.outboundPort = outboundPort;
- this.host = outboundHost;
- this.fh = new ForwardHandler(NetworkErrorProxy.this.host, NetworkErrorProxy.this.outboundPort);
- }
-
- public void skipBytes(int pos, int n) {
- this.fh.skipPosition = pos;
- this.fh.skipBytes = n;
- }
-
- public void flipByte(int pos) {
- this.fh.flipPosition = pos;
- }
-
- public void run() throws Exception {
- try {
- ServerBootstrap b = new ServerBootstrap();
- b.group(bossGroup, workerGroup)
- .channel(NioServerSocketChannel.class)
- .childHandler(new ChannelInitializer<SocketChannel>() {
- @Override
- public void initChannel(SocketChannel ch) throws Exception {
- ch.pipeline().addLast(NetworkErrorProxy.this.fh);
- }
- });
-
- f = b.bind(this.inboundPort).sync();
- } catch (Exception e) {
- log.warn("exception occurred", e);
- }
- }
-
- public void reset() throws Exception {
- f.channel().disconnect();
- this.fh = new ForwardHandler(NetworkErrorProxy.this.host, NetworkErrorProxy.this.outboundPort);
- run();
- }
-
- public void close() {
- f.channel().close();
- if (bossGroup != null && !bossGroup.isShuttingDown()) {
- bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
- }
- if (workerGroup != null && !workerGroup.isShuttingDown()) {
- workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
- }
- }
-}
-
-class ForwardHandler extends ChannelInboundHandlerAdapter {
- private final String targetHost;
- private final int targetPort;
- public long transferredBytes;
- public int skipPosition;
- public int skipBytes;
- public int flipPosition;
- private ChannelFuture remote;
-
- public ForwardHandler(String host, int port) {
- this.targetHost = host;
- this.targetPort = port;
- this.flipPosition = -1;
- }
-
- @Override
- public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
- final ChannelHandlerContext c = ctx;
- EventLoopGroup group = new NioEventLoopGroup();
- Bootstrap cb = new Bootstrap();
- cb.group(group);
- cb.channel(NioSocketChannel.class);
-
- cb.handler(new ChannelInitializer<SocketChannel>() {
- @Override
- public void initChannel(SocketChannel ch) throws Exception {
- SendBackHandler sbh = new SendBackHandler(c);
- if (ForwardHandler.this.flipPosition >= 0) {
- sbh = new BitFlipHandler(c, ForwardHandler.this.flipPosition);
- }
- else if (ForwardHandler.this.skipBytes > 0) {
- sbh = new SwallowingHandler(c, ForwardHandler.this.skipPosition, ForwardHandler.this.skipBytes);
- }
- ch.pipeline().addFirst(sbh);
- }
- });
- remote = cb.connect(this.targetHost, this.targetPort).sync();
-
- ctx.fireChannelRegistered();
- }
-
- @Override
- public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
- remote.channel().close();
- remote = null;
- ctx.fireChannelUnregistered();
- }
-
- @Override
- public void channelRead(ChannelHandlerContext ctx, Object msg) {
- if (msg instanceof ByteBuf) {
- ByteBuf bb = (ByteBuf)msg;
- this.transferredBytes += (bb.writerIndex() - bb.readerIndex());
- }
- remote.channel().write(msg);
- }
-
- @Override
- public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
- remote.channel().flush();
- }
-
- @Override
- public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
- cause.printStackTrace();
- ctx.close();
- }
-}
-
-class SendBackHandler implements ChannelInboundHandler {
- private final ChannelHandlerContext target;
- public long transferredBytes;
-
- public SendBackHandler(ChannelHandlerContext ctx) {
- this.target = ctx;
- }
-
- @Override
- public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void channelActive(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- }
-
- public int messageSize(Object msg) {
- if (msg instanceof ByteBuf) {
- ByteBuf bb = (ByteBuf)msg;
- return (bb.writerIndex() - bb.readerIndex());
- }
- // unknown
- return 0;
- }
-
- public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- this.transferredBytes += messageSize(msg);
- this.target.write(msg);
- }
-
- public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
- this.target.flush();
- }
-
- @Override
- public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
- }
-
- @Override
- public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
- }
-
- @Override
- public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
- cause.printStackTrace();
- this.target.close();
- }
-
-}
-
-class SwallowingHandler extends SendBackHandler {
- private int skipStartingPos;
- private int nrOfBytes;
-
- public SwallowingHandler(ChannelHandlerContext ctx, int skipStartingPos, int numberOfBytes) {
- super(ctx);
- this.skipStartingPos = skipStartingPos;
- this.nrOfBytes = numberOfBytes;
- }
-
- public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- if (msg instanceof ByteBuf) {
- ByteBuf bb = (ByteBuf)msg;
- if (this.nrOfBytes > 0) {
- if (this.transferredBytes >= this.skipStartingPos) {
- bb.skipBytes(this.nrOfBytes);
- this.nrOfBytes = 0;
- }
- else {
- this.skipStartingPos -= messageSize(msg);
- }
- }
- }
- super.channelRead(ctx, msg);
- }
-
-}
-
-class BitFlipHandler extends SendBackHandler {
- private static final Logger log = LoggerFactory
- .getLogger(BitFlipHandler.class);
-
- private int startingPos;
-
- public BitFlipHandler(ChannelHandlerContext ctx, int pos) {
- super(ctx);
- this.startingPos = pos;
- }
-
- public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
- if (msg instanceof ByteBuf) {
- ByteBuf bb = (ByteBuf)msg;
- log.debug("FlipHandler. Got Buffer size: " + bb.readableBytes());
- if (this.startingPos >= 0) {
- if (this.transferredBytes + bb.readableBytes() >= this.startingPos) {
- int i = this.startingPos - (int)this.transferredBytes;
- log.info("FlipHandler flips byte at offset " + (this.transferredBytes + i));
- byte b = (byte) (bb.getByte(i) ^ 0x01);
- bb.setByte(i, b);
- this.startingPos = -1;
- }
- }
- }
- super.channelRead(ctx, msg);
- }
-
-}
+/*
+ * 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;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.*;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.TimeUnit;
+
+public class NetworkErrorProxy {
+ private static final Logger log = LoggerFactory
+ .getLogger(NetworkErrorProxy.class);
+
+ private final int inboundPort;
+ private final int outboundPort;
+ private final String host;
+ private ChannelFuture f;
+
+ private ForwardHandler fh;
+
+ EventLoopGroup bossGroup = new NioEventLoopGroup();
+ EventLoopGroup workerGroup = new NioEventLoopGroup();
+
+ public NetworkErrorProxy(int inboundPort, String outboundHost, int outboundPort) {
+ this.inboundPort = inboundPort;
+ this.outboundPort = outboundPort;
+ this.host = outboundHost;
+ this.fh = new ForwardHandler(NetworkErrorProxy.this.host, NetworkErrorProxy.this.outboundPort);
+ }
+
+ public void skipBytes(int pos, int n) {
+ this.fh.skipPosition = pos;
+ this.fh.skipBytes = n;
+ }
+
+ public void flipByte(int pos) {
+ this.fh.flipPosition = pos;
+ }
+
+ public void run() throws Exception {
+ try {
+ ServerBootstrap b = new ServerBootstrap();
+ b.group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ .childHandler(new ChannelInitializer<SocketChannel>() {
+ @Override
+ public void initChannel(SocketChannel ch) throws Exception {
+ ch.pipeline().addLast(NetworkErrorProxy.this.fh);
+ }
+ });
+
+ f = b.bind(this.inboundPort).sync();
+ } catch (Exception e) {
+ log.warn(
+ "Unable to start proxy on port " + inboundPort + ": "
+ + e.getMessage(), e);
+ }
+ }
+
+ public void reset() throws Exception {
+ if (f == null) {
+ throw new Exception("proxy not started");
+ }
+ f.channel().disconnect();
+ this.fh = new ForwardHandler(NetworkErrorProxy.this.host, NetworkErrorProxy.this.outboundPort);
+ run();
+ }
+
+ public void close() {
+ if (f != null) {
+ f.channel().close();
+ }
+ if (bossGroup != null && !bossGroup.isShuttingDown()) {
+ bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ }
+ if (workerGroup != null && !workerGroup.isShuttingDown()) {
+ workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ }
+ }
+}
+
+class ForwardHandler extends ChannelInboundHandlerAdapter {
+ private final String targetHost;
+ private final int targetPort;
+ public long transferredBytes;
+ public int skipPosition;
+ public int skipBytes;
+ public int flipPosition;
+ private ChannelFuture remote;
+
+ public ForwardHandler(String host, int port) {
+ this.targetHost = host;
+ this.targetPort = port;
+ this.flipPosition = -1;
+ }
+
+ @Override
+ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+ final ChannelHandlerContext c = ctx;
+ EventLoopGroup group = new NioEventLoopGroup();
+ Bootstrap cb = new Bootstrap();
+ cb.group(group);
+ cb.channel(NioSocketChannel.class);
+
+ cb.handler(new ChannelInitializer<SocketChannel>() {
+ @Override
+ public void initChannel(SocketChannel ch) throws Exception {
+ SendBackHandler sbh = new SendBackHandler(c);
+ if (ForwardHandler.this.flipPosition >= 0) {
+ sbh = new BitFlipHandler(c, ForwardHandler.this.flipPosition);
+ }
+ else if (ForwardHandler.this.skipBytes > 0) {
+ sbh = new SwallowingHandler(c, ForwardHandler.this.skipPosition, ForwardHandler.this.skipBytes);
+ }
+ ch.pipeline().addFirst(sbh);
+ }
+ });
+ remote = cb.connect(this.targetHost, this.targetPort).sync();
+
+ ctx.fireChannelRegistered();
+ }
+
+ @Override
+ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
+ remote.channel().close();
+ remote = null;
+ ctx.fireChannelUnregistered();
+ }
+
+ @Override
+ public void channelRead(ChannelHandlerContext ctx, Object msg) {
+ if (msg instanceof ByteBuf) {
+ ByteBuf bb = (ByteBuf)msg;
+ this.transferredBytes += (bb.writerIndex() - bb.readerIndex());
+ }
+ remote.channel().write(msg);
+ }
+
+ @Override
+ public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+ remote.channel().flush();
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+ cause.printStackTrace();
+ ctx.close();
+ }
+}
+
+class SendBackHandler implements ChannelInboundHandler {
+ private final ChannelHandlerContext target;
+ public long transferredBytes;
+
+ public SendBackHandler(ChannelHandlerContext ctx) {
+ this.target = ctx;
+ }
+
+ @Override
+ public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void channelUnregistered(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void channelActive(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ public int messageSize(Object msg) {
+ if (msg instanceof ByteBuf) {
+ ByteBuf bb = (ByteBuf)msg;
+ return (bb.writerIndex() - bb.readerIndex());
+ }
+ // unknown
+ return 0;
+ }
+
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ this.transferredBytes += messageSize(msg);
+ this.target.write(msg);
+ }
+
+ public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+ this.target.flush();
+ }
+
+ @Override
+ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+ }
+
+ @Override
+ public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
+ }
+
+ @Override
+ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+ cause.printStackTrace();
+ this.target.close();
+ }
+
+}
+
+class SwallowingHandler extends SendBackHandler {
+ private int skipStartingPos;
+ private int nrOfBytes;
+
+ public SwallowingHandler(ChannelHandlerContext ctx, int skipStartingPos, int numberOfBytes) {
+ super(ctx);
+ this.skipStartingPos = skipStartingPos;
+ this.nrOfBytes = numberOfBytes;
+ }
+
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ if (msg instanceof ByteBuf) {
+ ByteBuf bb = (ByteBuf)msg;
+ if (this.nrOfBytes > 0) {
+ if (this.transferredBytes >= this.skipStartingPos) {
+ bb.skipBytes(this.nrOfBytes);
+ this.nrOfBytes = 0;
+ }
+ else {
+ this.skipStartingPos -= messageSize(msg);
+ }
+ }
+ }
+ super.channelRead(ctx, msg);
+ }
+
+}
+
+class BitFlipHandler extends SendBackHandler {
+ private static final Logger log = LoggerFactory
+ .getLogger(BitFlipHandler.class);
+
+ private int startingPos;
+
+ public BitFlipHandler(ChannelHandlerContext ctx, int pos) {
+ super(ctx);
+ this.startingPos = pos;
+ }
+
+ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+ if (msg instanceof ByteBuf) {
+ ByteBuf bb = (ByteBuf)msg;
+ log.debug("FlipHandler. Got Buffer size: " + bb.readableBytes());
+ if (this.startingPos >= 0) {
+ if (this.transferredBytes + bb.readableBytes() >= this.startingPos) {
+ int i = this.startingPos - (int)this.transferredBytes;
+ log.info("FlipHandler flips byte at offset " + (this.transferredBytes + i));
+ byte b = (byte) (bb.getByte(i) ^ 0x01);
+ bb.setByte(i, b);
+ this.startingPos = -1;
+ }
+ }
+ }
+ super.channelRead(ctx, msg);
+ }
+
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.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/BrokenNetworkTest.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java Thu Jan 22 10:31:16 2015
@@ -1,151 +1,151 @@
-/*
- * 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.jackrabbit.oak.plugins.segment.NetworkErrorProxy;
-import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-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.state.NodeStore;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-public class BrokenNetworkTest extends TestBase {
- final static int PROXY_PORT = 4711;
-
- @Before
- public void setUp() throws Exception {
- setUpServerAndTwoClients();
- }
-
- @After
- public void after() {
- closeServerAndTwoClients();
- }
-
- @Test
- public void testProxy() throws Exception {
- useProxy(false);
- }
-
- @Test
- public void testProxySSL() throws Exception {
- useProxy(true);
- }
-
- @Test
- public void testProxySkippedBytes() throws Exception {
- useProxy(false, 100, 1, false);
- }
-
- @Test
- public void testProxySSLSkippedBytes() throws Exception {
- useProxy(true, 400, 10, false);
- }
-
- @Test
- public void testProxySkippedBytesIntermediateChange() throws Exception {
- useProxy(false, 100, 1, true);
- }
-
- @Test
- public void testProxySSLSkippedBytesIntermediateChange() throws Exception {
- useProxy(true, 400, 10, true);
- }
-
- @Test
- public void testProxyFlippedStartByte() throws Exception {
- useProxy(false, 0, 0, 0, false);
- }
-
- @Test
- public void testProxyFlippedStartByteSSL() throws Exception {
- useProxy(true, 0, 0, 0, false);
- }
-
- @Test
- public void testProxyFlippedIntermediateByte() throws Exception {
- useProxy(false, 0, 0, 150, false);
- }
-
- @Test
- public void testProxyFlippedIntermediateByteSSL() throws Exception {
- useProxy(true, 0, 0, 560, false);
- }
-
- @Test
- public void testProxyFlippedEndByte() throws Exception {
- useProxy(false, 0, 0, 220, false);
- }
-
- @Test
- public void testProxyFlippedEndByteSSL() throws Exception {
- useProxy(true, 0, 0, 575, false);
- }
-
- // private helper
-
- private void useProxy(boolean ssl) throws Exception {
- useProxy(ssl, 0, 0, false);
- }
-
- private void useProxy(boolean ssl, int skipPosition, int skipBytes, boolean intermediateChange) throws Exception {
- useProxy(ssl, skipPosition, skipBytes, -1, intermediateChange);
- }
-
- private void useProxy(boolean ssl, int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception {
- NetworkErrorProxy p = new NetworkErrorProxy(PROXY_PORT, LOCALHOST, port);
- p.skipBytes(skipPosition, skipBytes);
- p.flipByte(flipPosition);
- p.run();
-
- NodeStore store = new SegmentNodeStore(storeS);
- final StandbyServer server = new StandbyServer(port, storeS, ssl);
- server.start();
- addTestContent(store, "server");
- storeS.flush(); // this speeds up the test a little bit...
-
- StandbyClient cl = new StandbyClient(LOCALHOST, PROXY_PORT, storeC, ssl, 5000);
- cl.run();
-
- try {
- if (skipBytes > 0 || flipPosition >= 0) {
- assertFalse("stores are not expected to be equal", storeS.getHead().equals(storeC.getHead()));
- assertEquals(storeC2.getHead(), storeC.getHead());
-
- p.reset();
- if (intermediateChange) {
- addTestContent(store, "server2");
- storeS.flush();
- }
- cl.run();
- }
- assertEquals(storeS.getHead(), storeC.getHead());
- } finally {
- server.close();
- cl.close();
- p.close();
- }
- }
-}
+/*
+ * 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.jackrabbit.oak.plugins.segment.NetworkErrorProxy;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+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.state.NodeStore;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+public class BrokenNetworkTest extends TestBase {
+
+ @Before
+ public void setUp() throws Exception {
+ setUpServerAndTwoClients();
+ }
+
+ @After
+ public void after() {
+ closeServerAndTwoClients();
+ }
+
+ @Test
+ public void testProxy() throws Exception {
+ useProxy(false);
+ }
+
+ @Test
+ public void testProxySSL() throws Exception {
+ useProxy(true);
+ }
+
+ @Test
+ public void testProxySkippedBytes() throws Exception {
+ useProxy(false, 100, 1, false);
+ }
+
+ @Test
+ public void testProxySSLSkippedBytes() throws Exception {
+ useProxy(true, 400, 10, false);
+ }
+
+ @Test
+ public void testProxySkippedBytesIntermediateChange() throws Exception {
+ useProxy(false, 100, 1, true);
+ }
+
+ @Test
+ public void testProxySSLSkippedBytesIntermediateChange() throws Exception {
+ useProxy(true, 400, 10, true);
+ }
+
+ @Test
+ public void testProxyFlippedStartByte() throws Exception {
+ useProxy(false, 0, 0, 0, false);
+ }
+
+ @Test
+ public void testProxyFlippedStartByteSSL() throws Exception {
+ useProxy(true, 0, 0, 0, false);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByte() throws Exception {
+ useProxy(false, 0, 0, 150, false);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByteSSL() throws Exception {
+ useProxy(true, 0, 0, 560, false);
+ }
+
+ @Test
+ public void testProxyFlippedEndByte() throws Exception {
+ useProxy(false, 0, 0, 220, false);
+ }
+
+ @Test
+ public void testProxyFlippedEndByteSSL() throws Exception {
+ useProxy(true, 0, 0, 575, false);
+ }
+
+ // private helper
+
+ private void useProxy(boolean ssl) throws Exception {
+ useProxy(ssl, 0, 0, false);
+ }
+
+ private void useProxy(boolean ssl, int skipPosition, int skipBytes, boolean intermediateChange) throws Exception {
+ useProxy(ssl, skipPosition, skipBytes, -1, intermediateChange);
+ }
+
+ private void useProxy(boolean ssl, int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception {
+ int proxyPort = Integer.valueOf(System.getProperty("standby.proxy.port", "4711"));
+ NetworkErrorProxy p = new NetworkErrorProxy(proxyPort, LOCALHOST, port);
+ p.skipBytes(skipPosition, skipBytes);
+ p.flipByte(flipPosition);
+ p.run();
+
+ NodeStore store = new SegmentNodeStore(storeS);
+ final StandbyServer server = new StandbyServer(port, storeS, ssl);
+ server.start();
+ addTestContent(store, "server");
+ storeS.flush(); // this speeds up the test a little bit...
+
+ StandbyClient cl = new StandbyClient(LOCALHOST, proxyPort, storeC, ssl, 5000);
+ cl.run();
+
+ try {
+ if (skipBytes > 0 || flipPosition >= 0) {
+ assertFalse("stores are not expected to be equal", storeS.getHead().equals(storeC.getHead()));
+ assertEquals(storeC2.getHead(), storeC.getHead());
+
+ p.reset();
+ if (intermediateChange) {
+ addTestContent(store, "server2");
+ storeS.flush();
+ }
+ cl.run();
+ }
+ assertEquals(storeS.getHead(), storeC.getHead());
+ } finally {
+ server.close();
+ cl.close();
+ p.close();
+ }
+ }
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.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/BulkTest.java?rev=1653803&r1=1653802&r2=1653803&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java Thu Jan 22 10:31:16 2015
@@ -1,156 +1,156 @@
-/*
- * 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.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
-import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
-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 javax.management.MBeanServer;
-import javax.management.ObjectName;
-
-import java.lang.management.ManagementFactory;
-import java.util.Set;
-
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-
-public class BulkTest extends TestBase {
-
- @Before
- public void setUp() throws Exception {
- setUpServerAndClient();
- }
-
- @After
- public void after() {
- closeServerAndClient();
- }
-
- @Test
- public void test100Nodes() throws Exception {
- test(100, 1, 1, 3000, 3100);
- }
-
- @Test
- public void test1000Nodes() throws Exception {
- test(1000, 1, 1, 53000, 55000);
- }
-
- @Test
- public void test10000Nodes() throws Exception {
- test(10000, 1, 1, 245000, 246000);
- }
-
- @Test
- public void test100000Nodes() throws Exception {
- test(100000, 9, 9, 2210000, 2220000);
- }
-
- @Test
- public void test1MillionNodes() throws Exception {
- test(1000000, 87, 87, 22700000, 22800000);
- }
-
- @Test
- public void test1MillionNodesUsingSSL() throws Exception {
- test(1000000, 87, 87, 22700000, 22800000, true);
- }
-
-/*
- @Test
- public void test10MillionNodes() throws Exception {
- test(10000000, 856, 856, 223000000, 224000000);
- }
-*/
-
- // private helper
-
- private void test(int number, int minExpectedSegments, int maxExpectedSegments, long minExpectedBytes, long maxExpectedBytes) throws Exception {
- test(number, minExpectedSegments, maxExpectedSegments, minExpectedBytes, maxExpectedBytes, false);
- }
-
- private void test(int number, int minExpectedSegments, int maxExpectedSegments, long minExpectedBytes, long maxExpectedBytes,
- boolean useSSL) throws Exception {
- NodeStore store = new SegmentNodeStore(storeS);
- NodeBuilder rootbuilder = store.getRoot().builder();
- NodeBuilder b = rootbuilder.child("store");
- for (int j=0; j<=number / 1000; j++) {
- NodeBuilder builder = b.child("Folder#" + j);
- for (int i = 0; i <(number < 1000 ? number : 1000); i++) {
- builder.child("Test#" + i).setProperty("ts", System.currentTimeMillis());
- }
- }
- store.merge(rootbuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
- storeS.flush();
-
- final StandbyServer server = new StandbyServer(port, storeS, useSSL);
- server.start();
-
- System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, useSSL, 5000);
-
- final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
- ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
- ObjectName clientStatus = new ObjectName(cl.getMBeanName());
- ObjectName serverStatus = new ObjectName(server.getMBeanName());
-
- long start = System.currentTimeMillis();
- cl.run();
-
- try {
- Set<ObjectName> instances = jmxServer.queryNames(status, null);
- assertEquals(3, instances.size());
-
- ObjectName connectionStatus = null;
- for (ObjectName s : instances) {
- if (!s.equals(clientStatus) && !s.equals(serverStatus)) connectionStatus = s;
- }
- assertNotNull(connectionStatus);
-
- long segments = ((Long)jmxServer.getAttribute(connectionStatus, "TransferredSegments")).longValue();
- long bytes = ((Long)jmxServer.getAttribute(connectionStatus, "TransferredSegmentBytes")).longValue();
-
- System.out.println("did transfer " + segments + " segments with " + bytes + " bytes in " + (System.currentTimeMillis() - start) / 1000 + " seconds.");
-
- assertEquals(storeS.getHead(), storeC.getHead());
-
- //compare(segments, "segment", minExpectedSegments, maxExpectedSegments);
- //compare(bytes, "byte", minExpectedBytes, maxExpectedBytes);
-
- } finally {
- server.close();
- cl.close();
- }
- }
-
- private void compare(long current, String unit, long expectedMin, long expectedMax) {
- assertTrue("current number of " + unit + "s (" + current + ") is less than minimum expected: " + expectedMin, current >= expectedMin);
- assertTrue("current number of " + unit + "s (" + current + ") is bigger than maximum expected: " + expectedMax, current <= expectedMax);
- }
-}
+/*
+ * 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.jackrabbit.oak.plugins.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
+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 javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import java.lang.management.ManagementFactory;
+import java.util.Set;
+
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
+public class BulkTest extends TestBase {
+
+ @Before
+ public void setUp() throws Exception {
+ setUpServerAndClient();
+ }
+
+ @After
+ public void after() {
+ closeServerAndClient();
+ }
+
+ @Test
+ public void test100Nodes() throws Exception {
+ test(100, 1, 1, 3000, 3100);
+ }
+
+ @Test
+ public void test1000Nodes() throws Exception {
+ test(1000, 1, 1, 53000, 55000);
+ }
+
+ @Test
+ public void test10000Nodes() throws Exception {
+ test(10000, 1, 1, 245000, 246000);
+ }
+
+ @Test
+ public void test100000Nodes() throws Exception {
+ test(100000, 9, 9, 2210000, 2220000);
+ }
+
+ @Test
+ public void test1MillionNodes() throws Exception {
+ test(1000000, 87, 87, 22700000, 22800000);
+ }
+
+ @Test
+ public void test1MillionNodesUsingSSL() throws Exception {
+ test(1000000, 87, 87, 22700000, 22800000, true);
+ }
+
+/*
+ @Test
+ public void test10MillionNodes() throws Exception {
+ test(10000000, 856, 856, 223000000, 224000000);
+ }
+*/
+
+ // private helper
+
+ private void test(int number, int minExpectedSegments, int maxExpectedSegments, long minExpectedBytes, long maxExpectedBytes) throws Exception {
+ test(number, minExpectedSegments, maxExpectedSegments, minExpectedBytes, maxExpectedBytes, false);
+ }
+
+ private void test(int number, int minExpectedSegments, int maxExpectedSegments, long minExpectedBytes, long maxExpectedBytes,
+ boolean useSSL) throws Exception {
+ NodeStore store = new SegmentNodeStore(storeS);
+ NodeBuilder rootbuilder = store.getRoot().builder();
+ NodeBuilder b = rootbuilder.child("store");
+ for (int j=0; j<=number / 1000; j++) {
+ NodeBuilder builder = b.child("Folder#" + j);
+ for (int i = 0; i <(number < 1000 ? number : 1000); i++) {
+ builder.child("Test#" + i).setProperty("ts", System.currentTimeMillis());
+ }
+ }
+ store.merge(rootbuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+ storeS.flush();
+
+ final StandbyServer server = new StandbyServer(port, storeS, useSSL);
+ server.start();
+
+ System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, useSSL, 5000);
+
+ final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
+ ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
+ ObjectName clientStatus = new ObjectName(cl.getMBeanName());
+ ObjectName serverStatus = new ObjectName(server.getMBeanName());
+
+ long start = System.currentTimeMillis();
+ cl.run();
+
+ try {
+ Set<ObjectName> instances = jmxServer.queryNames(status, null);
+ assertEquals(3, instances.size());
+
+ ObjectName connectionStatus = null;
+ for (ObjectName s : instances) {
+ if (!s.equals(clientStatus) && !s.equals(serverStatus)) connectionStatus = s;
+ }
+ assertNotNull(connectionStatus);
+
+ long segments = ((Long)jmxServer.getAttribute(connectionStatus, "TransferredSegments")).longValue();
+ long bytes = ((Long)jmxServer.getAttribute(connectionStatus, "TransferredSegmentBytes")).longValue();
+
+ System.out.println("did transfer " + segments + " segments with " + bytes + " bytes in " + (System.currentTimeMillis() - start) / 1000 + " seconds.");
+
+ assertEquals(storeS.getHead(), storeC.getHead());
+
+ //compare(segments, "segment", minExpectedSegments, maxExpectedSegments);
+ //compare(bytes, "byte", minExpectedBytes, maxExpectedBytes);
+
+ } finally {
+ server.close();
+ cl.close();
+ }
+ }
+
+ private void compare(long current, String unit, long expectedMin, long expectedMax) {
+ assertTrue("current number of " + unit + "s (" + current + ") is less than minimum expected: " + expectedMin, current >= expectedMin);
+ assertTrue("current number of " + unit + "s (" + current + ") is bigger than maximum expected: " + expectedMax, current <= expectedMax);
+ }
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (from r1646684, 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/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?p2=jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java&r1=1646684&r2=1653803&rev=1653803&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Thu Jan 22 10:31:16 2015
@@ -1,204 +1,203 @@
-/*
- * 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 com.google.common.io.ByteStreams;
-import org.apache.jackrabbit.core.data.FileDataStore;
-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.blob.datastore.DataStoreBlobStore;
-import org.apache.jackrabbit.oak.plugins.segment.NetworkErrorProxy;
-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.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Random;
-
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent;
-import static org.junit.Assert.*;
-
-public class DataStoreTestBase extends TestBase {
- final static int PROXY_PORT = 4711;
- protected boolean storesCanBeEqual = false;
-
- @Before
- public void setUp() throws Exception {
- setUpServerAndClient();
- }
-
- protected FileStore setupFileDataStore(File d, String path) throws IOException {
- FileDataStore fds = new FileDataStore();
- fds.setMinRecordLength(4092);
- fds.init(path);
- DataStoreBlobStore blobStore = new DataStoreBlobStore(fds);
- return new FileStore(blobStore, d, 1, false);
- }
-
- protected 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;
- }
-
- @Test
- public void testSync() throws Exception {
- final int mb = 1 * 1024 * 1024;
- final int blobSize = 5 * mb;
- FileStore primary = getPrimary();
- FileStore secondary = getSecondary();
-
- NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
- server.start();
- byte[] data = addTestContent(store, "server", blobSize);
-
- StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
- cl.run();
-
- try {
- assertEquals(primary.getHead(), secondary.getHead());
- } finally {
- server.close();
- cl.close();
- }
-
- assertTrue(primary.size() < mb);
- assertTrue(secondary.size() < mb);
-
- 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);
- }
-
- @Test
- public void testProxySkippedBytes() throws Exception {
- useProxy(100, 1, -1, false);
- }
-
- @Test
- public void testProxySkippedBytesIntermediateChange() throws Exception {
- useProxy(100, 1, -1, true);
- }
-
- @Test
- public void testProxyFlippedStartByte() throws Exception {
- useProxy(0, 0, 0, false);
- }
-
- @Test
- public void testProxyFlippedIntermediateByte() throws Exception {
- useProxy(0, 0, 150, false);
- }
-
- @Test
- public void testProxyFlippedIntermediateByte2() throws Exception {
- useProxy(0, 0, 150000, false);
- }
-
- @Test
- public void testProxyFlippedIntermediateByteChange() throws Exception {
- useProxy(0, 0, 150, true);
- }
-
- @Test
- public void testProxyFlippedIntermediateByteChange2() throws Exception {
- useProxy(0, 0, 150000, true);
- }
-
-
- private void useProxy(int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception {
- final int mb = 1 * 1024 * 1024;
- int blobSize = 5 * mb;
- FileStore primary = getPrimary();
- FileStore secondary = getSecondary();
-
- NetworkErrorProxy p = new NetworkErrorProxy(PROXY_PORT, LOCALHOST, port);
- p.skipBytes(skipPosition, skipBytes);
- p.flipByte(flipPosition);
- p.run();
-
- NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
- server.start();
- byte[] data = addTestContent(store, "server", blobSize);
-
- StandbyClient cl = new StandbyClient("127.0.0.1", PROXY_PORT, secondary);
- cl.run();
-
- try {
- if (skipBytes > 0 || flipPosition >= 0) {
- if (!this.storesCanBeEqual) {
- assertFalse("stores are not expected to be equal", primary.getHead().equals(secondary.getHead()));
- }
- p.reset();
- if (intermediateChange) {
- blobSize = 2 * mb;
- data = addTestContent(store, "server", blobSize);
- }
- cl.run();
- }
- assertEquals(primary.getHead(), secondary.getHead());
- } finally {
- server.close();
- cl.close();
- p.close();
- }
-
- assertTrue(primary.size() < mb);
- assertTrue(secondary.size() < mb);
-
- 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);
- }
-}
+/*
+ * 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 com.google.common.io.ByteStreams;
+
+import org.apache.jackrabbit.core.data.FileDataStore;
+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.blob.datastore.DataStoreBlobStore;
+import org.apache.jackrabbit.oak.plugins.segment.NetworkErrorProxy;
+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.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.Random;
+
+import static org.junit.Assert.*;
+
+public class DataStoreTestBase extends TestBase {
+
+ protected boolean storesCanBeEqual = false;
+
+ @Before
+ public void setUp() throws Exception {
+ setUpServerAndClient();
+ }
+
+ protected FileStore setupFileDataStore(File d, String path) throws IOException {
+ FileDataStore fds = new FileDataStore();
+ fds.setMinRecordLength(4092);
+ fds.init(path);
+ DataStoreBlobStore blobStore = new DataStoreBlobStore(fds);
+ return new FileStore(blobStore, d, 1, false);
+ }
+
+ protected 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;
+ }
+
+ @Test
+ public void testSync() throws Exception {
+ final int mb = 1 * 1024 * 1024;
+ final int blobSize = 5 * mb;
+ FileStore primary = getPrimary();
+ FileStore secondary = getSecondary();
+
+ NodeStore store = new SegmentNodeStore(primary);
+ final StandbyServer server = new StandbyServer(getPort(), primary);
+ server.start();
+ byte[] data = addTestContent(store, "server", blobSize);
+
+ StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
+ cl.run();
+
+ try {
+ assertEquals(primary.getHead(), secondary.getHead());
+ } finally {
+ server.close();
+ cl.close();
+ }
+
+ assertTrue(primary.size() < mb);
+ assertTrue(secondary.size() < mb);
+
+ 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);
+ }
+
+ @Test
+ public void testProxySkippedBytes() throws Exception {
+ useProxy(100, 1, -1, false);
+ }
+
+ @Test
+ public void testProxySkippedBytesIntermediateChange() throws Exception {
+ useProxy(100, 1, -1, true);
+ }
+
+ @Test
+ public void testProxyFlippedStartByte() throws Exception {
+ useProxy(0, 0, 0, false);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByte() throws Exception {
+ useProxy(0, 0, 150, false);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByte2() throws Exception {
+ useProxy(0, 0, 150000, false);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByteChange() throws Exception {
+ useProxy(0, 0, 150, true);
+ }
+
+ @Test
+ public void testProxyFlippedIntermediateByteChange2() throws Exception {
+ useProxy(0, 0, 150000, true);
+ }
+
+ private void useProxy(int skipPosition, int skipBytes, int flipPosition, boolean intermediateChange) throws Exception {
+ int proxyPort = Integer.valueOf(System.getProperty("standby.proxy.port", "51913"));
+ final int mb = 1 * 1024 * 1024;
+ int blobSize = 5 * mb;
+ FileStore primary = getPrimary();
+ FileStore secondary = getSecondary();
+
+ NetworkErrorProxy p = new NetworkErrorProxy(proxyPort, LOCALHOST, port);
+ p.skipBytes(skipPosition, skipBytes);
+ p.flipByte(flipPosition);
+ p.run();
+
+ NodeStore store = new SegmentNodeStore(primary);
+ final StandbyServer server = new StandbyServer(getPort(), primary);
+ server.start();
+ byte[] data = addTestContent(store, "server", blobSize);
+
+ StandbyClient cl = new StandbyClient("127.0.0.1", proxyPort, secondary);
+ cl.run();
+
+ try {
+ if (skipBytes > 0 || flipPosition >= 0) {
+ if (!this.storesCanBeEqual) {
+ assertFalse("stores are not expected to be equal", primary.getHead().equals(secondary.getHead()));
+ }
+ p.reset();
+ if (intermediateChange) {
+ blobSize = 2 * mb;
+ data = addTestContent(store, "server", blobSize);
+ }
+ cl.run();
+ }
+ assertEquals(primary.getHead(), secondary.getHead());
+ } finally {
+ server.close();
+ cl.close();
+ p.close();
+ }
+
+ assertTrue(primary.size() < mb);
+ assertTrue(secondary.size() < mb);
+
+ 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);
+ }
+}
Propchange: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
------------------------------------------------------------------------------
svn:eol-style = native