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 fr...@apache.org on 2018/08/31 14:02:50 UTC
svn commit: r1839760 - in /jackrabbit/oak/branches/1.6: ./
oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/
Author: frm
Date: Fri Aug 31 14:02:50 2018
New Revision: 1839760
URL: http://svn.apache.org/viewvc?rev=1839760&view=rev
Log:
OAK-7720 - Log hex dumps of too big segments
Backport r1839746 from trunk.
Added:
jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java
- copied, changed from r1839746, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 31 14:02:50 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119
,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785161,1785172,1785283,1785652,1785838,1785916-1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119
,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809178-1809179,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1813538,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818137,1818554,1818576,1818645,1819048,1819050,1821237,1821325,1821358,1821495,1821516,1821847,1822207,1822850,1823172,1823655,1824896,1825471,1825654,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1828502,1829527,1829569,1829587,1829665,1829854,1829864,1829987,1829998,1830019,1830160,1830239,1830748,1831190,1831374,1832379,1832535,1833308,1834648-1834649,1834681,1835060,1837475,1837998,1838637,1839746
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java?rev=1839760&r1=1839759&r2=1839760&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java (original)
+++ jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/Segment.java Fri Aug 31 14:02:50 2018
@@ -33,8 +33,7 @@ import static org.apache.jackrabbit.oak.
import java.io.IOException;
import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.io.PrintStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.WritableByteChannel;
@@ -45,6 +44,8 @@ import java.util.UUID;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
+import com.google.common.base.Charsets;
+import com.google.common.collect.AbstractIterator;
import org.apache.commons.io.HexDump;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -52,9 +53,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.segment.RecordNumbers.Entry;
-
-import com.google.common.base.Charsets;
-import com.google.common.collect.AbstractIterator;
+import org.apache.jackrabbit.oak.segment.SegmentDump.Dumper;
/**
* A list of records.
@@ -623,63 +622,35 @@ public class Segment {
@Override
public String toString() {
- StringWriter string = new StringWriter();
- try (PrintWriter writer = new PrintWriter(string)) {
- int length = data.remaining();
-
- writer.format("Segment %s (%d bytes)%n", id, length);
- String segmentInfo = getSegmentInfo();
- if (segmentInfo != null) {
- writer.format("Info: %s, Generation: %d%n", segmentInfo, getGcGeneration());
- }
- if (id.isDataSegmentId()) {
- writer.println("--------------------------------------------------------------------------");
-
- int i = 1;
+ return SegmentDump.dumpSegment(
+ id,
+ data.remaining(),
+ info,
+ getGcGeneration(),
+ segmentReferences,
+ recordNumbers,
+ new Dumper() {
+
+ @Override
+ public void dump(OutputStream stream) {
+ byte[] buffer;
- for (SegmentId segmentId : segmentReferences) {
- writer.format("reference %02x: %s%n", i++, segmentId);
- }
-
- for (Entry entry : recordNumbers) {
- writer.format("%10s record %08x: %08x%n",
- entry.getType(), entry.getRecordNumber(), entry.getOffset());
- }
- }
- writer.println("--------------------------------------------------------------------------");
- int pos = data.limit() - ((length + 15) & ~15);
- while (pos < data.limit()) {
- writer.format("%04x: ", (MAX_SEGMENT_SIZE - data.limit() + pos) >> RECORD_ALIGN_BITS);
- for (int i = 0; i < 16; i++) {
- if (i > 0 && i % 4 == 0) {
- writer.append(' ');
- }
- if (pos + i >= data.position()) {
- byte b = data.get(pos + i);
- writer.format("%02x ", b & 0xff);
+ if (data.hasArray()) {
+ buffer = data.array();
} else {
- writer.append(" ");
+ buffer = new byte[data.remaining()];
+ data.duplicate().get(buffer);
}
- }
- writer.append(' ');
- for (int i = 0; i < 16; i++) {
- if (pos + i >= data.position()) {
- byte b = data.get(pos + i);
- if (b >= ' ' && b < 127) {
- writer.append((char) b);
- } else {
- writer.append('.');
- }
- } else {
- writer.append(' ');
+
+ try {
+ HexDump.dump(buffer, 0, stream, 0);
+ } catch (IOException e) {
+ e.printStackTrace(new PrintStream(stream));
}
}
- writer.println();
- pos += 16;
+
}
- writer.println("--------------------------------------------------------------------------");
- return string.toString();
- }
+ );
}
public void writeTo(OutputStream stream) throws IOException {
Modified: jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java?rev=1839760&r1=1839759&r2=1839760&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java (original)
+++ jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriter.java Fri Aug 31 14:02:50 2018
@@ -29,6 +29,7 @@ import static java.lang.System.currentTi
import static java.lang.System.identityHashCode;
import static org.apache.jackrabbit.oak.segment.Segment.GC_GENERATION_OFFSET;
import static org.apache.jackrabbit.oak.segment.Segment.HEADER_SIZE;
+import static org.apache.jackrabbit.oak.segment.Segment.MAX_SEGMENT_SIZE;
import static org.apache.jackrabbit.oak.segment.Segment.RECORD_ID_BYTES;
import static org.apache.jackrabbit.oak.segment.Segment.RECORD_SIZE;
import static org.apache.jackrabbit.oak.segment.Segment.SEGMENT_REFERENCE_SIZE;
@@ -37,6 +38,8 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.segment.SegmentVersion.LATEST_VERSION;
import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
import java.util.Collection;
import java.util.Set;
@@ -44,7 +47,9 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import com.google.common.base.Supplier;
+import org.apache.commons.io.HexDump;
import org.apache.jackrabbit.oak.segment.RecordNumbers.Entry;
+import org.apache.jackrabbit.oak.segment.SegmentDump.Dumper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -189,7 +194,7 @@ public class SegmentBufferWriter impleme
* The segment meta data is guaranteed to be the first string record in a segment.
*/
private void newSegment() {
- buffer = new byte[Segment.MAX_SEGMENT_SIZE];
+ buffer = new byte[MAX_SEGMENT_SIZE];
buffer[0] = '0';
buffer[1] = 'a';
buffer[2] = 'K';
@@ -327,6 +332,28 @@ public class SegmentBufferWriter impleme
dirty = true;
}
+ private String dumpSegmentBuffer() {
+ return SegmentDump.dumpSegment(
+ segment != null ? segment.getSegmentId() : null,
+ length,
+ segment != null ? segment.getSegmentInfo() : null,
+ generation,
+ segmentReferences,
+ recordNumbers,
+ new Dumper() {
+
+ @Override
+ public void dump(OutputStream stream) {
+ try {
+ HexDump.dump(buffer, 0, stream, 0);
+ } catch (IOException e) {
+ e.printStackTrace(new PrintStream(stream));
+ }
+ }
+ }
+ );
+ }
+
/**
* Adds a segment header to the buffer and writes a segment to the segment
* store. This is done automatically (called from prepare) when there is not
@@ -346,7 +373,10 @@ public class SegmentBufferWriter impleme
int totalLength = align(HEADER_SIZE + referencedSegmentIdCount * SEGMENT_REFERENCE_SIZE + recordNumberCount * RECORD_SIZE + length, 16);
if (totalLength > buffer.length) {
- throw new IllegalStateException("too much data for a segment");
+ LOG.warn("Segment buffer corruption detected\n{}", dumpSegmentBuffer());
+ throw new IllegalStateException(String.format(
+ "Too much data for a segment %s (referencedSegmentIdCount=%d, recordNumberCount=%d, length=%d, totalLength=%d)",
+ segment.getSegmentId(), referencedSegmentIdCount, recordNumberCount, length, totalLength));
}
statistics.size = length = totalLength;
Copied: jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java (from r1839746, jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java?p2=jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java&r1=1839746&r2=1839760&rev=1839760&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java (original)
+++ jackrabbit/oak/branches/1.6/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentDump.java Fri Aug 31 14:02:50 2018
@@ -24,12 +24,10 @@ import static org.apache.jackrabbit.oak.
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.function.Consumer;
import com.google.common.base.Charsets;
import org.apache.commons.io.output.WriterOutputStream;
import org.apache.jackrabbit.oak.segment.RecordNumbers.Entry;
-import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration;
class SegmentDump {
@@ -37,7 +35,13 @@ class SegmentDump {
return length - (MAX_SEGMENT_SIZE - offset);
}
- static String dumpSegment(SegmentId id, int length, String segmentInfo, GCGeneration generation, SegmentReferences segmentReferences, RecordNumbers recordNumbers, Consumer<OutputStream> dumper) {
+ interface Dumper {
+
+ void dump(OutputStream stream);
+
+ }
+
+ static String dumpSegment(SegmentId id, int length, String segmentInfo, int generation, SegmentReferences segmentReferences, RecordNumbers recordNumbers, Dumper dumper) {
StringWriter string = new StringWriter();
try (PrintWriter writer = new PrintWriter(string)) {
writer.format("Segment %s (%d bytes)%n", id, length);
@@ -57,7 +61,7 @@ class SegmentDump {
}
}
writer.println("--------------------------------------------------------------------------");
- dumper.accept(new WriterOutputStream(writer, Charsets.UTF_8));
+ dumper.dump(new WriterOutputStream(writer, Charsets.UTF_8));
writer.println("--------------------------------------------------------------------------");
}
return string.toString();