Author: mduerig
Date: Mon Mar 2 11:51:13 2015
New Revision: 1663273
URL: http://svn.apache.org/r1663273
Log:
OAK-2552: Implement MBean monitoring garbage collection
merged revision 1662315
Added:
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/
- copied from r1662315,
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/gc/
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
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 2 11:51:13 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-1662314,1662450
+/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,1662450
/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=1663273&r1=1663272&r2=1663273&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
Mon Mar 2 11:51:13 2015
@@ -49,11 +49,12 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.blob.BlobGCMBean;
import org.apache.jackrabbit.oak.plugins.blob.BlobGarbageCollector;
import org.apache.jackrabbit.oak.plugins.blob.MarkSweepGarbageCollector;
-import
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategyMBean;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType;
+import
org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategyMBean;
import
org.apache.jackrabbit.oak.plugins.segment.compaction.DefaultCompactionStrategyMBean;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.Builder;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.commit.Observable;
@@ -226,14 +227,17 @@ public class SegmentNodeStoreService ext
}
};
- boolean memoryMapping = "64".equals(mode);
- int cacheSize = Integer.parseInt(size);
+ OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
+ Builder storeBuilder = FileStore.newFileStore(new File(directory))
+ .withCacheSize(Integer.parseInt(size))
+ .withMemoryMapping("64".equals(mode))
+ .withWhiteBoard(whiteboard);
if (customBlobStore) {
log.info("Initializing SegmentNodeStore with BlobStore [{}]",
blobStore);
- store = new FileStore(blobStore, new File(directory), cacheSize,
- memoryMapping).setCompactionStrategy(compactionStrategy);
+ store = storeBuilder.withBlobStore(blobStore).create()
+ .setCompactionStrategy(compactionStrategy);
} else {
- store = new FileStore(new File(directory), cacheSize,
memoryMapping)
+ store = storeBuilder.create()
.setCompactionStrategy(compactionStrategy);
}
@@ -241,7 +245,6 @@ public class SegmentNodeStoreService ext
observerTracker = new ObserverTracker(delegate);
observerTracker.start(context.getBundleContext());
- OsgiWhiteboard whiteboard = new
OsgiWhiteboard(context.getBundleContext());
executor = new WhiteboardExecutor();
executor.start(whiteboard);
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=1663273&r1=1663272&r2=1663273&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
Mon Mar 2 11:51:13 2015
@@ -68,8 +68,11 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentWriter;
import org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+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;
@@ -153,6 +156,7 @@ public class FileStore implements Segmen
* Version of the segment storage format.
*/
private final SegmentVersion version = SegmentVersion.V_11;
+ private final GCMonitorTracker gcMonitor = new GCMonitorTracker();
/**
* Create a new instance of a {@link Builder} for a file store.
@@ -174,6 +178,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 Builder(File directory) {
this.directory = directory;
@@ -245,6 +250,17 @@ public class FileStore implements Segmen
}
/**
+ * {@link Whiteboard} used to track {@link GCMonitor} instances.
+ * @param whiteboard
+ * @return this instance
+ */
+ @Nonnull
+ public Builder withWhiteBoard(@Nonnull Whiteboard whiteboard) {
+ this.whiteboard = checkNotNull(whiteboard);
+ return this;
+ }
+
+ /**
* Create a new {@link FileStore} instance with the settings specified
in this
* builder. If none of the {@code with} methods have been called
before calling
* this method, a file store with the following default settings is
returned:
@@ -254,6 +270,7 @@ public class FileStore implements Segmen
* <li>max file size: 256MB</li>
* <li>cache size: 256MB</li>
* <li>memory mapping: on for 64 bit JVMs off otherwise</li>
+ * <li>whiteboard: none. No {@link GCMonitor} tracking</li>
* </ul>
*
* @return a new file store instance
@@ -262,14 +279,14 @@ public class FileStore implements Segmen
@Nonnull
public FileStore create() throws IOException {
return new FileStore(
- blobStore, directory, root, maxFileSize, cacheSize,
memoryMapping);
+ blobStore, directory, root, maxFileSize, cacheSize,
memoryMapping, whiteboard);
}
}
@Deprecated
public FileStore(BlobStore blobStore, File directory, int maxFileSizeMB,
boolean memoryMapping)
throws IOException {
- this(blobStore, directory, EMPTY_NODE, maxFileSizeMB, 0,
memoryMapping);
+ this(blobStore, directory, EMPTY_NODE, maxFileSizeMB, 0,
memoryMapping, null);
}
@Deprecated
@@ -287,18 +304,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);
+ this(null, directory, EMPTY_NODE, maxFileSizeMB, cacheSizeMB,
memoryMapping, null);
}
@Deprecated
FileStore(File directory, NodeState initial, int maxFileSize) throws
IOException {
- this(null, directory, initial, maxFileSize, -1,
MEMORY_MAPPING_DEFAULT);
+ this(null, directory, initial, maxFileSize, -1,
MEMORY_MAPPING_DEFAULT, null);
}
@Deprecated
public FileStore(
BlobStore blobStore, final File directory, NodeState initial, int
maxFileSizeMB,
- int cacheSizeMB, boolean memoryMapping)
+ int cacheSizeMB, boolean memoryMapping) throws IOException {
+ this(blobStore, directory, initial, maxFileSizeMB, cacheSizeMB,
memoryMapping, null);
+ }
+
+ private FileStore(
+ BlobStore blobStore, final File directory, NodeState initial, int
maxFileSizeMB,
+ int cacheSizeMB, boolean memoryMapping, Whiteboard whiteboard)
throws IOException {
checkNotNull(directory).mkdirs();
if (cacheSizeMB < 0) {
@@ -391,6 +414,9 @@ public class FileStore implements Segmen
}
});
+ if (whiteboard != null) {
+ gcMonitor.start(whiteboard);
+ }
log.info("TarMK opened: {} (mmap={})", directory, memoryMapping);
}
@@ -405,7 +431,7 @@ public class FileStore implements Segmen
}
long needed = delta * compactionStrategy.getMemoryThreshold();
if (needed >= avail) {
- log.info(
+ gcMonitor.skipped(
"Not enough available memory {}, needed {}, last merge
delta {}, so skipping compaction for now",
humanReadableByteCount(avail),
humanReadableByteCount(needed),
@@ -423,7 +449,7 @@ public class FileStore implements Segmen
CompactionGainEstimate estimate = estimateCompactionGain();
long gain = estimate.estimateCompactionGain();
if (gain >= 10) {
- log.info(
+ gcMonitor.info(
"Estimated compaction in {}, gain is {}% ({}/{}) or
({}/{}), so running compaction",
watch, gain, estimate.getReachableSize(),
estimate.getTotalSize(),
@@ -433,10 +459,10 @@ public class FileStore implements Segmen
compact();
compacted = true;
} else {
- log.info("TarMK compaction paused");
+ gcMonitor.skipped("TarMK compaction paused");
}
} else {
- log.info(
+ gcMonitor.skipped(
"Estimated compaction in {}, gain is {}% ({}/{}) or
({}/{}), so skipping compaction for now",
watch, gain, estimate.getReachableSize(),
estimate.getTotalSize(),
@@ -597,7 +623,7 @@ public class FileStore implements Segmen
public synchronized void cleanup() throws IOException {
Stopwatch watch = Stopwatch.createStarted();
long initialSize = size();
- log.info("TarMK revision cleanup started. Current repository size {}",
+ gcMonitor.info("TarMK revision cleanup started. Current repository
size {}",
humanReadableByteCount(initialSize));
// Suggest to the JVM that now would be a good time
@@ -623,13 +649,14 @@ public class FileStore implements Segmen
list.add(cleaned);
}
File file = reader.close();
- log.info("TarMK revision cleanup reclaiming {}",
file.getName());
+ gcMonitor.info("TarMK revision cleanup reclaiming {}",
file.getName());
toBeRemoved.addLast(file);
}
}
readers = list;
long finalSize = size();
- log.info("TarMK revision cleanup completed in {}. Post cleanup size is
{} " +
+ gcMonitor.cleaned(initialSize - finalSize, finalSize);
+ gcMonitor.info("TarMK revision cleanup completed in {}. Post cleanup
size is {} " +
"and space reclaimed {}", watch,
humanReadableByteCount(finalSize),
humanReadableByteCount(initialSize - finalSize));
@@ -638,7 +665,7 @@ public class FileStore implements Segmen
public void compact() {
checkArgument(!compactionStrategy.equals(NO_COMPACTION),
"You must set a compactionStrategy before calling compact");
- log.info("TarMK compaction running, strategy={}", compactionStrategy);
+ gcMonitor.info("TarMK compaction running, strategy={}",
compactionStrategy);
long start = System.currentTimeMillis();
SegmentWriter writer = new SegmentWriter(this, tracker, getVersion());
@@ -647,7 +674,7 @@ public class FileStore implements Segmen
long existing = before.getChildNode(SegmentNodeStore.CHECKPOINTS)
.getChildNodeCount(Long.MAX_VALUE);
if (existing > 1) {
- log.warn(
+ gcMonitor.warn(
"TarMK compaction found {} checkpoints, you might need to
run checkpoint cleanup",
existing);
}
@@ -664,10 +691,10 @@ public class FileStore implements Segmen
after = compactor.compact(after, head);
setHead = new SetHead(head, after, compactor);
}
- log.info("TarMK compaction completed in {}ms",
+ gcMonitor.info("TarMK compaction completed in {}ms",
System.currentTimeMillis() - start);
} catch (Exception e) {
- log.error("Error while running TarMK compaction", e);
+ gcMonitor.error("Error while running TarMK compaction", e);
}
}
@@ -711,6 +738,7 @@ public class FileStore implements Segmen
// threads before acquiring the synchronization lock
compactionThread.close();
flushThread.close();
+ gcMonitor.stop();
synchronized (this) {
try {
@@ -897,6 +925,7 @@ public class FileStore implements Segmen
// content. TODO: There should be a cleaner way to do this.
tracker.getWriter().dropCache();
tracker.getWriter().flush();
+ gcMonitor.compacted();
tracker.clearSegmentIdTables(compactionStrategy);
return true;
} else {
@@ -908,4 +937,49 @@ public class FileStore implements Segmen
public SegmentVersion getVersion() {
return version;
}
+
+ private static class GCMonitorTracker extends
AbstractServiceTracker<GCMonitor> {
+ public GCMonitorTracker() {
+ super(GCMonitor.class);
+ }
+
+ void info(String message, Object... arguments) {
+ log.info(message, arguments);
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.info(message, arguments);
+ }
+ }
+
+ void warn(String message, Object... arguments) {
+ log.warn(message, arguments);
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.warn(message, arguments);
+ }
+ }
+
+ void error(String message, Exception e) {
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.error(message, e);
+ }
+ }
+
+ void skipped(String message, Object... arguments) {
+ log.info(message, arguments);
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.skipped(message, arguments);
+ }
+ }
+
+ void compacted() {
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.compacted();
+ }
+ }
+
+ void cleaned(long reclaimedSize, long currentSize) {
+ for (GCMonitor gcMonitor : getServices()) {
+ gcMonitor.cleaned(reclaimedSize, currentSize);
+ }
+ }
+ }
}
