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/06/07 17:28:33 UTC
svn commit: r1747277 - in /jackrabbit/oak/branches/1.2: ./
oak-run/src/main/java/org/apache/jackrabbit/oak/run/ oak-tarmk-standby/
oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/
oak-tarmk-standby/src/main/java...
Author: alexparvulescu
Date: Tue Jun 7 17:28:33 2016
New Revision: 1747277
URL: http://svn.apache.org/viewvc?rev=1747277&view=rev
Log:
OAK-3961 Cold Standby revisit timeout setup
- merged rev 1727923, 1727913, 1727841, 1727832, 1727831, 1727816, 1727813 and 1727991
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml
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/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.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/BrokenNetworkTest.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.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/FailoverIPRangeTest.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java
jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.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 Tue Jun 7 17:28:33 2016
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.0:1665962
/jackrabbit/oak/branches/1.4:1745750
-/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,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694
393-1694394,1694651,1694653-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,1697383,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,1
706772,1707049,1707189,1707191,1707331,1707435,1707509,1707753,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,1720306,1720335,1720350,1720354,172050
0,1721160,1721172,1721337,1722141,1722832,1723227,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,1727912,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,1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1746117,1746696
+/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,1690657,1690669,1690672,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691201,1691210,1691217-1691218,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691394,1691401,1691498,1691509,1692133-1692134,1692156,1692250,1692272,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693401,1693421,1693525-1693526,1694007,1694
393-1694394,1694651,1694653-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,1697383,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,1
706772,1707049,1707189,1707191,1707331,1707435,1707509,1707753,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,1720306,1720335,1720350,1720354,172050
0,1721160,1721172,1721337,1722141,1722832,1723227,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,1727813,1727816,1727831-1727832,1727841,1727893,1727895,1727912-1727913,1727923,1727991,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,1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,174
5197,1746117,1746696
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/branches/1.2/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue Jun 7 17:28:33 2016
@@ -344,7 +344,7 @@ public final class Main {
options.has(host)? options.valueOf(host) : defaultHost,
options.has(port)? options.valueOf(port) : defaultPort,
store,
- options.has(secure) && options.valueOf(secure), 10000);
+ options.has(secure) && options.valueOf(secure), 10000, false);
if (!options.has(interval)) {
failoverClient.run();
} else {
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/pom.xml Tue Jun 7 17:28:33 2016
@@ -89,10 +89,9 @@
</systemPropertyVariables>
<excludes>
<!-- excluding long running tests -->
- <exclude>**/BrokenNetworkTest.java</exclude>
- <exclude>**/FailoverIPRangeTest.java</exclude>
<exclude>**/BulkTest.java</exclude>
<exclude>**/MBeanTest.java</exclude>
+ <exclude>**/FailoverIPRangeTest.java</exclude> <!-- OAK-3967 -->
</excludes>
</configuration>
</plugin>
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=1747277&r1=1747276&r2=1747277&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 Tue Jun 7 17:28:33 2016
@@ -84,15 +84,6 @@ public final class StandbyClient impleme
private long syncStartTimestamp;
private long syncEndTimestamp;
- public StandbyClient(String host, int port, SegmentStore store) throws SSLException {
- this(host, port, store, false, 10000);
- }
-
- public StandbyClient(String host, int port, SegmentStore store,
- boolean secure, int readTimeoutMs) throws SSLException {
- this(host, port, store, secure, readTimeoutMs, false);
- }
-
public StandbyClient(String host, int port, SegmentStore store,
boolean secure, int readTimeoutMs, boolean autoClean)
throws SSLException {
@@ -172,7 +163,6 @@ public final class StandbyClient impleme
if (sslContext != null) {
p.addLast(sslContext.newHandler(ch.alloc()));
}
- // WriteTimeoutHandler & ReadTimeoutHandler
p.addLast("readTimeoutHandler", new ReadTimeoutHandler(
readTimeoutMs, TimeUnit.MILLISECONDS));
p.addLast(new StringEncoder(CharsetUtil.UTF_8));
@@ -208,11 +198,11 @@ public final class StandbyClient impleme
private void shutdownNetty() {
if (group != null && !group.isShuttingDown()) {
- group.shutdownGracefully(1, 1, TimeUnit.SECONDS)
+ group.shutdownGracefully(0, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
if (executor != null && !executor.isShuttingDown()) {
- executor.shutdownGracefully(1, 1, TimeUnit.SECONDS)
+ executor.shutdownGracefully(0, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
if (handler != null) {
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=1747277&r1=1747276&r2=1747277&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 Tue Jun 7 17:28:33 2016
@@ -22,6 +22,7 @@ import static org.apache.jackrabbit.oak.
import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.timeout.ReadTimeoutHandler;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
import io.netty.util.concurrent.EventExecutorGroup;
@@ -90,6 +91,7 @@ public class StandbyClientHandler extend
}
log.debug("updating current head to " + head);
+ ctx.pipeline().remove(ReadTimeoutHandler.class);
ctx.pipeline().remove(RecordIdDecoder.class);
ctx.pipeline().remove(this);
ctx.pipeline().addLast(new ReplyDecoder(store));
@@ -122,7 +124,7 @@ public class StandbyClientHandler extend
ctx = null;
}
if (loaderExecutor != null && !loaderExecutor.isShuttingDown()) {
- loaderExecutor.shutdownGracefully(1, 1, TimeUnit.SECONDS)
+ loaderExecutor.shutdownGracefully(0, 1, TimeUnit.SECONDS)
.syncUninterruptibly();
}
}
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java Tue Jun 7 17:28:33 2016
@@ -154,10 +154,10 @@ public class StandbyServer implements St
log.error("can't unregister standby status mbean", e);
}
if (bossGroup != null && !bossGroup.isShuttingDown()) {
- bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ bossGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS).syncUninterruptibly();
}
if (workerGroup != null && !workerGroup.isShuttingDown()) {
- workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ workerGroup.shutdownGracefully(0, 1, TimeUnit.SECONDS).syncUninterruptibly();
}
handler.state = STATUS_CLOSED;
}
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=1747277&r1=1747276&r2=1747277&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 Tue Jun 7 17:28:33 2016
@@ -96,10 +96,10 @@ public class NetworkErrorProxy {
f.channel().close();
}
if (bossGroup != null && !bossGroup.isShuttingDown()) {
- bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ bossGroup.shutdownGracefully(0, 150, TimeUnit.MILLISECONDS).syncUninterruptibly();
}
if (workerGroup != null && !workerGroup.isShuttingDown()) {
- workerGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
+ workerGroup.shutdownGracefully(0, 150, TimeUnit.MILLISECONDS).syncUninterruptibly();
}
}
}
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java Tue Jun 7 17:28:33 2016
@@ -114,7 +114,6 @@ public class BrokenNetworkTest extends T
}
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);
@@ -126,7 +125,7 @@ public class BrokenNetworkTest extends T
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl = new StandbyClient(LOCALHOST, proxyPort, storeC, ssl, 5000);
+ StandbyClient cl = newStandbyClient(storeC, proxyPort, ssl);
cl.run();
try {
Modified: jackrabbit/oak/branches/1.2/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.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java Tue Jun 7 17:28:33 2016
@@ -113,7 +113,7 @@ public class BulkTest extends TestBase {
server.start();
System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, useSSL, 5000);
+ StandbyClient cl = newStandbyClient(storeC, port, useSSL);
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
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=1747277&r1=1747276&r2=1747277&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 Tue Jun 7 17:28:33 2016
@@ -93,11 +93,12 @@ public class DataStoreTestBase extends T
FileStore secondary = getSecondary();
NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
+ final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize);
+ primary.flush();
- StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
+ StandbyClient cl = newStandbyClient(secondary);
cl.run();
try {
@@ -157,7 +158,6 @@ public class DataStoreTestBase extends T
}
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();
@@ -169,11 +169,12 @@ public class DataStoreTestBase extends T
p.run();
NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
+ final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize);
+ primary.flush();
- StandbyClient cl = new StandbyClient("127.0.0.1", proxyPort, secondary);
+ StandbyClient cl = newStandbyClient(secondary, proxyPort);
cl.run();
try {
@@ -185,6 +186,7 @@ public class DataStoreTestBase extends T
if (intermediateChange) {
blobSize = 2 * mb;
data = addTestContent(store, "server", blobSize);
+ primary.flush();
}
cl.run();
}
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.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/FailoverIPRangeTest.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java Tue Jun 7 17:28:33 2016
@@ -150,7 +150,7 @@ public class FailoverIPRangeTest extends
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl = new StandbyClient(host, port, storeC);
+ StandbyClient cl = new StandbyClient(host, port, storeC, false, timeout, false);
cl.run();
try {
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.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/FailoverMultipleClientsTestIT.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTestIT.java Tue Jun 7 17:28:33 2016
@@ -27,7 +27,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import static junit.framework.Assert.assertFalse;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
public class FailoverMultipleClientsTestIT extends TestBase {
@@ -50,8 +50,8 @@ public class FailoverMultipleClientsTest
SegmentTestUtils.addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl1 = new StandbyClient("127.0.0.1", port, storeC);
- StandbyClient cl2 = new StandbyClient("127.0.0.1", port, storeC2);
+ StandbyClient cl1 = newStandbyClient(storeC);
+ StandbyClient cl2 = newStandbyClient(storeC2);
try {
assertFalse("first client has invalid initial store!", storeS.getHead().equals(storeC.getHead()));
@@ -66,6 +66,7 @@ public class FailoverMultipleClientsTest
cl1.stop();
SegmentTestUtils.addTestContent(store, "test");
+ storeS.flush();
cl1.run();
cl2.run();
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.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/FailoverSslTestIT.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTestIT.java Tue Jun 7 17:28:33 2016
@@ -51,7 +51,7 @@ public class FailoverSslTestIT extends T
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true, 5000);
+ StandbyClient cl = newStandbyClient(storeC, port, true);
cl.run();
try {
@@ -71,7 +71,7 @@ public class FailoverSslTestIT extends T
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
+ StandbyClient cl = newStandbyClient(storeC);
cl.run();
try {
@@ -91,7 +91,7 @@ public class FailoverSslTestIT extends T
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true, 5000);
+ StandbyClient cl = newStandbyClient(storeC, port, true);
cl.run();
try {
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.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/MBeanTest.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java Tue Jun 7 17:28:33 2016
@@ -83,7 +83,7 @@ public class MBeanTest extends TestBase
@Test
public void testClientEmptyConfigNoServer() throws Exception {
- final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
+ final StandbyClient client = newStandbyClient(storeC);
client.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
@@ -120,7 +120,7 @@ public class MBeanTest extends TestBase
@Test
public void testClientNoServer() throws Exception {
System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Foo");
- final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
+ final StandbyClient client = newStandbyClient(storeC);
client.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
@@ -144,11 +144,11 @@ public class MBeanTest extends TestBase
@Test
@Ignore("OAK-2086")
public void testClientAndServerEmptyConfig() throws Exception {
- final StandbyServer server = new StandbyServer(this.port, this.storeS);
+ final StandbyServer server = new StandbyServer(port, this.storeS);
server.start();
System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
- final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
+ final StandbyClient client = newStandbyClient(storeC);
client.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.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/RecoverTestIT.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTestIT.java Tue Jun 7 17:28:33 2016
@@ -49,12 +49,14 @@ public class RecoverTestIT extends TestB
NodeStore store = new SegmentNodeStore(storeS);
DebugSegmentStore s = new DebugSegmentStore(storeS);
+ addTestContent(store, "server");
+ storeS.flush();
+
final StandbyServer server = new StandbyServer(port, s);
s.createReadErrors = true;
server.start();
- addTestContent(store, "server");
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
+ StandbyClient cl = newStandbyClient(storeC);
cl.run();
try {
@@ -81,7 +83,7 @@ public class RecoverTestIT extends TestB
addTestContent(store, "server");
storeS.flush();
- StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
+ StandbyClient cl = newStandbyClient(storeC);
try {
assertFalse("stores are not expected to be equal", storeS.getHead().equals(storeC.getHead()));
cl.run();
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.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/StandbyTest.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTest.java Tue Jun 7 17:28:33 2016
@@ -67,12 +67,12 @@ public class StandbyTest extends TestBas
FileStore secondary = getSecondary();
NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
+ final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize, 150);
primary.flush();
- StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
+ StandbyClient cl = newStandbyClient(secondary);
cl.run();
try {
@@ -119,19 +119,4 @@ public class StandbyTest extends TestBas
store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
return data;
}
-
- public static void main(String[] args) throws Exception {
- File d = createTmpTargetDir("StandbyLiveTest");
- d.delete();
- d.mkdir();
- FileStore s = new FileStore(d, 256, false);
- StandbyClient cl = new StandbyClient("127.0.0.1", 8023, s);
- try {
- cl.run();
- } finally {
- s.close();
- cl.close();
- }
- }
-
}
Modified: jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.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/StandbyTestIT.java?rev=1747277&r1=1747276&r2=1747277&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java (original)
+++ jackrabbit/oak/branches/1.2/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/StandbyTestIT.java Tue Jun 7 17:28:33 2016
@@ -85,24 +85,25 @@ public class StandbyTestIT extends TestB
*/
@Test
public void testSyncLoop() throws Exception {
- final int mb = 1 * 1024 * 1024;
- final int blobSize = 5 * mb;
+ final int blobSize = 25 * 1024;
final int dataNodes = 5000;
FileStore primary = getPrimary();
FileStore secondary = getSecondary();
NodeStore store = new SegmentNodeStore(primary);
- final StandbyServer server = new StandbyServer(getPort(), primary);
+ final StandbyServer server = new StandbyServer(port, primary);
server.start();
byte[] data = addTestContent(store, "server", blobSize, dataNodes);
+ primary.flush();
- StandbyClient cl = new StandbyClient("127.0.0.1", getPort(), secondary);
+ StandbyClient cl = newStandbyClient(secondary);
try {
for (int i = 0; i < 5; i++) {
String cp = store.checkpoint(Long.MAX_VALUE);
+ primary.flush();
cl.run();
assertEquals(primary.getHead(), secondary.getHead());
assertTrue(store.release(cp));
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=1747277&r1=1747276&r2=1747277&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 Tue Jun 7 17:28:33 2016
@@ -31,12 +31,21 @@ import org.apache.jackrabbit.oak.commons
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.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
import org.junit.BeforeClass;
public class TestBase {
- int port = Integer.valueOf(System.getProperty("standby.server.port", "52800"));
+
+ static final int port = Integer.getInteger("standby.server.port",
+ 52800);
+
+ static final int proxyPort = Integer.getInteger(
+ "standby.proxy.port", 51913);
+
final static String LOCALHOST = "127.0.0.1";
+ static final int timeout = Integer.getInteger("standby.test.timeout", 500);
+
private static final Set<Fixture> FIXTURES = FixturesHelper.getFixtures();
File directoryS;
@@ -62,11 +71,11 @@ public class TestBase {
public void setUpServerAndClient() throws IOException {
// server
- directoryS = createTmpTargetDir("FailoverServerTest");
+ directoryS = createTmpTargetDir(getClass().getSimpleName()+"-Server");
storeS = setupPrimary(directoryS);
// client
- directoryC = createTmpTargetDir("FailoverClientTest");
+ directoryC = createTmpTargetDir(getClass().getSimpleName()+"-Client");
storeC = setupSecondary(directoryC);
}
@@ -94,14 +103,10 @@ public class TestBase {
return storeC;
}
- protected int getPort() {
- return port;
- }
-
public void setUpServerAndTwoClients() throws Exception {
setUpServerAndClient();
- directoryC2 = createTmpTargetDir("FailoverClient2Test");
+ directoryC2 = createTmpTargetDir(getClass().getSimpleName()+"-Client2");
storeC2 = newFileStore(directoryC2);
}
@@ -123,4 +128,23 @@ public class TestBase {
} catch (IOException e) {
}
}
+
+ public static int getTestTimeout() {
+ return timeout;
+ }
+
+ public StandbyClient newStandbyClient(FileStore store) throws Exception {
+ return newStandbyClient(store, port, false);
+ }
+
+ public StandbyClient newStandbyClient(FileStore store, int port)
+ throws Exception {
+ return newStandbyClient(store, port, false);
+ }
+
+ public StandbyClient newStandbyClient(FileStore store, int port,
+ boolean secure) throws Exception {
+ return new StandbyClient(LOCALHOST, port, store, secure, timeout, false);
+ }
+
}