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 2016/05/25 09:28:30 UTC
svn commit: r1745464 - in /jackrabbit/oak/branches/1.2: ./
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/
oak-tarmk-standby/src/test/j...
Author: alexparvulescu
Date: Wed May 25 09:28:30 2016
New Revision: 1745464
URL: http://svn.apache.org/viewvc?rev=1745464&view=rev
Log:
OAK-3109 OOME in tarkmk standby tests
- merged r1691201, r1691498, r1692272, r1695829, r1695830
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 25 09:28:30 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695
050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1707331,1707435,1707509,1708049,1708105,1
708307,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,172333
3,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727893,1727895,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729505,1729599,1729957,1729979,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,1732278,1732647-1732648,1732864,1733929,1734230,1734254,1735052,1735405,1735484,1735588,1736176,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1739894,1740116,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672611,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678202,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682488,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561
,1684570,1684601,1684618,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685541,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686772,1686780,1686790,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694
653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695521,1695540,1695571,1695829-1695830,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1697896,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700720,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702371,1702387,1702405,1702423,1702426,1702428,1702860,1702866,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707189,1707191,1
707331,1707435,1707509,1708049,1708105,1708307,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715716,1715767,1715771,1715888,1715898,1716100,1716178,1716426,1716576,1716588-1716589,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717203,1717277,1717410,1717462,1717632,1717768-1717769,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,172322
7,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723565,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725515,1725555,1725941,1725960,1726232,1726237,1726570,1726579,1726585-1726586,1726621,1726795,1726797,1726809,1726812,1726981,1726993,1727026,1727254,1727331,1727350,1727358,1727429,1727476,1727483,1727508,1727515-1727518,1727893,1727895,1728037,1728041,1728070,1728114,1728281,1728443,1728642,1729200,1729505,1729599,1729957,1729979,1730216,1730527,1730581,1730629,1730801,1731627,1731647-1731648,1731789,1731797,1732131,1732268,1732278,1732647-1732648,1732864,1733929,1734230,1734254,1735052,1735405,1735484,1735588,1736176,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1739894,1740116,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java Wed May 25 09:28:30 2016
@@ -207,10 +207,6 @@ public class SegmentLoaderHandler extend
@Override
public void close() {
ctx.close();
- if (loaderExecutor != null && !loaderExecutor.isShuttingDown()) {
- loaderExecutor.shutdownGracefully(1, 2, TimeUnit.SECONDS)
- .syncUninterruptibly();
- }
}
@Override
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Wed May 25 09:28:30 2016
@@ -148,8 +148,8 @@ public final class StandbyClient impleme
}
state = STATUS_STARTING;
executor = new DefaultEventExecutorGroup(4);
- handler = new StandbyClientHandler(this.store, executor, observer,
- running, readTimeoutMs, autoClean);
+ handler = new StandbyClientHandler(this.store, observer, running,
+ readTimeoutMs, autoClean);
group = new NioEventLoopGroup();
b = new Bootstrap();
@@ -200,13 +200,17 @@ public final class StandbyClient impleme
private void shutdownNetty() {
if (group != null && !group.isShuttingDown()) {
- group.shutdownGracefully(1, 2, TimeUnit.SECONDS)
+ group.shutdownGracefully(1, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
if (executor != null && !executor.isShuttingDown()) {
- executor.shutdownGracefully(1, 2, TimeUnit.SECONDS)
+ executor.shutdownGracefully(1, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
+ if (handler != null) {
+ handler.close();
+ handler = null;
+ }
}
@Override
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java Wed May 25 09:28:30 2016
@@ -19,6 +19,7 @@
package org.apache.jackrabbit.oak.plugins.segment.standby.client;
import static org.apache.jackrabbit.oak.plugins.segment.standby.codec.Messages.newGetHeadReq;
+import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
@@ -43,7 +44,6 @@ public class StandbyClientHandler extend
.getLogger(StandbyClientHandler.class);
private final StandbyStore store;
- private final EventExecutorGroup executor;
private final CommunicationObserver observer;
private final AtomicBoolean running;
private final int readTimeoutMs;
@@ -53,10 +53,9 @@ public class StandbyClientHandler extend
private ChannelHandlerContext ctx;
public StandbyClientHandler(final StandbyStore store,
- EventExecutorGroup executor, CommunicationObserver observer,
- AtomicBoolean running, int readTimeoutMs, boolean autoClean) {
+ CommunicationObserver observer, AtomicBoolean running,
+ int readTimeoutMs, boolean autoClean) {
this.store = store;
- this.executor = executor;
this.observer = observer;
this.running = running;
this.readTimeoutMs = readTimeoutMs;
@@ -87,7 +86,6 @@ public class StandbyClientHandler extend
if (store.getHead().getRecordId().equals(head)) {
// all sync'ed up
log.debug("no changes on sync.");
- ctx.close();
return;
}
@@ -114,14 +112,17 @@ public class StandbyClientHandler extend
}
@Override
- public void close() {
- ctx.close();
- if (!executor.isShuttingDown()) {
- executor.shutdownGracefully(1, 2, TimeUnit.SECONDS)
- .syncUninterruptibly();
+ public synchronized void close() {
+ if (ctx != null) {
+ for (ChannelHandler h : ctx.pipeline().toMap().values()) {
+ ctx.pipeline().remove(h);
+ }
+
+ ctx.close();
+ ctx = null;
}
if (loaderExecutor != null && !loaderExecutor.isShuttingDown()) {
- loaderExecutor.shutdownGracefully(1, 2, TimeUnit.SECONDS)
+ loaderExecutor.shutdownGracefully(1, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
}
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/NetworkErrorProxy.java Wed May 25 09:28:30 2016
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
import java.util.concurrent.TimeUnit;
public class NetworkErrorProxy {
- private static final Logger log = LoggerFactory
+ static final Logger log = LoggerFactory
.getLogger(NetworkErrorProxy.class);
private final int inboundPort;
@@ -168,7 +168,7 @@ class ForwardHandler extends ChannelInbo
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
- cause.printStackTrace();
+ NetworkErrorProxy.log.debug(cause.getMessage(), cause);
ctx.close();
}
}
@@ -233,7 +233,7 @@ class SendBackHandler implements Channel
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
- cause.printStackTrace();
+ NetworkErrorProxy.log.debug(cause.getMessage(), cause);
this.target.close();
}
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/DataStoreTestBase.java Wed May 25 09:28:30 2016
@@ -18,8 +18,18 @@
*/
package org.apache.jackrabbit.oak.plugins.segment.standby;
-import com.google.common.io.ByteStreams;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+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 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;
@@ -38,13 +48,6 @@ import org.apache.jackrabbit.oak.spi.sta
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;
@@ -59,7 +62,12 @@ public class DataStoreTestBase extends T
fds.setMinRecordLength(4092);
fds.init(path);
DataStoreBlobStore blobStore = new DataStoreBlobStore(fds);
- return new FileStore(blobStore, d, 1, false);
+ return FileStore.newFileStore(d)
+ .withMaxFileSize(1)
+ .withMemoryMapping(false)
+ .withNoCache()
+ .withBlobStore(blobStore)
+ .create();
}
protected byte[] addTestContent(NodeStore store, String child, int size)
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/ExternalSharedStoreIT.java Wed May 25 09:28:30 2016
@@ -19,17 +19,13 @@
package org.apache.jackrabbit.oak.plugins.segment.standby;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
-import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.oak.commons.CIHelper;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
-
import org.junit.After;
-import org.junit.Before;
public class ExternalSharedStoreIT extends DataStoreTestBase {
private File externalStore;
@@ -39,11 +35,6 @@ public class ExternalSharedStoreIT exten
this.storesCanBeEqual = true;
}
- @Before
- public void checkEnvironment() {
- assumeTrue(!CIHelper.travis());
- }
-
@After
public void after() {
closeServerAndClient();
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java?rev=1745464&r1=1745463&r2=1745464&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java Wed May 25 09:28:30 2016
@@ -18,19 +18,27 @@
*/
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 static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import static org.junit.Assume.assumeTrue;
import java.io.File;
import java.io.IOException;
+import java.util.Set;
-import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.apache.jackrabbit.oak.commons.CIHelper;
+import org.apache.jackrabbit.oak.commons.FixturesHelper;
+import org.apache.jackrabbit.oak.commons.FixturesHelper.Fixture;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.junit.BeforeClass;
public class TestBase {
int port = Integer.valueOf(System.getProperty("standby.server.port", "52800"));
final static String LOCALHOST = "127.0.0.1";
+ private static final Set<Fixture> FIXTURES = FixturesHelper.getFixtures();
+
File directoryS;
FileStore storeS;
@@ -46,6 +54,12 @@ public class TestBase {
*/
protected final boolean noDualStackSupport = SystemUtils.IS_OS_WINDOWS && SystemUtils.IS_JAVA_1_6;
+ @BeforeClass
+ public static void assumptions() {
+ assumeTrue(!CIHelper.travis());
+ assumeTrue(FIXTURES.contains(Fixture.SEGMENT_MK));
+ }
+
public void setUpServerAndClient() throws IOException {
// server
directoryS = createTmpTargetDir("FailoverServerTest");
@@ -56,8 +70,16 @@ public class TestBase {
storeC = setupSecondary(directoryC);
}
+ private static FileStore newFileStore(File directory) throws IOException {
+ return FileStore.newFileStore(directory)
+ .withMaxFileSize(1)
+ .withMemoryMapping(false)
+ .withNoCache()
+ .create();
+ }
+
protected FileStore setupPrimary(File directory) throws IOException {
- return new FileStore(directory, 1, false);
+ return newFileStore(directory);
}
protected FileStore getPrimary() {
@@ -65,7 +87,7 @@ public class TestBase {
}
protected FileStore setupSecondary(File directory) throws IOException {
- return new FileStore(directoryC, 1, false);
+ return newFileStore(directoryC);
}
protected FileStore getSecondary() {
@@ -80,7 +102,7 @@ public class TestBase {
setUpServerAndClient();
directoryC2 = createTmpTargetDir("FailoverClient2Test");
- storeC2 = new FileStore(directoryC2, 1, false);
+ storeC2 = newFileStore(directoryC2);
}
public void closeServerAndClient() {