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 re...@apache.org on 2015/09/04 13:26:32 UTC
svn commit: r1701218 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/ oak-doc/
oak-doc/src/site/markdown/
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/
oak-jcr/src/main/java/org/apache/jack...
Author: reschke
Date: Fri Sep 4 11:26:32 2015
New Revision: 1701218
URL: http://svn.apache.org/r1701218
Log:
OAK-3345: SessionMBean should provide information about pending refresh (fix for OAK-1403 ported to 1.0)
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java
jackrabbit/oak/branches/1.0/oak-doc/ (props changed)
jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/RefreshStrategy.java
jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 4 11:26:32 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.2:1695500
-/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,1608560,1608731,1608783,1609
064,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,1627473,1
627479,1627503,1627586,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,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,1641346,1641350,164135
2,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,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,1656019,1656027,1656033,165
6303,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,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,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,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,1685023,1685075,16853
70,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,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700727,1700749,1700769,1700775
+/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,1608560,1608731,1608783,1609
064,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,1627473,1
627479,1627503,1627586,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,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,1641346,1641350,164135
2,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,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,1656019,1656027,1656033,165
6303,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,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,1681955,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174,1684376,1684442,1684561,1684570,1684618,1684820,1684836,1684868,1685023,16850
75,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,1692478,1692955,1693030,1693209,1693421,1693525-1693526,1694007,1694393,1695050,1695122,1695280,1695299,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700506,1700727,1700749,1700769,1700775
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/api/jmx/SessionMBean.java Fri Sep 4 11:26:32 2015
@@ -78,6 +78,16 @@ public interface SessionMBean {
String getLastRefresh();
/**
+ * @return description of the refresh strategy
+ */
+ String getRefreshStrategy();
+
+ /**
+ * @return {@code true} iff the session will be refreshed on next access.
+ */
+ boolean getRefreshPending();
+
+ /**
* @return number of refresh operations
*/
long getRefreshCount();
Propchange: jackrabbit/oak/branches/1.0/oak-doc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 4 11:26:32 2015
@@ -1,2 +1,2 @@
-/jackrabbit/oak/trunk/oak-doc: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,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1590684,1590697,1591226,1591293,1591874,1592658,1592677,1592742,1592744,1592787,1592809,1593048,1593133,1593210-1593211,1593231,1593294,1593304,1593317,1593342,1594808,1596241,1596474,1596534,1599416,1601578,1601814,1601833,1601853,1602853,1605030,1605036,1605038,1605447,1605831,1605852,1609488,1610664,1611021,1611584,1612825,1612993,1613018,1614265,1614272,1614807,1614835,1615417-1615418,1617417,1617451,1617711,1620512,1621168,1623766,1623949,1623973,1626168,1626191,1626265,1627715,1627731,1633567,1633571,1633598
,1657132,1660154
+/jackrabbit/oak/trunk/oak-doc: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,1586287,1586320,1586364,1586372,1586655,1586836,1587130,1587224,1587399,1587408,1587472,1587485,1587488,1587538,1587580,1587807,1590684,1590697,1591226,1591293,1591874,1592658,1592677,1592742,1592744,1592787,1592809,1593048,1593133,1593210-1593211,1593231,1593294,1593304,1593317,1593342,1594808,1596241,1596474,1596534,1599416,1601578,1601814,1601833,1601853,1602853,1605030,1605036,1605038,1605447,1605831,1605852,1609488,1610664,1611021,1611584,1612825,1612993,1613018,1614265,1614272,1614807,1614835,1615417-1615418,1617417,1617451,1617711,1620512,1621168,1623766,1623949,1623973,1626168,1626191,1626265,1627715,1627731,1633567,1633571,1633598
,1657132,1660154,1663927
/jackrabbit/trunk/oak-doc:1345480
Modified: jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md (original)
+++ jackrabbit/oak/branches/1.0/oak-doc/src/site/markdown/differences.md Fri Sep 4 11:26:32 2015
@@ -60,6 +60,9 @@ relying on one session seeing the other
> details regarding session backwards compatibility and
> [OAK-960](https://issues.apache.org/jira/browse/OAK-960) regarding in thread session
> synchronisation.
+>
+> The `SessionMBean` provides further information on when a session is refreshed and wheter
+> a refresh will happen on the next access.
On Oak `Item.refresh()` is deprecated and will always cause an `Session.refresh()`. The former call
will result in a warning written to the log in order to facilitate locating trouble spots.
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Fri Sep 4 11:26:32 2015
@@ -76,23 +76,9 @@ public class SessionDelegate {
private final ContentSession contentSession;
private final SecurityProvider securityProvider;
+ private final RefreshAtNextAccess refreshAtNextAccess = new RefreshAtNextAccess();
+ private final SaveCountRefresh saveCountRefresh;
private final RefreshStrategy refreshStrategy;
- private boolean refreshAtNextAccess = false;
-
- /**
- * The repository-wide {@link ThreadLocal} that keeps track of the number
- * of saves performed in each thread.
- */
- private final ThreadLocal<Long> threadSaveCount;
-
- /**
- * Local copy of the {@link #threadSaveCount} for the current thread.
- * If the repository-wide counter differs from our local copy, then
- * some other session would have done a commit or this session is
- * being accessed from some other thread. In either case it's best to
- * refresh this session to avoid unexpected behaviour.
- */
- private long sessionSaveCount;
private final Root root;
private final IdentifierManager idManager;
@@ -147,14 +133,14 @@ public class SessionDelegate {
@Nonnull Clock clock) {
this.contentSession = checkNotNull(contentSession);
this.securityProvider = checkNotNull(securityProvider);
- this.refreshStrategy = checkNotNull(refreshStrategy);
- this.threadSaveCount = checkNotNull(threadSaveCount);
- this.sessionSaveCount = getThreadSaveCount();
+ this.saveCountRefresh = new SaveCountRefresh(checkNotNull(threadSaveCount));
+ this.refreshStrategy = RefreshStrategy.Composite.create(
+ checkNotNull(refreshStrategy), refreshAtNextAccess, saveCountRefresh);
this.root = contentSession.getLatestRoot();
this.idManager = new IdentifierManager(root);
this.clock = checkNotNull(clock);
this.sessionStats = new SessionStats(contentSession.toString(),
- contentSession.getAuthInfo(), clock);
+ contentSession.getAuthInfo(), clock, refreshStrategy);
this.sessionCounters = sessionStats.getCounters();
checkNotNull(statisticManager);
readCounter = statisticManager.getCounter(SESSION_READ_COUNTER);
@@ -168,15 +154,10 @@ public class SessionDelegate {
return sessionStats;
}
- private long getThreadSaveCount() {
- Long c = threadSaveCount.get();
- return c == null ? 0 : c;
- }
-
public void refreshAtNextAccess() {
lock.lock();
try {
- refreshAtNextAccess = true;
+ refreshAtNextAccess.refreshAtNextAccess(true);
} finally {
lock.unlock();
}
@@ -222,13 +203,10 @@ public class SessionDelegate {
if (!sessionOperation.isRefresh()
&& !sessionOperation.isSave()
&& !sessionOperation.isLogout()
- && (refreshAtNextAccess
- || sessionSaveCount != getThreadSaveCount()
- || refreshStrategy.needsRefresh(
- SECONDS.convert(t0 - sessionCounters.accessTime, MILLISECONDS)))) {
+ && refreshStrategy.needsRefresh(
+ SECONDS.convert(t0 - sessionCounters.accessTime, MILLISECONDS))) {
refresh(true);
- refreshAtNextAccess = false;
- sessionSaveCount = getThreadSaveCount();
+ refreshStrategy.refreshed();
updateCount++;
}
sessionOperation.checkPreconditions();
@@ -255,12 +233,12 @@ public class SessionDelegate {
readDuration.addAndGet(dt);
}
if (sessionOperation.isSave()) {
- refreshAtNextAccess = false;
+ refreshAtNextAccess.refreshAtNextAccess(false);
// Force refreshing on access through other sessions on the same thread
- threadSaveCount.set(sessionSaveCount = (getThreadSaveCount() + 1));
+ saveCountRefresh.forceRefresh();
} else if (sessionOperation.isRefresh()) {
- refreshAtNextAccess = false;
- sessionSaveCount = getThreadSaveCount();
+ refreshAtNextAccess.refreshAtNextAccess(false);
+ saveCountRefresh.refreshed();
}
}
} finally {
@@ -766,4 +744,74 @@ public class SessionDelegate {
}
}
+
+ private static class RefreshAtNextAccess implements RefreshStrategy {
+ private boolean refreshAtNextAccess;
+
+ public void refreshAtNextAccess(boolean refreshAtNextAccess) {
+ this.refreshAtNextAccess = refreshAtNextAccess;
+ }
+
+ @Override
+ public boolean needsRefresh(long secondsSinceLastAccess) {
+ return refreshAtNextAccess;
+ }
+
+ @Override
+ public void refreshed() {
+ refreshAtNextAccess = false;
+ }
+
+ @Override
+ public String toString() {
+ return "Refresh on observation event";
+ }
+ }
+
+ private static class SaveCountRefresh implements RefreshStrategy {
+ /**
+ * The repository-wide {@link ThreadLocal} that keeps track of the number
+ * of saves performed in each thread.
+ */
+ private final ThreadLocal<Long> threadSaveCount;
+
+ /**
+ * Local copy of the {@link #threadSaveCount} for the current thread.
+ * If the repository-wide counter differs from our local copy, then
+ * some other session would have done a commit or this session is
+ * being accessed from some other thread. In either case it's best to
+ * refresh this session to avoid unexpected behaviour.
+ */
+ private long sessionSaveCount;
+
+ public SaveCountRefresh(ThreadLocal<Long> threadSaveCount) {
+ this.threadSaveCount = threadSaveCount;
+ this.sessionSaveCount = getThreadSaveCount();
+ }
+
+ public void forceRefresh() {
+ threadSaveCount.set(sessionSaveCount = (getThreadSaveCount() + 1));
+ }
+
+ @Override
+ public boolean needsRefresh(long secondsSinceLastAccess) {
+ return sessionSaveCount != getThreadSaveCount();
+ }
+
+ @Override
+ public void refreshed() {
+ sessionSaveCount = getThreadSaveCount();
+ }
+
+ private long getThreadSaveCount() {
+ Long c = threadSaveCount.get();
+ return c == null ? 0 : c;
+ }
+
+ @Override
+ public String toString() {
+ return "Refresh after a save on the same thread from a different session";
+ }
+ }
+
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java Fri Sep 4 11:26:32 2015
@@ -275,7 +275,7 @@ public class RepositoryImpl implements J
ContentSession contentSession) {
final RefreshOnGC refreshOnGC = new RefreshOnGC(gcMonitor);
- refreshStrategy = new Composite(refreshStrategy, refreshOnGC);
+ refreshStrategy = Composite.create(refreshStrategy, refreshOnGC);
return new SessionDelegate(
contentSession, securityProvider, refreshStrategy,
@@ -459,12 +459,17 @@ public class RepositoryImpl implements J
@Override
public boolean needsRefresh(long secondsSinceLastAccess) {
- if (compacted) {
- compacted = false;
- return true;
- } else {
- return false;
- }
+ return compacted;
+ }
+
+ @Override
+ public void refreshed() {
+ compacted = false;
+ }
+
+ @Override
+ public String toString() {
+ return "Refresh on revision garbage collection";
}
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/RefreshStrategy.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/RefreshStrategy.java?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/RefreshStrategy.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/RefreshStrategy.java Fri Sep 4 11:26:32 2015
@@ -18,9 +18,13 @@
*/
package org.apache.jackrabbit.oak.jcr.session;
+import static com.google.common.collect.Lists.newArrayList;
+import static java.util.Arrays.asList;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
+import java.util.ArrayList;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,20 +53,34 @@ public interface RefreshStrategy {
*/
boolean needsRefresh(long secondsSinceLastAccess);
+ void refreshed();
+
/**
* Composite of zero or more {@code RefreshStrategy} instances,
* each of which covers a certain strategy.
*/
- public static class Composite implements RefreshStrategy {
+ class Composite implements RefreshStrategy {
private final RefreshStrategy[] refreshStrategies;
+ public static RefreshStrategy create(RefreshStrategy... refreshStrategies) {
+ ArrayList<RefreshStrategy> strategies = newArrayList();
+ for (RefreshStrategy strategy : refreshStrategies) {
+ if (strategy instanceof Composite) {
+ strategies.addAll(asList(((Composite) strategy).refreshStrategies));
+ } else {
+ strategies.add(strategy);
+ }
+ }
+ return new Composite(strategies.toArray(new RefreshStrategy[strategies.size()]));
+ }
+
/**
* Create a new instance consisting of the composite of the
* passed {@code RefreshStrategy} instances.
* @param refreshStrategies individual refresh strategies
*/
- public Composite(RefreshStrategy... refreshStrategies) {
+ private Composite(RefreshStrategy... refreshStrategies) {
this.refreshStrategies = refreshStrategies;
}
@@ -77,6 +95,7 @@ public interface RefreshStrategy {
* @param secondsSinceLastAccess seconds since last access
* @return {@code true} if and only if the session needs to refresh.
*/
+ @Override
public boolean needsRefresh(long secondsSinceLastAccess) {
for (RefreshStrategy r : refreshStrategies) {
if (r.needsRefresh(secondsSinceLastAccess)) {
@@ -86,14 +105,31 @@ public interface RefreshStrategy {
return false;
}
+ @Override
+ public void refreshed() {
+ for (RefreshStrategy refreshStrategy : refreshStrategies) {
+ refreshStrategy.refreshed();
+ }
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ String sep = "";
+ for (RefreshStrategy strategy : refreshStrategies) {
+ sb.append(sep).append(strategy.toString());
+ sep = ", ";
+ }
+ return sb.toString();
+ }
}
/**
* This refresh strategy refreshes after a given timeout of inactivity.
*/
- public static class Timed implements RefreshStrategy {
+ class Timed implements RefreshStrategy {
- private final long interval;
+ protected final long interval;
/**
* @param interval Interval in seconds after which a session should refresh if there was no
@@ -108,6 +144,15 @@ public interface RefreshStrategy {
return secondsSinceLastAccess > interval;
}
+ @Override
+ public void refreshed() {
+ // empty
+ }
+
+ @Override
+ public String toString() {
+ return "Refresh every " + interval + " seconds";
+ }
}
/**
@@ -116,7 +161,7 @@ public interface RefreshStrategy {
*
* TODO replace logging with JMX monitoring. See OAK-941
*/
- public static class LogOnce extends Timed {
+ class LogOnce extends Timed {
private static final Logger log =
LoggerFactory.getLogger(RefreshStrategy.class);
@@ -147,11 +192,19 @@ public interface RefreshStrategy {
+ " minutes and might be out of date. " +
"Consider using a fresh session or explicitly refresh the session.",
initStackTrace);
- warnIfIdle = false;
}
return false;
}
+ @Override
+ public void refreshed() {
+ warnIfIdle = false;
+ }
+
+ @Override
+ public String toString() {
+ return "Never refresh but log warning after more than " + interval + " seconds of inactivity";
+ }
}
}
Modified: jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java?rev=1701218&r1=1701217&r2=1701218&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java (original)
+++ jackrabbit/oak/branches/1.0/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionStats.java Fri Sep 4 11:26:32 2015
@@ -45,13 +45,17 @@ public class SessionStats implements Ses
private final Counters counters;
private final String sessionId;
private final AuthInfo authInfo;
+ private final Clock clock;
+ private final RefreshStrategy refreshStrategy;
private Map<String, Object> attributes = Collections.emptyMap();
- public SessionStats(String sessionId, AuthInfo authInfo, Clock clock) {
+ public SessionStats(String sessionId, AuthInfo authInfo, Clock clock, RefreshStrategy refreshStrategy) {
this.counters = new Counters(clock);
this.sessionId = sessionId;
this.authInfo = authInfo;
+ this.clock = clock;
+ this.refreshStrategy = refreshStrategy;
}
public static class Counters {
@@ -193,6 +197,17 @@ public class SessionStats implements Ses
}
@Override
+ public String getRefreshStrategy() {
+ return refreshStrategy.toString();
+ }
+
+ @Override
+ public boolean getRefreshPending() {
+ return refreshStrategy.needsRefresh(
+ SECONDS.convert(clock.getTime() - counters.accessTime, MILLISECONDS));
+ }
+
+ @Override
public long getRefreshCount() {
return counters.getRefreshCount();
}