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 ch...@apache.org on 2016/01/25 08:36:53 UTC
svn commit: r1726589 - in /jackrabbit/oak/branches/1.2: ./
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
Author: chetanm
Date: Mon Jan 25 07:36:53 2016
New Revision: 1726589
URL: http://svn.apache.org/viewvc?rev=1726589&view=rev
Log:
OAK-3918 - Include index details in exception thrown by OakDirectory
Merging 1726585,1726586
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 25 07:36:53 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555,1725960,1726232,1726570,1726579
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681921,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618
,1684669,1684820,1684868,1684894,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686003,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693050,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1694651,1694653-1694654,1695032,1695050,1695122,1695280,1695299,1695420,1695457,1695482,1695492,1695507,1695
521,1695540,1695571,1695905,1696190,1696194,1696242,1696285,1696375,1696522,1696578,1696759,1696916,1697363,1697373,1697410,1697582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700718,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701907,1701948,1701955,1701959,1701965,1701986,1702014,1702022,1702045,1702051,1702241,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430,1703568,1703592,1703758,1703858,1703878,1704256,1704282,1704285,1704457,1704479,1704490,1704614,1704629,1704636,1704655,1704670,1704886,1705005,1705027,1705043,1705055,1705250,1705268,1705273,1705323,1705677,1705701,1705871,1705992,1705998,1706009,1706037,1706059,1706212,1706218,1706270,1706764,1706772,1707049,1707191,1707331,1707435,1707509,1708105,1708315,1708546,1708592,1708766,1709012,1709852,1709978,1710013,1710031,1710049,1710205,1710242,1710559,1710575,1710590,1710614,1710637,1
710789,1710800,1710811,1710816,1710972,1711248,1711282,1711296,1711405,1711498,1711654,1712018,1712042,1712319,1712490,1712531,1712730,1712785,1712963,1713008,1713439,1713461,1713580,1713586,1713599-1713600,1713626,1713698,1713803,1713809,1714034,1714061,1714084,1714170,1714213,1714229,1714238,1714519-1714520,1714543-1714544,1714730,1714739,1714779,1714956,1714961,1715010,1715092,1715191,1715346,1715767,1715771,1715888,1715898,1716178,1716426,1716576,1716596,1716616,1716703,1716712,1716815,1716823,1716830,1716883,1717277,1717462,1717632,1717784,1717789,1717988,1718528,1718533,1718547-1718548,1718626,1718646,1718772,1718801-1718802,1718895,1719111,1719288,1719869,1720335,1720350,1720354,1720500,1721160,1721172,1721337,1722141,1722832,1723227,1723239,1723241,1723251,1723254,1723333,1723347,1723350,1723584,1723713,1723731,1724026,1724057,1724186,1724210,1724401,1724628,1724631,1725216,1725477,1725555,1725960,1726232,1726570,1726579,1726585-1726586
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java?rev=1726589&r1=1726588&r2=1726589&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectory.java Mon Jan 25 07:36:53 2016
@@ -70,6 +70,7 @@ class OakDirectory extends Directory {
private LockFactory lockFactory;
private final boolean readOnly;
private final Set<String> fileNames = Sets.newConcurrentHashSet();
+ private final String indexName;
public OakDirectory(NodeBuilder directoryBuilder, IndexDefinition definition, boolean readOnly) {
this.lockFactory = NoLockFactory.getNoLockFactory();
@@ -77,6 +78,7 @@ class OakDirectory extends Directory {
this.definition = definition;
this.readOnly = readOnly;
this.fileNames.addAll(getListing());
+ this.indexName = definition.getIndexName();
}
@Override
@@ -99,7 +101,7 @@ class OakDirectory extends Directory {
@Override
public long fileLength(String name) throws IOException {
NodeBuilder file = directoryBuilder.getChildNode(name);
- OakIndexInput input = new OakIndexInput(name, file);
+ OakIndexInput input = new OakIndexInput(name, file, indexName);
try {
return input.length();
} finally {
@@ -119,7 +121,7 @@ class OakDirectory extends Directory {
file = directoryBuilder.child(name);
}
fileNames.add(name);
- return new OakIndexOutput(name, file);
+ return new OakIndexOutput(name, file, indexName);
}
@@ -128,9 +130,10 @@ class OakDirectory extends Directory {
throws IOException {
NodeBuilder file = directoryBuilder.getChildNode(name);
if (file.exists()) {
- return new OakIndexInput(name, file);
+ return new OakIndexInput(name, file, indexName);
} else {
- throw new FileNotFoundException(name);
+ String msg = String.format("[%s] %s", indexName, name);
+ throw new FileNotFoundException(msg);
}
}
@@ -217,9 +220,12 @@ class OakDirectory extends Directory {
private boolean blobModified = false;
- public OakIndexFile(String name, NodeBuilder file) {
+ private final String dirDetails;
+
+ public OakIndexFile(String name, NodeBuilder file, String dirDetails) {
this.name = name;
this.file = file;
+ this.dirDetails = dirDetails;
this.blobSize = determineBlobSize(file);
this.blob = new byte[blobSize];
@@ -240,6 +246,7 @@ class OakDirectory extends Directory {
private OakIndexFile(OakIndexFile that) {
this.name = that.name;
this.file = that.file;
+ this.dirDetails = that.dirDetails;
this.blobSize = that.blobSize;
this.blob = new byte[blobSize];
@@ -285,8 +292,8 @@ class OakDirectory extends Directory {
// seek() may be called with pos == length
// see https://issues.apache.org/jira/browse/LUCENE-1196
if (pos < 0 || pos > length) {
- String msg = String.format("Invalid seek request for [%s], " +
- "position: %d, file length: %d", name, pos, length);
+ String msg = String.format("Invalid seek request for [%s][%s], " +
+ "position: %d, file length: %d", dirDetails, name, pos, length);
throw new IOException(msg);
} else {
position = pos;
@@ -298,8 +305,8 @@ class OakDirectory extends Directory {
checkPositionIndexes(offset, offset + len, checkNotNull(b).length);
if (len < 0 || position + len > length) {
- String msg = String.format("Invalid byte range request for [%s], " +
- "position: %d, file length: %d, len: %d", name, position, length, len);
+ String msg = String.format("Invalid byte range request for [%s][%s], " +
+ "position: %d, file length: %d, len: %d", dirDetails, name, position, length, len);
throw new IOException(msg);
}
@@ -369,6 +376,9 @@ class OakDirectory extends Directory {
return name;
}
+ public String getName() {
+ return name;
+ }
}
private static class OakIndexInput extends IndexInput {
@@ -376,10 +386,12 @@ class OakDirectory extends Directory {
private final OakIndexFile file;
private boolean isClone = false;
private final WeakIdentityMap<OakIndexInput, Boolean> clones;
+ private final String dirDetails;
- public OakIndexInput(String name, NodeBuilder file) {
+ public OakIndexInput(String name, NodeBuilder file, String dirDetails) {
super(name);
- this.file = new OakIndexFile(name, file);
+ this.dirDetails = dirDetails;
+ this.file = new OakIndexFile(name, file, dirDetails);
clones = WeakIdentityMap.newConcurrentHashMap();
}
@@ -387,6 +399,7 @@ class OakDirectory extends Directory {
super(that.toString());
this.file = new OakIndexFile(that.file);
clones = null;
+ this.dirDetails = that.dirDetails;
}
@Override
@@ -448,18 +461,19 @@ class OakDirectory extends Directory {
private void checkNotClosed() {
if (file.blob == null && file.data == null) {
- throw new AlreadyClosedException("Already closed: " + this);
+ throw new AlreadyClosedException("Already closed: [" + dirDetails + "] " + this);
}
}
}
private final class OakIndexOutput extends IndexOutput {
-
+ private final String dirDetails;
private final OakIndexFile file;
- public OakIndexOutput(String name, NodeBuilder file) throws IOException {
- this.file = new OakIndexFile(name, file);
+ public OakIndexOutput(String name, NodeBuilder file, String dirDetails) throws IOException {
+ this.dirDetails = dirDetails;
+ this.file = new OakIndexFile(name, file, dirDetails);
}
@Override
@@ -480,7 +494,11 @@ class OakDirectory extends Directory {
@Override
public void writeBytes(byte[] b, int offset, int length)
throws IOException {
- file.writeBytes(b, offset, length);
+ try {
+ file.writeBytes(b, offset, length);
+ } catch (IOException e) {
+ throw wrapWithDetails(e);
+ }
}
@Override
@@ -490,7 +508,11 @@ class OakDirectory extends Directory {
@Override
public void flush() throws IOException {
- file.flush();
+ try {
+ file.flush();
+ } catch (IOException e) {
+ throw wrapWithDetails(e);
+ }
}
@Override
@@ -500,6 +522,11 @@ class OakDirectory extends Directory {
file.data = null;
}
+ private IOException wrapWithDetails(IOException e) {
+ String msg = String.format("Error occurred while writing to blob [%s][%s]", dirDetails, file.getName());
+ return new IOException(msg, e);
+ }
+
}
}
Modified: jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java?rev=1726589&r1=1726588&r2=1726589&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/OakDirectoryTest.java Mon Jan 25 07:36:53 2016
@@ -35,6 +35,7 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.plugins.memory.ArrayBasedBlob;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
+import org.apache.jackrabbit.oak.plugins.segment.Segment;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
import org.apache.jackrabbit.oak.spi.blob.MemoryBlobStore;
@@ -59,7 +60,9 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.OakDirectory.PROP_BLOB_SIZE;
import static org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent.INITIAL_CONTENT;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -329,6 +332,84 @@ public class OakDirectoryTest {
store.close();
}
+ @Test
+ public void dirNameInExceptionMessage() throws Exception{
+ String indexPath = "/foo/bar";
+ builder.setProperty(LuceneIndexConstants.INDEX_PATH, indexPath);
+ Directory dir = createDir(builder, false);
+
+ try {
+ dir.openInput("foo.txt", IOContext.DEFAULT);
+ fail();
+ } catch (IOException e){
+ assertThat(e.getMessage(), containsString(indexPath));
+ }
+
+ int fileSize = createFile(dir, "test.txt");
+ IndexInput in = dir.openInput("test.txt", IOContext.DEFAULT);
+
+ try {
+ in.seek(fileSize + 1);
+ fail();
+ } catch (IOException e){
+ assertThat(e.getMessage(), containsString(indexPath));
+ }
+
+ IndexInput in2 = dir.openInput("test.txt", IOContext.DEFAULT);
+
+ try {
+ byte[] data = new byte[fileSize + 1];
+ in2.readBytes(data, 0, fileSize + 1);
+ fail();
+ } catch (IOException e){
+ assertThat(e.getMessage(), containsString(indexPath));
+ }
+ }
+
+ @Test
+ public void dirNameInException_Writes() throws Exception{
+ FailOnDemandBlobStore blobStore = new FailOnDemandBlobStore();
+ FileStore store = FileStore.newFileStore(tempFolder.getRoot())
+ .withMemoryMapping(false)
+ .withBlobStore(blobStore)
+ .create();
+ SegmentNodeStore nodeStore = new SegmentNodeStore(store);
+
+ String indexPath = "/foo/bar";
+
+ int minFileSize = Segment.MEDIUM_LIMIT;
+ int blobSize = minFileSize + 1000;
+
+ builder = nodeStore.getRoot().builder();
+ builder.setProperty(LuceneIndexConstants.INDEX_PATH, indexPath);
+ builder.setProperty(LuceneIndexConstants.BLOB_SIZE, blobSize);
+ Directory dir = createDir(builder, false);
+
+ blobStore.startFailing();
+ IndexOutput o = dir.createOutput("test1.txt", IOContext.DEFAULT);
+ try{
+ o.writeBytes(randomBytes(blobSize + 10), blobSize + 10);
+ fail();
+ } catch (IOException e){
+ assertThat(e.getMessage(), containsString(indexPath));
+ assertThat(e.getMessage(), containsString("test1.txt"));
+ }
+
+ blobStore.reset();
+
+ IndexOutput o3 = dir.createOutput("test3.txt", IOContext.DEFAULT);
+ o3.writeBytes(randomBytes(minFileSize), minFileSize);
+
+ blobStore.startFailing();
+ try{
+ o3.flush();
+ fail();
+ } catch (IOException e){
+ assertThat(e.getMessage(), containsString(indexPath));
+ assertThat(e.getMessage(), containsString("test3.txt"));
+ }
+ }
+
private static void readInputToEnd(long expectedSize, IndexInput input) throws IOException {
int COPY_BUFFER_SIZE = 16384;
byte[] copyBuffer = new byte[(int) ONE_MB];
@@ -381,4 +462,24 @@ public class OakDirectoryTest {
return data;
}
}
+
+ private static class FailOnDemandBlobStore extends MemoryBlobStore {
+ private boolean fail;
+
+ @Override
+ public String writeBlob(InputStream in) throws IOException {
+ if (fail) {
+ throw new IOException("Failing on demand");
+ }
+ return super.writeBlob(in);
+ }
+
+ public void startFailing(){
+ fail = true;
+ }
+
+ public void reset(){
+ fail = false;
+ }
+ }
}