Author: alexparvulescu Date: Mon May 11 07:25:02 2015 New Revision: 1678682
URL: http://svn.apache.org/r1678682 Log: OAK-2817 TARMK Cold Standby cleanup removes too many binary segments - merged r1677939 Modified: jackrabbit/oak/branches/1.0/ (props changed) jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/resources/logback-test.xml Propchange: jackrabbit/oak/branches/1.0/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 11 07:25:02 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,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,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,1609 165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,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,1624559,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,1 627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,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,1633389,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,1635178,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,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,1641350,1641352,1641541,1641596-164159 9,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,165 6427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,1672468,1672537, 1672603,1672642,1672644,1672834-1672835,1673351,1673431,1673644,1673662-1673663,1673695,1674046,1674065,1674075,1674107,1674150,1675054,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1677579,1677609,1677611,1677991,1678173,1678323 +/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,1596889,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,1599160,1599299,1599332,1599416,1599434,1599671,1600088,1600935,1601309,1601388,1601578,1601649,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602170,1602174,1602179,1602183,1602201,1602207,1602227,1602256,1602261,1602342,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,1609 165,1609214,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612848,1612892,1612899,1612993,1613018,1613041,1614032,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,1624559,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,1 627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629688,1629840,1629858,1629917,1630055-1630057,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,1633389,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,1635178,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,1640523,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641346,1641350,1641352,1641541,1641596-164159 9,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,1642119,1642285,1642648,1642667,1642954,1642959,1643111,1643178,1643186,1643204,1643287,1643767,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644588,1644645,1644650,1644654,1644689,1644750,1645421,1645424,1645459,1645585,1645611,1645637,1645646,1645660-1645663,1645888,1645901,1645948,1645966,1645970-1645971,1646014,1646164,1646174,1646469,1646684,1646726-1646728,1646766,1646795,1646981,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1652992,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653813,1653848-1653850,1653882,1654116,1654174,1654743,1654756,1654778,1655028,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656019,1656027,1656033,1656303,1656394,1656400,1656425,165 6427,1656453,1656628,1656678,1657163,1657188,1657766,1657804,1658470,1658977,1659285,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663666,1663705,1663730,1663753,1663854,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668641,1668645,1668649,1668665,1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1670030,1670693,1670705,1671489,1671512,1671787,1671795,1672055,1672277,1672350,1672468,1672537, 1672603,1672642,1672644,1672834-1672835,1673351,1673431,1673644,1673662-1673663,1673695,1674046,1674065,1674075,1674107,1674150,1675054,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1677579,1677609,1677611,1677939,1677991,1678173,1678323 /jackrabbit/trunk:1345480 Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java?rev=1678682&r1=1678681&r2=1678682&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java (original) +++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java Mon May 11 07:25:02 2015 @@ -25,8 +25,6 @@ import io.netty.channel.ChannelHandlerCo import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.util.concurrent.EventExecutorGroup; -import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -97,7 +95,7 @@ public class SegmentLoaderHandler extend } try { - store.setLoader(this); + store.preSync(this); SegmentNodeState before = store.getHead(); SegmentNodeBuilder builder = before.builder(); @@ -118,14 +116,7 @@ public class SegmentLoaderHandler extend } log.debug("did reread locally corrupt segment " + id + " with size " + s.size()); - ByteArrayOutputStream bout = new ByteArrayOutputStream(s.size()); - try { - s.writeTo(bout); - } catch (IOException f) { - log.error("can't wrap segment to output stream", f); - throw e; - } - store.writeSegment(s.getSegmentId(), bout.toByteArray(), 0, s.size()); + store.persist(s.getSegmentId(), s); } } while(true); boolean ok = store.setHead(before, builder.getNodeState()); @@ -144,6 +135,7 @@ public class SegmentLoaderHandler extend } } } finally { + store.postSync(); close(); } } Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.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/store/StandbyStore.java?rev=1678682&r1=1678681&r2=1678682&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java (original) +++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java Mon May 11 07:25:02 2015 @@ -16,11 +16,16 @@ */ package org.apache.jackrabbit.oak.plugins.segment.standby.store; +import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.ArrayDeque; import java.util.Deque; +import java.util.HashMap; import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.jackrabbit.oak.api.Blob; @@ -70,35 +75,88 @@ public class StandbyStore implements Seg @Override public Segment readSegment(SegmentId sid) { + callId++; Deque<SegmentId> ids = new ArrayDeque<SegmentId>(); ids.offer(sid); int err = 0; - Set<SegmentId> seen = new HashSet<SegmentId>(); + Set<SegmentId> persisted = new HashSet<SegmentId>(); + + Map<SegmentId, Segment> cache = new HashMap<SegmentId, Segment>(); + long cacheOps = 0; + + long cacheWeight = 0; + long maxWeight = 0; + long maxKeys = 0; while (!ids.isEmpty()) { SegmentId id = ids.remove(); - if (!seen.contains(id) && !delegate.containsSegment(id)) { - log.debug("trying to read segment " + id); - Segment s = loader.readSegment(id.toString()); + if (!persisted.contains(id) && !delegate.containsSegment(id)) { + Segment s; + boolean logRefs = true; + if (cache.containsKey(id)) { + s = cache.remove(id); + cacheWeight -= s.size(); + cacheOps++; + logRefs = false; + } else { + log.debug("transferring segment {}", id); + s = loader.readSegment(id.toString()); + } + if (s != null) { - log.debug("got segment " + id + " with size " + s.size()); - ByteArrayOutputStream bout = new ByteArrayOutputStream( + log.debug("processing segment {} with size {}", id, s.size()); if (id.isDataSegmentId()) { - ids.addAll(s.getReferencedIds()); + boolean hasPendingRefs = false; + List<SegmentId> refs = s.getReferencedIds(); + if (logRefs) { + log.debug("{} -> {}", id, refs); + } + for (SegmentId nr : refs) { + // skip already persisted or self-ref + if (persisted.contains(nr) || id.equals(nr)) { + continue; + } + hasPendingRefs = true; + if (!ids.contains(nr)) { + if (nr.isBulkSegmentId()) { + // binaries first + ids.addFirst(nr); + } else { + // data segments last + ids.add(nr); + } + } + } + + if (!hasPendingRefs) { + persisted.add(id); + persist(id, s); + } else { + // persist it later, after the refs are in place + ids.add(id); + + // TODO there is a chance this might introduce + // a OOME because of the position of the current + // segment in the processing queue. putting it at + // the end of the current queue means it will stay + // in the cache until the pending queue of the + // segment's references is processed. + cache.put(id, s); + cacheWeight += s.size(); + cacheOps++; + + maxWeight = Math.max(maxWeight, cacheWeight); + maxKeys = Math.max(maxKeys, cache.size()); + } + } else { + persisted.add(id); + persist(id, s); } - try { - s.writeTo(bout); - writeSegment(id, bout.toByteArray(), 0, s.size()); - } catch (IOException e) { - throw new IllegalStateException( - "Unable to write remote segment " + id, e); - } - seen.add(id); - ids.removeAll(seen); + ids.removeAll(persisted); err = 0; } else { - log.error("could NOT read segment " + id); + log.error("could NOT read segment {}", id); if (loader.isClosed() || err == 4) { loader.close(); throw new IllegalStateException( @@ -108,14 +166,44 @@ public class StandbyStore implements Seg ids.addFirst(id); } } else { - seen.add(id); + persisted.add(id); } } - - log.debug("calling delegate to return segment " + sid); + cacheStats.put(callId, "W: " + humanReadableByteCount(maxWeight) + + ", Keys: " + maxKeys + ", Ops: " + cacheOps); return delegate.readSegment(sid); } + public void persist(SegmentId in, Segment s) { + SegmentId id = delegate.getTracker().getSegmentId( + in.getMostSignificantBits(), in.getLeastSignificantBits()); + log.debug("persisting segment {} with size {}", id, s.size()); + try { + ByteArrayOutputStream bout = new ByteArrayOutputStream(s.size()); + s.writeTo(bout); + writeSegment(id, bout.toByteArray(), 0, s.size()); + } catch (IOException e) { + throw new IllegalStateException("Unable to write remote segment " + + id, e); + } + } + + private long callId = 0; + private Map<Long, String> cacheStats; + + public void preSync(RemoteSegmentLoader loader) { + this.loader = loader; + this.cacheStats = new HashMap<Long, String>(); + } + + public void postSync() { + loader = null; + if (log.isDebugEnabled() && !cacheStats.isEmpty()) { + log.debug("sync cache stats {}", cacheStats); + } + cacheStats = null; + } + @Override public void writeSegment(SegmentId id, byte[] bytes, int offset, int length) { delegate.writeSegment(id, bytes, offset, length); @@ -141,10 +229,6 @@ public class StandbyStore implements Seg delegate.gc(); } - public void setLoader(RemoteSegmentLoader loader) { - this.loader = loader; - } - public long size() { if (delegate instanceof FileStore) { try { Modified: jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/resources/logback-test.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/resources/logback-test.xml?rev=1678682&r1=1678681&r2=1678682&view=diff ============================================================================== --- jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/resources/logback-test.xml (original) +++ jackrabbit/oak/branches/1.0/oak-tarmk-standby/src/test/resources/logback-test.xml Mon May 11 07:25:02 2015 @@ -22,11 +22,18 @@ </encoder> </appender> + <appender name="file" class="ch.qos.logback.core.FileAppender"> + <file>target/unit-tests.log</file> + <encoder> + <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern> + </encoder> + </appender> + <logger name="org.apache.jackrabbit.oak.plugins.segment.standby" level="ERROR"/> <logger name="org.apache.jackrabbit.oak.plugins.blob.datastore" level="ERROR"/> <root level="INFO"> - <appender-ref ref="console"/> + <appender-ref ref="file"/> </root> </configuration>
