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 2019/02/22 10:02:51 UTC
svn commit: r1854129 - in /jackrabbit/oak/branches/1.8: ./
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
Author: mduerig
Date: Fri Feb 22 10:02:51 2019
New Revision: 1854129
URL: http://svn.apache.org/viewvc?rev=1854129&view=rev
Log:
OAK-8069: Log warning for too many transient modifications of direct child nodes
Merged r1854058
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 22 10:02:51 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1851533-1851535,1851619,1852120,1852451,1852492,1852
528,1852582,1852584,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822642,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826216,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826833,1826932,1826957,1827423,1827472,1827486,1827816,1827977,1828349,1828439,1828502,1828529,1828948,1829527,1829534,1829546,1829569,1829587,1829665,1829854,1829864,1829978,1829985,1829987,1829998,1830019,1830048,1830160,1830171,1830197,1830209,1830239,1830347,1830748,1830911
,1830923,1831157-1831158,1831163,1831190,1831374,1831560,1831689,1832258,1832376,1832379,1832535,1833308,1833347,1833833,1834112,1834117,1834287,1834291,1834302,1834326,1834328,1834336,1834428,1834468,1834483,1834610,1834648-1834649,1834681,1834823,1834857-1834858,1835060,1835518,1835521,1835635,1835642,1835780,1835819,1836082,1836121,1836167-1836168,1836170-1836187,1836189-1836196,1836206,1836487,1836493,1836548,1837057,1837274,1837296,1837326,1837475,1837503,1837547,1837569,1837600,1837657,1837718,1837998,1838076,1838637,1839549,1839570,1839637,1839746,1840019,1840024,1840031,1840226,1840455,1840462,1840574,1840769,1841314,1841352,1842089,1842677,1843175,1843222,1843231,1843398,1843618,1843652,1843911,1844325,1844549,1844625,1844627,1844642,1844728,1844775,1844932,1845135,1845336,1845405,1845415,1845730-1845731,1845863,1845865,1846057,1846396,1846429,1846617,1848073,1848181-1848182,1848191,1848217,1848822-1848823,1850221,1850837,1851533-1851535,1851619,1852120,1852451,1852492,1852
528,1852582,1852584,1853393,1853429,1853433,1853866,1853870,1853893,1853969,1853997,1854058
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java?rev=1854129&r1=1854128&r2=1854129&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java Fri Feb 22 10:02:51 2019
@@ -33,6 +33,7 @@ import static com.google.common.collect.
import static com.google.common.collect.Lists.partition;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.io.ByteStreams.read;
+import static java.lang.Integer.getInteger;
import static java.lang.Long.numberOfLeadingZeros;
import static java.lang.Math.min;
import static java.util.Arrays.asList;
@@ -87,6 +88,19 @@ public class DefaultSegmentWriter implem
private static final Logger LOG = LoggerFactory.getLogger(DefaultSegmentWriter.class);
+ /**
+ * Default threshold of the number of modified child nodes of a node after which to
+ * log a warning.
+ */
+ public static final int CHILD_NODE_COUNT_WARN_THRESHOLD_DEFAULT = 1000000;
+
+ /**
+ * Threshold of the number of modified child nodes of a node after which to log
+ * a warning.
+ */
+ private static final int CHILD_NODE_COUNT_WARN_THRESHOLD =
+ getInteger("oak.segment.childNodeCountWarnThreshold", CHILD_NODE_COUNT_WARN_THRESHOLD_DEFAULT);
+
@NotNull
private final WriterCacheManager cacheManager;
@@ -197,7 +211,7 @@ public class DefaultSegmentWriter implem
@Nullable final ByteBuffer stableIdBytes)
throws IOException {
return new SegmentWriteOperation(writeOperationHandler.getGCGeneration())
- .writeNode(state, stableIdBytes);
+ .writeNode("/", state, stableIdBytes);
}
/**
@@ -215,6 +229,8 @@ public class DefaultSegmentWriter implem
private final Cache<String, RecordId> nodeCache;
+ private int childNodeCountWarnThreshold = CHILD_NODE_COUNT_WARN_THRESHOLD;
+
SegmentWriteOperation(@NotNull GCGeneration gcGeneration) {
int generation = gcGeneration.getGeneration();
this.gcGeneration = gcGeneration;
@@ -750,7 +766,10 @@ public class DefaultSegmentWriter implem
return tid;
}
- private RecordId writeNode(@NotNull NodeState state, @Nullable ByteBuffer stableIdBytes)
+ private RecordId writeNode(
+ @NotNull String path,
+ @NotNull NodeState state,
+ @Nullable ByteBuffer stableIdBytes)
throws IOException {
RecordId compactedId = deduplicateNode(state);
@@ -761,7 +780,7 @@ public class DefaultSegmentWriter implem
if (state instanceof SegmentNodeState && stableIdBytes == null) {
stableIdBytes = ((SegmentNodeState) state).getStableIdBytes();
}
- RecordId recordId = writeNodeUncached(state, stableIdBytes);
+ RecordId recordId = writeNodeUncached(path, state, stableIdBytes);
if (stableIdBytes != null) {
// This node state has been rewritten because it is from an older
@@ -777,7 +796,17 @@ public class DefaultSegmentWriter implem
return (byte) (Byte.MIN_VALUE + 64 - numberOfLeadingZeros(childCount));
}
- private RecordId writeNodeUncached(@NotNull NodeState state, @Nullable ByteBuffer stableIdBytes)
+ private void warnOnManyChildren(Map<?, ?> map, String path) {
+ if (map.size() >= childNodeCountWarnThreshold) {
+ childNodeCountWarnThreshold += CHILD_NODE_COUNT_WARN_THRESHOLD;
+ LOG.warn("Large number of modified child nodes: {} @ {}", map.size(), path);
+ }
+ }
+
+ private RecordId writeNodeUncached(
+ @NotNull String path,
+ @NotNull NodeState state,
+ @Nullable ByteBuffer stableIdBytes)
throws IOException {
ModifiedNodeState after = null;
@@ -817,19 +846,20 @@ public class DefaultSegmentWriter implem
&& before.getChildNodeCount(2) > 1
&& after.getChildNodeCount(2) > 1) {
base = before.getChildNodeMap();
- childNodes = new ChildNodeCollectorDiff().diff(before, after);
+ childNodes = new ChildNodeCollectorDiff(path).diff(before, after);
} else {
base = null;
childNodes = newHashMap();
for (ChildNodeEntry entry : state.getChildNodeEntries()) {
childNodes.put(
entry.getName(),
- writeNode(entry.getNodeState(), null));
+ writeNode(path + "/" + entry.getName(), entry.getNodeState(), null));
+ warnOnManyChildren(childNodes, path);
}
}
ids.add(writeMap(base, childNodes));
} else if (childName != Template.ZERO_CHILD_NODES) {
- ids.add(writeNode(state.getChildNode(template.getChildName()), null));
+ ids.add(writeNode(path + "/" + template.getChildName(), state.getChildNode(template.getChildName()), null));
}
List<RecordId> pIds = newArrayList();
@@ -977,8 +1007,14 @@ public class DefaultSegmentWriter implem
private final Map<String, RecordId> childNodes = newHashMap();
+ private final String path;
+
private IOException exception;
+ public ChildNodeCollectorDiff(String path) {
+ this.path = path;
+ }
+
public Map<String, RecordId> diff(SegmentNodeState before, ModifiedNodeState after) throws IOException {
after.compareAgainstBaseState(before, this);
if (exception != null) {
@@ -991,7 +1027,7 @@ public class DefaultSegmentWriter implem
@Override
public boolean childNodeAdded(String name, NodeState after) {
try {
- childNodes.put(name, writeNode(after, null));
+ addChild(name, writeNode(path + "/" + name, after, null));
} catch (IOException e) {
exception = e;
return false;
@@ -1004,7 +1040,7 @@ public class DefaultSegmentWriter implem
String name, NodeState before, NodeState after
) {
try {
- childNodes.put(name, writeNode(after, null));
+ addChild(name, writeNode(path + "/" + name, after, null));
} catch (IOException e) {
exception = e;
return false;
@@ -1014,9 +1050,14 @@ public class DefaultSegmentWriter implem
@Override
public boolean childNodeDeleted(String name, NodeState before) {
- childNodes.put(name, null);
+ addChild(name, null);
return true;
}
+
+ private void addChild(String name, @Nullable RecordId recordId) {
+ childNodes.put(name, recordId);
+ warnOnManyChildren(childNodes, path);
+ }
}
}