Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-6902: Don't retry to fsync files / directories; fail immediately 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1715617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uwe Schindler 2015-11-22 10:27:57 +00:00
parent f4fe17cce8
commit 24bc7b1edd
3 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/CHANGES.txt
View File

@ -372,6 +372,9 @@ Other
* LUCENE-6893: factor out CorePlusQueriesParser from CorePlusExtensionsParser
(Christine Poerschke)
* LUCENE-6902: Don't retry to fsync files / directories; fail
immediately. (Daniel Mitterdorfer, Uwe Schindler)
Build
* LUCENE-6732: Improve checker for invalid source patterns to also

44
lucene/core/src/java/org/apache/lucene/util/IOUtils.java
View File

@ -414,46 +414,22 @@ public final class IOUtils {
* because not all file systems and operating systems allow to fsync on a directory)
*/
public static void fsync(Path fileToSync, boolean isDir) throws IOException {
IOException exc = null;
// If the file is a directory we have to open read-only, for regular files we must open r/w for the fsync to have an effect.
// See http://blog.httrack.com/blog/2013/11/15/everything-you-always-wanted-to-know-about-fsync/
try (final FileChannel file = FileChannel.open(fileToSync, isDir ? StandardOpenOption.READ : StandardOpenOption.WRITE)) {
for (int retry = 0; retry < 5; retry++) {
try {
file.force(true);
return;
} catch (IOException ioe) {
if (exc == null) {
exc = ioe;
}
try {
// Pause 5 msec
Thread.sleep(5L);
} catch (InterruptedException ie) {
ThreadInterruptedException ex = new ThreadInterruptedException(ie);
ex.addSuppressed(exc);
throw ex;
}
}
}
file.force(true);
} catch (IOException ioe) {
if (exc == null) {
exc = ioe;
if (isDir) {
// TODO: LUCENE-6169 - Fix this assert once Java 9 problems are solved!
assert (Constants.LINUX || Constants.MAC_OS_X) == false || Constants.JRE_IS_MINIMUM_JAVA9 :
"On Linux and MacOSX fsyncing a directory should not throw IOException, "+
"we just don't want to rely on that in production (undocumented). Got: " + ioe;
// Ignore exception if it is a directory
return;
}
// Throw original exception
throw ioe;
}
if (isDir) {
// TODO: LUCENE-6169 - Fix this assert once Java 9 problems are solved!
assert (Constants.LINUX || Constants.MAC_OS_X) == false || Constants.JRE_IS_MINIMUM_JAVA9 :
"On Linux and MacOSX fsyncing a directory should not throw IOException, "+
"we just don't want to rely on that in production (undocumented). Got: " + exc;
// Ignore exception if it is a directory
return;
}
// Throw original exception
throw exc;
}
/** If the dir is an {@link FSDirectory} or wraps one via possibly

24
lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java
View File

@ -466,4 +466,28 @@ public class TestIOUtils extends LuceneTestCase {
assertFalse(IOUtils.spinsLinux(mockPath));
}
public void testFsyncDirectory() throws Exception {
Path dir = createTempDir();
dir = FilterPath.unwrap(dir).toRealPath();
Path devdir = dir.resolve("dev");
Files.createDirectories(devdir);
IOUtils.fsync(devdir, true);
// no exception
}
public void testFsyncFile() throws Exception {
Path dir = createTempDir();
dir = FilterPath.unwrap(dir).toRealPath();
Path devdir = dir.resolve("dev");
Files.createDirectories(devdir);
Path somefile = devdir.resolve("somefile");
try (OutputStream o = Files.newOutputStream(somefile)) {
o.write("0\n".getBytes(StandardCharsets.US_ASCII));
}
IOUtils.fsync(somefile, false);
// no exception
}
}