Author: mduerig
Date: Tue Mar 3 16:23:29 2015
New Revision: 1663732
URL: http://svn.apache.org/r1663732
Log:
OAK-2552: Implement MBean monitoring garbage collection
Merged revision 1663448
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/GCMonitorTracker.java
- copied unchanged from r1663448,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/GCMonitorTracker.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/GCMonitor.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/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 3 16:23:29 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,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,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,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,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,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,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,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,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,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,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,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663241,1663275,1663288,1663666
+/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,1597569,1597795,1597854,1597860,1598292,1598302,1598352,1598369,1598595,1598631,1598696,1598732,1598797-1598798,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,1609165,1609214,1609
488,1610489,1610592,1610603,1610634,1610658,1610664,1611021,1611041,1611270,1611275,1611277,1611313,1611332,1611584,1612560,1612825,1612993,1613018,1613041,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,1627586,1627590,1627715,1627731,1628180,1628198,1
628262,1628447,1628608,1629688,1629840,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,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,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,1640555-1640556,1640694-1640695,1640715,1640722-1640723,1640728,1640863-1640872,1641340,1641350,1641352,1641541,1641596-1641599,1641601,1641662,1641671,1641695,1641771,1641802,1641811,1641950,1642031,1642056,164211
9,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,1646684,1649743,1649803,1650015,1650239,1650529,1650797,1651323,1651382,1651643,1651652,1651730,1651988-1651989,1651996,1652024,1652035,1652058-1652059,1652075,1652127,1652158,1652467,1652965,1652971,1653207,1653446,1653463,1653484,1653572,1653579,1653591,1653804,1653809,1653848-1653850,1653882,1654116,1654743,1654756,1654778,1655049,1655054-1655055,1655086,1655237,1655248,1655996,1656027,1656394,1656400,1656425,1656427,1656453,1656628,1657804,1658470,1659483,1659527,1659550,1659578,1659765,1660154-1660155,1660383,1660409,1660426,1660676,1660870,1660872,1660897,1660903,1661069,1661122,1661146,1661158,166
1226,1661630,1661643,1661645,1662313-1662315,1662323,1662450,1663241,1663275,1663288,1663448,1663666
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java?rev=1663732&r1=1663731&r2=1663732&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentNodeStoreService.java
Tue Mar 3 16:23:29 2015
@@ -126,6 +126,8 @@ public class SegmentNodeStoreService ext
private ObserverTracker observerTracker;
+ private GCMonitorTracker gcMonitor;
+
private ComponentContext context;
@Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY,
@@ -233,11 +235,13 @@ public class SegmentNodeStoreService ext
};
OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
+ gcMonitor = new GCMonitorTracker();
+ gcMonitor.start(whiteboard);
Builder storeBuilder = FileStore.newFileStore(new File(directory))
.withCacheSize(Integer.parseInt(cache))
.withMaxFileSize(Integer.parseInt(size))
.withMemoryMapping("64".equals(mode))
- .withWhiteBoard(whiteboard);
+ .withGCMonitor(gcMonitor);
if (customBlobStore) {
log.info("Initializing SegmentNodeStore with BlobStore [{}]",
blobStore);
store = storeBuilder.withBlobStore(blobStore).create()
@@ -304,6 +308,7 @@ public class SegmentNodeStoreService ext
unregisterNodeStore();
observerTracker.stop();
+ gcMonitor.stop();
delegate = null;
store.close();
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1663732&r1=1663731&r2=1663732&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Tue Mar 3 16:23:29 2015
@@ -51,7 +51,6 @@ import java.util.regex.Pattern;
import javax.annotation.Nonnull;
import com.google.common.base.Stopwatch;
-import com.google.common.collect.Maps;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.plugins.blob.BlobStoreBlob;
import org.apache.jackrabbit.oak.plugins.segment.CompactionMap;
@@ -71,8 +70,6 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.gc.GCMonitor;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
-import org.apache.jackrabbit.oak.spi.whiteboard.AbstractServiceTracker;
-import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,7 +153,11 @@ public class FileStore implements Segmen
* Version of the segment storage format.
*/
private final SegmentVersion version = SegmentVersion.V_11;
- private final GCMonitorTracker gcMonitor = new GCMonitorTracker();
+
+ /**
+ * {@code GCMonitor} monitoring this instance's gc progress
+ */
+ private final GCMonitor gcMonitor;
/**
* Create a new instance of a {@link Builder} for a file store.
@@ -178,7 +179,7 @@ public class FileStore implements Segmen
private int maxFileSize = 256;
private int cacheSize; // 0 -> DEFAULT_MEMORY_CACHE_SIZE
private boolean memoryMapping;
- private Whiteboard whiteboard;
+ private final LoggingGCMonitor gcMonitor = new LoggingGCMonitor();
private Builder(File directory) {
this.directory = directory;
@@ -250,13 +251,13 @@ public class FileStore implements Segmen
}
/**
- * {@link Whiteboard} used to track {@link GCMonitor} instances.
- * @param whiteboard
+ * {@link GCMonitor} for monitoring this files store's gc process.
+ * @param gcMonitor
* @return this instance
*/
@Nonnull
- public Builder withWhiteBoard(@Nonnull Whiteboard whiteboard) {
- this.whiteboard = checkNotNull(whiteboard);
+ public Builder withGCMonitor(@Nonnull GCMonitor gcMonitor) {
+ this.gcMonitor.delegatee = checkNotNull(gcMonitor);
return this;
}
@@ -279,14 +280,14 @@ public class FileStore implements Segmen
@Nonnull
public FileStore create() throws IOException {
return new FileStore(
- blobStore, directory, root, maxFileSize, cacheSize,
memoryMapping, whiteboard);
+ blobStore, directory, root, maxFileSize, cacheSize,
memoryMapping, gcMonitor);
}
}
@Deprecated
public FileStore(BlobStore blobStore, File directory, int maxFileSizeMB,
boolean memoryMapping)
throws IOException {
- this(blobStore, directory, EMPTY_NODE, maxFileSizeMB, 0,
memoryMapping, null);
+ this(blobStore, directory, EMPTY_NODE, maxFileSizeMB, 0,
memoryMapping, GCMonitor.EMPTY);
}
@Deprecated
@@ -304,24 +305,24 @@ public class FileStore implements Segmen
@Deprecated
public FileStore(File directory, int maxFileSizeMB, int cacheSizeMB,
boolean memoryMapping) throws IOException {
- this(null, directory, EMPTY_NODE, maxFileSizeMB, cacheSizeMB,
memoryMapping, null);
+ this(null, directory, EMPTY_NODE, maxFileSizeMB, cacheSizeMB,
memoryMapping, GCMonitor.EMPTY);
}
@Deprecated
FileStore(File directory, NodeState initial, int maxFileSize) throws
IOException {
- this(null, directory, initial, maxFileSize, -1,
MEMORY_MAPPING_DEFAULT, null);
+ this(null, directory, initial, maxFileSize, -1,
MEMORY_MAPPING_DEFAULT, GCMonitor.EMPTY);
}
@Deprecated
public FileStore(
BlobStore blobStore, final File directory, NodeState initial, int
maxFileSizeMB,
int cacheSizeMB, boolean memoryMapping) throws IOException {
- this(blobStore, directory, initial, maxFileSizeMB, cacheSizeMB,
memoryMapping, null);
+ this(blobStore, directory, initial, maxFileSizeMB, cacheSizeMB,
memoryMapping, GCMonitor.EMPTY);
}
private FileStore(
BlobStore blobStore, final File directory, NodeState initial, int
maxFileSizeMB,
- int cacheSizeMB, boolean memoryMapping, Whiteboard whiteboard)
+ int cacheSizeMB, boolean memoryMapping, GCMonitor gcMonitor)
throws IOException {
checkNotNull(directory).mkdirs();
if (cacheSizeMB < 0) {
@@ -335,6 +336,7 @@ public class FileStore implements Segmen
this.directory = directory;
this.maxFileSize = maxFileSizeMB * MB;
this.memoryMapping = memoryMapping;
+ this.gcMonitor = gcMonitor;
journalFile = new RandomAccessFile(
new File(directory, JOURNAL_FILE_NAME), "rw");
@@ -414,9 +416,6 @@ public class FileStore implements Segmen
}
});
- if (whiteboard != null) {
- gcMonitor.start(whiteboard);
- }
log.info("TarMK opened: {} (mmap={})", directory, memoryMapping);
}
@@ -738,7 +737,6 @@ public class FileStore implements Segmen
// threads before acquiring the synchronization lock
compactionThread.close();
flushThread.close();
- gcMonitor.stop();
synchronized (this) {
try {
@@ -938,48 +936,40 @@ public class FileStore implements Segmen
return version;
}
- private static class GCMonitorTracker extends
AbstractServiceTracker<GCMonitor> {
- public GCMonitorTracker() {
- super(GCMonitor.class);
- }
+ private static class LoggingGCMonitor implements GCMonitor {
+ public GCMonitor delegatee = GCMonitor.EMPTY;
- void info(String message, Object... arguments) {
+ @Override
+ public void info(String message, Object... arguments) {
log.info(message, arguments);
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.info(message, arguments);
- }
+ delegatee.info(message, arguments);
}
- void warn(String message, Object... arguments) {
+ @Override
+ public void warn(String message, Object... arguments) {
log.warn(message, arguments);
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.warn(message, arguments);
- }
+ delegatee.warn(message, arguments);
}
- void error(String message, Exception e) {
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.error(message, e);
- }
+ @Override
+ public void error(String message, Exception exception) {
+ delegatee.error(message, exception);
}
- void skipped(String message, Object... arguments) {
- log.info(message, arguments);
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.skipped(message, arguments);
- }
+ @Override
+ public void skipped(String reason, Object... arguments) {
+ log.info(reason, arguments);
+ delegatee.skipped(reason, arguments);
}
- void compacted() {
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.compacted();
- }
+ @Override
+ public void compacted() {
+ delegatee.compacted();
}
- void cleaned(long reclaimedSize, long currentSize) {
- for (GCMonitor gcMonitor : getServices()) {
- gcMonitor.cleaned(reclaimedSize, currentSize);
- }
+ @Override
+ public void cleaned(long reclaimedSize, long currentSize) {
+ delegatee.cleaned(reclaimedSize, currentSize);
}
}
}
Modified:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/GCMonitor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/GCMonitor.java?rev=1663732&r1=1663731&r2=1663732&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/GCMonitor.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/GCMonitor.java
Tue Mar 3 16:23:29 2015
@@ -28,6 +28,8 @@ import org.apache.jackrabbit.oak.spi.whi
*/
public interface GCMonitor {
+ GCMonitor EMPTY = new Empty();
+
/**
* Log a message at the INFO level according to the specified format
* and arguments.
@@ -48,7 +50,7 @@ public interface GCMonitor {
* @param message The message with {} place holders for the {@code
arguments}
* @param arguments
*/
- void info(String message, Object[] arguments);
+ void info(String message, Object... arguments);
/**
* Warning about a condition that might have advert effects on the overall
@@ -56,7 +58,7 @@ public interface GCMonitor {
* @param message The message with {} place holders for the {@code
arguments}
* @param arguments
*/
- void warn(String message, Object[] arguments);
+ void warn(String message, Object... arguments);
/**
* An error caused the garbage collection process to terminate prematurely.
@@ -70,7 +72,7 @@ public interface GCMonitor {
* @param reason The reason with {} place holders for the {@code
arguments}
* @param arguments
*/
- void skipped(String reason, Object[] arguments);
+ void skipped(String reason, Object... arguments);
/**
* The compaction phase of the garbage collection process terminated
successfully.
@@ -91,5 +93,5 @@ public interface GCMonitor {
@Override public void skipped(String reason, Object[] arguments) { }
@Override public void compacted() { }
@Override public void cleaned(long reclaimedSize, long currentSize) { }
- }
+ };
}
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=1663732&r1=1663731&r2=1663732&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
Tue Mar 3 16:23:29 2015
@@ -440,13 +440,13 @@ public class RepositoryImpl implements J
private final GCMonitor gcMonitor = new GCMonitor.Empty() {
@Override
public void compacted() {
- compactionCount++;
+ compacted = true;
}
};
private final Registration reg = whiteboard.register(GCMonitor.class,
gcMonitor, emptyMap());
- private volatile int compactionCount;
+ private volatile boolean compacted;
private int refreshCount;
public void close() {
@@ -455,8 +455,8 @@ public class RepositoryImpl implements J
@Override
public boolean needsRefresh(long secondsSinceLastAccess) {
- if (compactionCount > refreshCount) {
- refreshCount = compactionCount;
+ if (compacted) {
+ compacted = false;
return true;
} else {
return false;
Modified:
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java?rev=1663732&r1=1663731&r2=1663732&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
(original)
+++
jackrabbit/oak/branches/1.0/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RefreshOnGCTest.java
Tue Mar 3 16:23:29 2015
@@ -39,6 +39,7 @@ import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.plugins.segment.GCMonitorTracker;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
@@ -52,6 +53,7 @@ import org.junit.Test;
public class RefreshOnGCTest {
private FileStore fileStore;
private Repository repository;
+ private GCMonitorTracker gcMonitor;
@Before
public void setup() throws IOException {
@@ -60,8 +62,10 @@ public class RefreshOnGCTest {
directory.mkdir();
Whiteboard whiteboard = new DefaultWhiteboard();
+ gcMonitor = new GCMonitorTracker();
+ gcMonitor.start(whiteboard);
fileStore = newFileStore(directory)
- .withWhiteBoard(whiteboard)
+ .withGCMonitor(gcMonitor)
.create()
.setCompactionStrategy(new CompactionStrategy(
false, false, CLEAN_NONE, 0,
CompactionStrategy.MEMORY_THRESHOLD_DEFAULT) {
@@ -83,6 +87,7 @@ public class RefreshOnGCTest {
if (repository instanceof JackrabbitRepository) {
((JackrabbitRepository) repository).shutdown();
}
+ gcMonitor.stop();
}
@Test
