Author: chetanm
Date: Mon Jul 4 11:35:09 2016
New Revision: 1751250
URL: http://svn.apache.org/viewvc?rev=1751250&view=rev
Log:
OAK-3923 - Async indexing delayed by 30 minutes because stop order is incorrect
Merging 1727508,1727893
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 4 11:35:09 2016
@@ -1,4 +1,4 @@
/jackrabbit/oak/branches/1.2:1695500,1700753,1709440,1714095,1725270,1742959,1743356,1745019,1745589,1749700,1750645
/jackrabbit/oak/branches/1.4:1745750,1747354,1750078,1750512
-/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,1594987,1595147,1595186,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,1608463,1608560,1608731,1608
783,1609064,1609081,1609165,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,1
627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,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,1633327,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,164134
6,1641350,1641352,1641541,1641596-1641599,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,1644490,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,1646687,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,165
6019,1656027,1656033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668658,1668665,
1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,16846
18,1684820,1684836,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692393,1692478,1692955,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695492,1695540,1695571,1695905,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1698096,1698144,1700191,17
00231,1700397,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1702014,1702045,1702241,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707189,1707191,1707435,1707509,1708049,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711654,1712018,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714095,1714170,1714213,1714229,1714238,1714519-1714520,1714730,1714739
,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718802,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723241,1723251,1723254,1723333,1723347,1723350,1723713,1723731,1724026,1724057,1724210,1724401,1724423,1724628,1724631,1725515,1725555,1725899,1725935,1725960,1726232,1726570,1726579,1726585-1726586,1726795,1726797,1726809,1726812,1726993,1727026,1727254,1727358,1727476,1728037,1728041,1728070,1728114,1728281,1728443,1729200,1729979,1730216,1730527,1730581,1730801,1731627,1731647-1731648,1731797,1732131,1733929,1734230,1734254,1735405,1735484,1735588,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1740116,1742520,1743172,1744265,1744959,1745019,1745038,1745197,1745368,1746117,1746696,1748553,1748722,1748870,1749
350,1749464,1749475,1749645,1749662,1749700,1749875,1750287,1750457,1750465,1750495,1750626
+/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,1594987,1595147,1595186,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,1608463,1608560,1608731,1608
783,1609064,1609081,1609165,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,1
627473,1627479,1627503,1627586,1627590,1627715,1627731,1628180,1628198,1628262,1628447,1628608,1629629,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,1633327,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,164134
6,1641350,1641352,1641541,1641596-1641599,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,1644490,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,1646687,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,165
6019,1656027,1656033,1656303,1656394,1656400,1656425,1656427,1656432,1656453,1656628,1656678,1657128,1657132,1657163,1657188,1657265,1657511,1657766,1657804,1658470,1658977,1658983,1659285,1659483,1659527,1659550,1659578,1659765,1660100,1660154-1660155,1660383-1660384,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,1661226,1661630,1661643,1661645,1661988,1662313-1662315,1662323,1662381,1662450,1662456,1663241,1663275,1663288,1663448,1663526,1663528,1663565,1663578,1663614,1663666,1663705,1663730,1663753,1663854,1663927,1664038,1664184,1664228-1664229,1664231,1664381,1664569,1664947,1664987,1665184,1665257,1665271-1665272,1665274-1665275,1665436,1665604,1665634,1665758,1665835,1665892,1665897,1665910,1665918,1666100,1666102,1666177,1666218,1666220,1666351-1666352,1666381,1666384,1666426,1666491,1666787,1667062,1667184,1667293,1667462,1667498,1667502,1667573,1667590,1667696,1667782,1668160,1668275,1668624,1668641,1668645,1668649,1668658,1668665,
1668671,1668683,1668688,1668845,1669072,1669096,1669135,1669337,1669361,1669579,1669680,1669989,1670030,1670693,1670705,1671489,1671512,1671773,1671787,1671795,1672055,1672277,1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673431,1673436,1673644,1673662-1673663,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674150,1674780,1675054,1675319,1675332,1675382,1675555,1675566,1676198,1676407,1676458,1676670,1676703,1677579,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679147,1679165,1679191,1679232,1679503,1679961,1680170,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,16846
18,1684820,1684836,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688090,1688179,1688349,1688421,1688436,1688453,1688622,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689774,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690941,1691139,1691159,1691167,1691183,1691188,1691210,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692065,1692133,1692156,1692250,1692274,1692363,1692382,1692393,1692478,1692955,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695492,1695540,1695571,1695905,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1698096,1698144,1700191,17
00231,1700397,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1702014,1702045,1702241,1702272,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1706764,1706772,1707049,1707189,1707191,1707435,1707509,1708049,1708105,1708546,1708592,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1710789,1710800,1710811,1710816,1710972,1711248,1711282,1711654,1712018,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714095,1714170,1714213,1714229,1714238,1714519-1714520,1714730,1714739
,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718802,1718895,1719288,1719869,1720335,1720350,1720354,1721172,1721337,1722141,1722832,1723227,1723241,1723251,1723254,1723333,1723347,1723350,1723713,1723731,1724026,1724057,1724210,1724401,1724423,1724628,1724631,1725515,1725555,1725899,1725935,1725960,1726232,1726570,1726579,1726585-1726586,1726795,1726797,1726809,1726812,1726993,1727026,1727254,1727358,1727476,1727508,1727893,1728037,1728041,1728070,1728114,1728281,1728443,1729200,1729979,1730216,1730527,1730581,1730801,1731627,1731647-1731648,1731797,1732131,1733929,1734230,1734254,1735405,1735484,1735588,1737309-1737310,1737334,1737349,1738833,1738950,1738957,1740116,1742520,1743172,1744265,1744959,1745019,1745038,1745197,1745368,1746117,1746696,1748553,1748
722,1748870,1749350,1749464,1749475,1749645,1749662,1749700,1749875,1750287,1750457,1750465,1750495,1750626
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java?rev=1751250&r1=1751249&r2=1751250&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
Mon Jul 4 11:35:09 2016
@@ -138,6 +138,8 @@ public class Oak {
private Executor executor = defaultExecutorService();
+ private final Closer closer = Closer.create();
+
/**
* Default {@code ScheduledExecutorService} used for scheduling background
tasks.
* This default spawns up to 32 background thread on an as need basis. Idle
@@ -285,7 +287,7 @@ public class Oak {
/**
* Flag controlling the asynchronous indexing behavior. If false (default)
* there will be no background indexing happening.
- *
+ *
*/
private boolean asyncIndexing = false;
@@ -521,7 +523,7 @@ public class Oak {
// Register AsyncIndexStats for execution stats update
regs.add(
scheduleWithFixedDelay(whiteboard, task.getIndexStats(), 1,
false));
-
+ closer.register(task);
PropertyIndexAsyncReindex asyncPI = new PropertyIndexAsyncReindex(
new AsyncIndexUpdate(IndexConstants.ASYNC_REINDEX_VALUE,
store, indexEditors, true), executor);
@@ -571,6 +573,7 @@ public class Oak {
super.close();
repoStateCheckHook.close();
new CompositeRegistration(regs).unregister();
+ closer.close();
}
};
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1751250&r1=1751249&r2=1751250&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
Mon Jul 4 11:35:09 2016
@@ -26,11 +26,13 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
+import java.io.Closeable;
import java.util.Calendar;
import java.util.HashSet;
import java.util.Set;
-
+import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
@@ -68,12 +70,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Objects;
-import com.google.common.base.Splitter;
import com.google.common.base.Stopwatch;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
-public class AsyncIndexUpdate implements Runnable {
+public class AsyncIndexUpdate implements Runnable, Closeable {
private static final Logger log = LoggerFactory
.getLogger(AsyncIndexUpdate.class);
@@ -89,6 +89,9 @@ public class AsyncIndexUpdate implements
private static final CommitFailedException CONCURRENT_UPDATE = new
CommitFailedException(
"Async", 1, "Concurrent update detected");
+ private static final CommitFailedException INTERRUPTED = new
CommitFailedException(
+ "Async", 1, "Indexing stopped forcefully");
+
/**
* Timeout in milliseconds after which an async job would be considered as
* timed out. Another node in cluster would wait for timeout before
@@ -136,6 +139,16 @@ public class AsyncIndexUpdate implements
private final MissingIndexProviderStrategy missingStrategy = new
DefaultMissingIndexProviderStrategy();
+ private final Semaphore runPermit = new Semaphore(1);
+
+ /**
+ * Flag which would be set to true if the close operation is not
+ * able to close within specific time. The flag would be an
+ * indication to indexing thread to return straightway say by
+ * throwing an exception
+ */
+ private final AtomicBoolean forcedStopFlag = new AtomicBoolean();
+
private long leaseTimeOut;
/**
* Controls the length of the interval (in minutes) at which an indexing
@@ -145,6 +158,14 @@ public class AsyncIndexUpdate implements
private static long ERROR_WARN_INTERVAL = TimeUnit.MINUTES.toMillis(Integer
.getInteger("oak.async.warn.interval", 30));
+ /**
+ * Timeout in seconds for which close call would wait before forcefully
+ * stopping the indexing thread
+ */
+ private int softTimeOutSecs =
Integer.getInteger("oak.async.softTimeOutSecs", 2 * 60);
+
+ private boolean closed;
+
public AsyncIndexUpdate(@Nonnull String name, @Nonnull NodeStore store,
@Nonnull IndexEditorProvider provider, boolean switchOnSync) {
this.name = checkNotNull(name);
@@ -188,14 +209,17 @@ public class AsyncIndexUpdate implements
private final AsyncIndexStats indexStats;
+ private final AtomicBoolean forcedStop;
+
/** Expiration time of the last lease we committed */
private long lease;
public AsyncUpdateCallback(NodeStore store, String name,
long leaseTimeOut, String checkpoint, String afterCheckpoint,
- AsyncIndexStats indexStats) {
+ AsyncIndexStats indexStats, AtomicBoolean forcedStop) {
this.store = store;
this.name = name;
+ this.forcedStop = forcedStop;
this.leaseTimeOut = leaseTimeOut;
this.checkpoint = checkpoint;
this.afterCheckpoint = afterCheckpoint;
@@ -270,6 +294,10 @@ public class AsyncIndexUpdate implements
@Override
public void indexUpdate() throws CommitFailedException {
+ if (forcedStop.get()){
+ throw INTERRUPTED;
+ }
+
if (indexStats.incUpdates() % 100 == 0) {
long now = System.currentTimeMillis();
if (now + leaseTimeOut > lease) {
@@ -286,6 +314,55 @@ public class AsyncIndexUpdate implements
@Override
public synchronized void run() {
+ boolean permitAcquired = false;
+ try{
+ if (runPermit.tryAcquire()){
+ permitAcquired = true;
+ runWhenPermitted();
+ } else {
+ log.warn("[{}] Could not acquire run permit. Stop flag set to
[{}] Skipping the run", name, forcedStopFlag);
+ }
+ } finally {
+ if (permitAcquired){
+ runPermit.release();
+ }
+ }
+ }
+
+
+ @Override
+ public void close() {
+ if (closed) {
+ return;
+ }
+ int hardTimeOut = 5 * softTimeOutSecs;
+ if(!runPermit.tryAcquire()){
+ //First let current run complete without bothering it
+ log.debug("[{}] [WAITING] Indexing in progress. Would wait for {}
secs for it to finish", name, softTimeOutSecs);
+ try {
+ if(!runPermit.tryAcquire(softTimeOutSecs, TimeUnit.SECONDS)){
+ //We have now waited enough. So signal the indexer that it
should return right away
+ //as soon as it sees the forcedStopFlag
+ log.debug("[{}] [SOFT LIMIT HIT] Indexing found to be in
progress for more than [{}]s. Would " +
+ "signal it to now force stop", name,
softTimeOutSecs);
+ forcedStopFlag.set(true);
+ if(!runPermit.tryAcquire(hardTimeOut, TimeUnit.SECONDS)){
+ //Index thread did not listened to our advice. So give
up now and warn about it
+ log.warn("[{}] Indexing still not found to be
complete. Giving up after [{}]s", name, hardTimeOut);
+ }
+ } else {
+ log.info("[{}] [CLOSED OK] Async indexing run completed.
Closing it now", name);
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ } else {
+ log.info("[{}] Closed", name);
+ }
+ closed = true;
+ }
+
+ private void runWhenPermitted() {
if (indexStats.isPaused()) {
return;
}
@@ -382,10 +459,11 @@ public class AsyncIndexUpdate implements
}
protected AsyncUpdateCallback newAsyncUpdateCallback(NodeStore store,
- String name, long leaseTimeOut, String beforeCheckpoint,
- String afterCheckpoint, AsyncIndexStats indexStats) {
+ String name, long
leaseTimeOut, String beforeCheckpoint,
+ String
afterCheckpoint, AsyncIndexStats indexStats,
+ AtomicBoolean
stopFlag) {
return new AsyncUpdateCallback(store, name, leaseTimeOut,
- beforeCheckpoint, afterCheckpoint, indexStats);
+ beforeCheckpoint, afterCheckpoint, indexStats, stopFlag);
}
private boolean updateIndex(NodeState before, String beforeCheckpoint,
@@ -397,7 +475,7 @@ public class AsyncIndexUpdate implements
// create an update callback for tracking index updates
// and maintaining the update lease
AsyncUpdateCallback callback = newAsyncUpdateCallback(store, name,
- leaseTimeOut, beforeCheckpoint, afterCheckpoint, indexStats);
+ leaseTimeOut, beforeCheckpoint, afterCheckpoint, indexStats,
forcedStopFlag);
callback.prepare();
try {
NodeBuilder builder = store.getRoot().builder();
@@ -516,6 +594,19 @@ public class AsyncIndexUpdate implements
return this;
}
+ protected AsyncIndexUpdate setCloseTimeOut(int timeOutInSec) {
+ this.softTimeOutSecs = timeOutInSec;
+ return this;
+ }
+
+ public boolean isClosed(){
+ return closed || forcedStopFlag.get();
+ }
+
+ boolean isClosing(){
+ return runPermit.hasQueuedThreads();
+ }
+
private static void preAsyncRunStatsStats(AsyncIndexStats stats) {
stats.start(now());
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java?rev=1751250&r1=1751249&r2=1751250&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/OakTest.java
Mon Jul 4 11:35:09 2016
@@ -16,14 +16,26 @@
*/
package org.apache.jackrabbit.oak;
+import java.io.Closeable;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+
import javax.jcr.NoSuchWorkspaceException;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdate;
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
+import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
+import org.apache.jackrabbit.oak.spi.whiteboard.Registration;
+import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
+import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -65,4 +77,30 @@ public class OakTest {
}
+
+
+ @Test
+ public void closeAsyncIndexers() throws Exception{
+ final AtomicReference<AsyncIndexUpdate> async = new
AtomicReference<AsyncIndexUpdate>();
+ Whiteboard wb = new DefaultWhiteboard(){
+ @Override
+ public <T> Registration register(Class<T> type, T service, Map<?,
?> properties) {
+ if (service instanceof AsyncIndexUpdate){
+ async.set((AsyncIndexUpdate) service);
+ }
+ return super.register(type, service, properties);
+ }
+ };
+ Oak oak = new Oak()
+ .with(new OpenSecurityProvider())
+ .with(wb)
+ .withAsyncIndexing();
+ ContentRepository repo = oak.createContentRepository();
+
+ ((Closeable)repo).close();
+ assertNotNull(async.get());
+ assertTrue(async.get().isClosed());
+ assertNull(WhiteboardUtils.getService(wb, AsyncIndexUpdate.class));
+ }
+
}
\ No newline at end of file
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java?rev=1751250&r1=1751249&r2=1751250&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateLeaseTest.java
Mon Jul 4 11:35:09 2016
@@ -403,9 +403,10 @@ public class AsyncIndexUpdateLeaseTest e
@Override
protected AsyncUpdateCallback newAsyncUpdateCallback(NodeStore store,
String name, long leaseTimeOut, String checkpoint,
- String afterCheckpoint, AsyncIndexStats indexStats) {
+ String afterCheckpoint, AsyncIndexStats indexStats,
+ AtomicBoolean stopFlag) {
return new SpecialAsyncUpdateCallback(store, name, leaseTimeOut,
- checkpoint, afterCheckpoint, indexStats, listener);
+ checkpoint, afterCheckpoint, indexStats, stopFlag,
listener);
}
}
@@ -415,9 +416,8 @@ public class AsyncIndexUpdateLeaseTest e
public SpecialAsyncUpdateCallback(NodeStore store, String name,
long leaseTimeOut, String checkpoint, String afterCheckpoint,
- AsyncIndexStats indexStats, IndexStatusListener listener) {
- super(store, name, leaseTimeOut, checkpoint, afterCheckpoint,
- indexStats);
+ AsyncIndexStats indexStats, AtomicBoolean stopFlag,
IndexStatusListener listener) {
+ super(store, name, leaseTimeOut, checkpoint, afterCheckpoint,
indexStats, stopFlag);
this.listener = listener;
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java?rev=1751250&r1=1751249&r2=1751250&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdateTest.java
Mon Jul 4 11:35:09 2016
@@ -23,15 +23,19 @@ import static org.apache.jackrabbit.oak.
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
import static
org.apache.jackrabbit.oak.plugins.index.IndexUtils.createIndexDefinition;
import static
org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexEditorProvider.TYPE;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Semaphore;
@@ -903,5 +907,180 @@ public class AsyncIndexUpdateTest {
customLogs.finished();
}
+ @Test
+ public void noRunWhenClosed() throws Exception{
+ NodeStore store = new MemoryNodeStore();
+ IndexEditorProvider provider = new PropertyIndexEditorProvider();
+
+ AsyncIndexUpdate async = new AsyncIndexUpdate("async", store,
provider);
+ async.run();
+
+ async.close();
+ LogCustomizer lc = createLogCustomizer(Level.WARN);
+ async.run();
+ assertEquals(1, lc.getLogs().size());
+ assertThat(lc.getLogs().get(0), containsString("Could not acquire run
permit"));
+
+ lc.finished();
+
+ async.close();
+ }
+
+ @Test
+ public void closeWithSoftLimit() throws Exception{
+ NodeStore store = new MemoryNodeStore();
+ IndexEditorProvider provider = new PropertyIndexEditorProvider();
+ NodeBuilder builder = store.getRoot().builder();
+ createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", true, false, ImmutableSet.of("foo"), null)
+ .setProperty(ASYNC_PROPERTY_NAME, "async");
+ builder.child("testRoot").setProperty("foo", "abc");
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ final Semaphore asyncLock = new Semaphore(1);
+ final AsyncIndexUpdate async = new AsyncIndexUpdate("async", store,
provider) {
+ @Override
+ protected AsyncUpdateCallback newAsyncUpdateCallback(NodeStore
store, String name, long leaseTimeOut,
+ String
beforeCheckpoint, String afterCheckpoint,
+
AsyncIndexStats indexStats, AtomicBoolean stopFlag) {
+ try {
+ asyncLock.acquire();
+ } catch (InterruptedException ignore) {
+ }
+ return super.newAsyncUpdateCallback(store, name, leaseTimeOut,
beforeCheckpoint, afterCheckpoint,
+ indexStats, stopFlag);
+ }
+ };
+
+ async.setCloseTimeOut(1000);
+
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ async.run();
+ }
+ });
+
+ Thread closer = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ async.close();
+ }
+ });
+
+ asyncLock.acquire();
+ t.start();
+
+ //Wait till async gets to wait state i.e. inside run
+ while(!asyncLock.hasQueuedThreads());
+
+ LogCustomizer lc = createLogCustomizer(Level.DEBUG);
+ closer.start();
+
+ //Wait till closer is in waiting state
+ while(!async.isClosing());
+
+ //For softLimit case the flag should not be set
+ assertFalse(async.isClosed());
+ assertLogPhrase(lc.getLogs(), "[WAITING]");
+
+ //Let indexing run complete now
+ asyncLock.release();
+
+ //Wait for both threads
+ t.join();
+ closer.join();
+
+ //Close call should complete
+ assertLogPhrase(lc.getLogs(), "[CLOSED OK]");
+ }
+
+ @Test
+ public void closeWithHardLimit() throws Exception{
+ NodeStore store = new MemoryNodeStore();
+ IndexEditorProvider provider = new PropertyIndexEditorProvider();
+ NodeBuilder builder = store.getRoot().builder();
+ createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME),
+ "rootIndex", true, false, ImmutableSet.of("foo"), null)
+ .setProperty(ASYNC_PROPERTY_NAME, "async");
+ builder.child("testRoot").setProperty("foo", "abc");
+
+ store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ final Semaphore asyncLock = new Semaphore(1);
+ final AsyncIndexUpdate async = new AsyncIndexUpdate("async", store,
provider) {
+ @Override
+ protected AsyncUpdateCallback newAsyncUpdateCallback(NodeStore
store, String name, long leaseTimeOut,
+ String
beforeCheckpoint, String afterCheckpoint,
+
AsyncIndexStats indexStats, AtomicBoolean stopFlag) {
+ try {
+ asyncLock.acquire();
+ } catch (InterruptedException ignore) {
+ }
+ return super.newAsyncUpdateCallback(store, name, leaseTimeOut,
beforeCheckpoint, afterCheckpoint,
+ indexStats, stopFlag);
+ }
+ };
+
+ //Set a 1 sec close timeout
+ async.setCloseTimeOut(1);
+
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ async.run();
+ }
+ });
+
+ Thread closer = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ async.close();
+ }
+ });
+
+ //Lock to ensure that AsyncIndexUpdate waits
+ asyncLock.acquire();
+
+ t.start();
+
+ //Wait till async gets to wait state i.e. inside run
+ while(!asyncLock.hasQueuedThreads());
+
+ LogCustomizer lc = createLogCustomizer(Level.DEBUG);
+ closer.start();
+
+ //Wait till stopFlag is set
+ while(!async.isClosed());
+
+ assertLogPhrase(lc.getLogs(), "[SOFT LIMIT HIT]");
+
+ //Let indexing run complete now
+ asyncLock.release();
+
+ //Wait for both threads
+ t.join();
+
+ //Async run would have failed with exception
+ assertNotNull(async.getIndexStats().getLatestError());
+
+ //Wait for close call to complete
+ closer.join();
+ }
+
+
+ private void assertLogPhrase(List<String> logs, String logPhrase){
+ assertThat(logs.toString(), containsString(logPhrase));
+ }
+
+ private static LogCustomizer createLogCustomizer(Level level){
+ LogCustomizer lc =
LogCustomizer.forLogger(AsyncIndexUpdate.class.getName())
+ .filter(level)
+ .enable(level)
+ .create();
+ lc.starting();
+ return lc;
+ }
}
