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 md...@apache.org on 2014/12/16 16:36:50 UTC
svn commit: r1645980 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
Author: mduerig
Date: Tue Dec 16 15:36:49 2014
New Revision: 1645980
URL: http://svn.apache.org/r1645980
Log:
OAK-2192 Concurrent commit during compaction results in mixed segments
merged r1645966
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 15:36:49 2014
@@ -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,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,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,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611
021,1611041,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,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,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,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1
630338,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,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,164376
7,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654,1644750,1645421,1645424,1645459,1645585,1645637,1645661-1645662,1645888,1645901,1645948
+/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,1601676,1601757,1601768,1601814,1601833,1601838,1601853,1601878,1601888,1601922,1602156,1602174,1602179,1602183,1602207,1602227,1602256,1602261,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,1607664,1607737,1608560,1608783,1609064,1609081,1609165,1609488,1610489,1610592,1610603,1610634,1610658,1610664,1611
021,1611041,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,1621115,1621123-1621124,1621168,1621192,1621201,1621706,1621962,1622197,1622201,1622207,1622250,1622479,1623364,1623766,1623827,1623949,1623969,1623973,1624216,1624317,1624551,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,1628262,1628447,1628608,1629688,1629840,1629917,1630055-1630057,1630156,1630299,1
630338,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,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,164376
7,1643774,1643982,1644016,1644106,1644366,1644383,1644397-1644398,1644407,1644479,1644547,1644552,1644554,1644650,1644654,1644750,1645421,1645424,1645459,1645585,1645637,1645661-1645662,1645888,1645901,1645948,1645966
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java?rev=1645980&r1=1645979&r2=1645980&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompactionAndCleanupTest.java Tue Dec 16 15:36:49 2014
@@ -20,6 +20,7 @@
package org.apache.jackrabbit.oak.plugins.segment;
import static com.google.common.collect.Lists.newArrayList;
+import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
import static org.apache.commons.io.FileUtils.deleteDirectory;
import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_NONE;
import static org.apache.jackrabbit.oak.plugins.segment.compaction.CompactionStrategy.CleanupType.CLEAN_OLD;
@@ -55,11 +56,16 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.io.ByteStreams;
public class CompactionAndCleanupTest {
+ private static final Logger log = LoggerFactory
+ .getLogger(CompactionAndCleanupTest.class);
+
private File directory;
@Before
@@ -80,13 +86,14 @@ public class CompactionAndCleanupTest {
FileStore fileStore = new FileStore(directory, 1);
final SegmentNodeStore nodeStore = new SegmentNodeStore(fileStore);
- CompactionStrategy custom = new CompactionStrategy(false,
- false, CLEAN_OLD, TimeUnit.HOURS.toMillis(1), (byte) 0) {
- @Override
- public boolean compacted(@Nonnull Callable<Boolean> setHead) throws Exception {
- return nodeStore.locked(setHead);
- }
- };
+ CompactionStrategy custom = new CompactionStrategy(false, false,
+ CLEAN_OLD, TimeUnit.HOURS.toMillis(1), (byte) 0) {
+ @Override
+ public boolean compacted(@Nonnull Callable<Boolean> setHead)
+ throws Exception {
+ return nodeStore.locked(setHead);
+ }
+ };
fileStore.setCompactionStrategy(custom);
// 1a. Create a bunch of data
@@ -102,89 +109,85 @@ public class CompactionAndCleanupTest {
// ----
final long dataSize = fileStore.size();
- // System.out.printf("File store dataSize %s%n",
- // byteCountToDisplaySize(dataSize));
+ log.debug("File store dataSize {}", byteCountToDisplaySize(dataSize));
- // 1. Create a property with 5 MB blob
- NodeBuilder builder = nodeStore.getRoot().builder();
- builder.setProperty("a1", createBlob(nodeStore, blobSize));
- builder.setProperty("b", "foo");
- nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
-
- // System.out.printf("File store pre removal %s expecting %s %n",
- // byteCountToDisplaySize(fileStore.size()),
- // byteCountToDisplaySize(blobSize + dataSize));
- assertEquals(mb(blobSize + dataSize), mb(fileStore.size()));
-
- // 2. Now remove the property
- builder = nodeStore.getRoot().builder();
- builder.removeProperty("a1");
- nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
-
- // Size remains same, no cleanup happened yet
- // System.out.printf("File store pre compaction %s expecting %s%n",
- // byteCountToDisplaySize(fileStore.size()),
- // byteCountToDisplaySize(blobSize + dataSize));
- assertEquals(mb(blobSize + dataSize), mb(fileStore.size()));
-
- // 3. Compact
- assertTrue(fileStore.maybeCompact(false));
-
- // Size doesn't shrink: ran compaction with a '1 Hour' cleanup
- // strategy
- // System.out.printf("File store post compaction %s expecting %s%n",
- // byteCountToDisplaySize(fileStore.size()),
- // byteCountToDisplaySize(blobSize + dataSize));
- assertSize("post compaction", fileStore.size(), blobSize + dataSize,
- blobSize + 2 * dataSize);
-
- // 4. Add some more property to flush the current TarWriter
- builder = nodeStore.getRoot().builder();
- builder.setProperty("a2", createBlob(nodeStore, blobSize));
- nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
-
- // Size is double
- // System.out.printf("File store pre cleanup %s expecting %s%n",
- // byteCountToDisplaySize(fileStore.size()),
- // byteCountToDisplaySize(2 * blobSize + dataSize));
- assertSize("post compaction", fileStore.size(),
- 2 * blobSize + dataSize, 2 * blobSize + 2 * dataSize);
-
- // 5. Cleanup, expecting store size:
- // no data content =>
- // fileStore.size() == blobSize
- // some data content =>
- // fileStore.size() in [blobSize + dataSize, blobSize + 2xdataSize]
- assertTrue(fileStore.maybeCompact(false));
- fileStore.cleanup();
- // System.out.printf(
- // "File store post cleanup %s expecting between [%s,%s]%n",
- // byteCountToDisplaySize(fileStore.size()),
- // byteCountToDisplaySize(blobSize + dataSize),
- // byteCountToDisplaySize(blobSize + 2 * dataSize));
- assertSize("post cleanup", fileStore.size(),
- blobSize + dataSize, blobSize + 2 * dataSize);
-
- // refresh the ts ref, to simulate a long wait time
- custom.setOlderThan(0);
- TimeUnit.MILLISECONDS.sleep(5);
-
- boolean needsCompaction = true;
- for (int i = 0; i < 3 && needsCompaction; i++) {
- needsCompaction = fileStore.maybeCompact(false);
+ try {
+ // 1. Create a property with 5 MB blob
+ NodeBuilder builder = nodeStore.getRoot().builder();
+ builder.setProperty("a1", createBlob(nodeStore, blobSize));
+ builder.setProperty("b", "foo");
+ nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ log.debug("File store pre removal {}, expecting {}",
+ byteCountToDisplaySize(fileStore.size()),
+ byteCountToDisplaySize(blobSize + dataSize));
+ assertEquals(mb(blobSize + dataSize), mb(fileStore.size()));
+
+ // 2. Now remove the property
+ builder = nodeStore.getRoot().builder();
+ builder.removeProperty("a1");
+ nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ // Size remains same, no cleanup happened yet
+ log.debug("File store pre compaction {}, expecting {}",
+ byteCountToDisplaySize(fileStore.size()),
+ byteCountToDisplaySize(blobSize + dataSize));
+ assertEquals(mb(blobSize + dataSize), mb(fileStore.size()));
+
+ // 3. Compact
+ assertTrue(fileStore.maybeCompact(false));
+
+ // Size doesn't shrink: ran compaction with a '1 Hour' cleanup
+ // strategy
+ assertSize("post compaction", fileStore.size(),
+ blobSize + dataSize, blobSize + 2 * dataSize);
+
+ // 4. Add some more property to flush the current TarWriter
+ builder = nodeStore.getRoot().builder();
+ builder.setProperty("a2", createBlob(nodeStore, blobSize));
+ nodeStore.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ // Size is double
+ assertSize("pre cleanup", fileStore.size(), 2 * blobSize
+ + dataSize, 2 * blobSize + 2 * dataSize);
+
+ // 5. Cleanup, expecting store size:
+ // no data content =>
+ // fileStore.size() == blobSize
+ // some data content =>
+ // fileStore.size() in [blobSize + dataSize, blobSize + 2xdataSize]
+ assertTrue(fileStore.maybeCompact(false));
fileStore.cleanup();
- }
+ assertSize("post cleanup", fileStore.size(), blobSize + dataSize,
+ blobSize + 2 * dataSize);
- // gain is finally 0%
- assertFalse(fileStore.maybeCompact(false));
+ // refresh the ts ref, to simulate a long wait time
+ custom.setOlderThan(0);
+ TimeUnit.MILLISECONDS.sleep(5);
+
+ boolean needsCompaction = true;
+ for (int i = 0; i < 3 && needsCompaction; i++) {
+ needsCompaction = fileStore.maybeCompact(false);
+ fileStore.cleanup();
+ }
+
+ // gain is finally 0%
+ assertFalse(fileStore.maybeCompact(false));
- // no data loss happened
- byte[] blob = ByteStreams.toByteArray(nodeStore.getRoot()
- .getProperty("a2").getValue(Type.BINARY).getNewStream());
- assertEquals(blobSize, blob.length);
+ // no data loss happened
+ byte[] blob = ByteStreams.toByteArray(nodeStore.getRoot()
+ .getProperty("a2").getValue(Type.BINARY).getNewStream());
+ assertEquals(blobSize, blob.length);
+ } finally {
+ fileStore.close();
+ }
}
- private static void assertSize(String log, long size, long lower, long upper) {
+ private static void assertSize(String info, long size, long lower,
+ long upper) {
+ log.debug("File Store {} size {}, expected in interval [{},{}]", info,
+ byteCountToDisplaySize(size), byteCountToDisplaySize(lower),
+ byteCountToDisplaySize(upper));
assertTrue("File Store " + log + " size expected in interval ["
+ mb(lower) + "," + mb(upper) + "] but was: " + mb(size),
mb(size) >= mb(lower) && mb(size) <= mb(upper));