The default WindowCache configuration is:
packedGitLimit: 10 MB
packedGitWindowSize: 8 KB
10 MB / 8 KB allows up to 1280 windows permitted in the WindowCache
at any given time. If every window came from a unique pack file, we
need 1280 file descriptors just for the resources in the WindowCache.
For most applications this is way beyond the hard limit configured
for the host JVM, causing java.io.IOException("Too many open files")
from possibly any part of JGit or the host application.
Specifically, I ran into this problem in Gerrit Code Review, where we
commonly see hundreds of very small pack files spread over hundreds
of Git repositories, all accessed from a persistent JVM that is also
hosting an SSH daemon and a web server. The aggressive caching of
windows in the WindowCache and of Repository objects in Gerrit's
own RepositoryCache caused us to retain far too many tiny pack files.
We now set the limit at 128 open files, assuming this is a reasonable
limit for most applications using the library. Git repositories tend
to be in the handful of packs/repository (e.g. <10 packs/repository)
and applications using JGit tend to access only a handful of Git
repositories at a time (e.g. <10 repositories/JVM).
If we detect a file open failure while opening a pack we halve
the number of permitted open files and try again, until we reach
a lower bound of 16 open files. Needing to go lower may indicate
a file descriptor leak in the host application.
Signed-off-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
---
.../src/org/spearce/jgit/lib/WindowCache.java | 65 +++++++++++++++-----
.../org/spearce/jgit/lib/WindowCacheConfig.java | 20 ++++++
2 files changed, 70 insertions(+), 15 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCache.java b/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCache.java
index ba1124a..13912a7 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCache.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCache.java
@@ -54,6 +54,8 @@ private static final int bits(int newSize) {
return Integer.numberOfTrailingZeros(newSize);
}
+ private static int maxFileCount;
+
private static int maxByteCount;
private static int windowSize;
@@ -70,10 +72,13 @@ private static final int bits(int newSize) {
private static ByteWindow lruTail;
+ private static int openFileCount;
+
private static int openByteCount;
static {
final WindowCacheConfig c = new WindowCacheConfig();
+ maxFileCount = c.getPackedGitOpenFiles();
maxByteCount = c.getPackedGitLimit();
windowSizeShift = bits(c.getPackedGitWindowSize());
windowSize = 1 << windowSizeShift;
@@ -133,6 +138,13 @@ private static synchronized void reconfigureImpl(final WindowCacheConfig cfg) {
boolean prune = false;
boolean evictAll = false;
+ if (maxFileCount < cfg.getPackedGitOpenFiles())
+ maxFileCount = cfg.getPackedGitOpenFiles();
+ else if (maxFileCount > cfg.getPackedGitOpenFiles()) {
+ maxFileCount = cfg.getPackedGitOpenFiles();
+ prune = true;
+ }
+
if (maxByteCount < cfg.getPackedGitLimit()) {
maxByteCount = cfg.getPackedGitLimit();
} else if (maxByteCount > cfg.getPackedGitLimit()) {
@@ -229,20 +241,37 @@ private static synchronized final void getImpl(final WindowCursor curs,
}
if (wp.openCount == 0) {
- try {
- wp.openCount = 1;
- wp.cacheOpen();
- } catch (IOException ioe) {
- wp.openCount = 0;
- throw ioe;
- } catch (RuntimeException ioe) {
- wp.openCount = 0;
- throw ioe;
- } catch (Error ioe) {
- wp.openCount = 0;
- throw ioe;
- } finally {
- wp.openCount--;
+ TRY_OPEN: for (;;) {
+ try {
+ openFileCount++;
+ releaseMemory();
+ runClearedWindowQueue();
+ wp.openCount = 1;
+ wp.cacheOpen();
+ break;
+ } catch (IOException ioe) {
+ openFileCount--;
+ if ("Too many open files".equals(ioe.getMessage())
+ && maxFileCount > 16) {
+ // We may be able to recover by halving our limit
+ // and trying again.
+ //
+ maxFileCount = Math.max(16, maxFileCount >> 2);
+ continue TRY_OPEN;
+ }
+ wp.openCount = 0;
+ throw ioe;
+ } catch (RuntimeException ioe) {
+ openFileCount--;
+ wp.openCount = 0;
+ throw ioe;
+ } catch (Error ioe) {
+ openFileCount--;
+ wp.openCount = 0;
+ throw ioe;
+ } finally {
+ wp.openCount--;
+ }
}
// The cacheOpen may have mapped the window we are trying to
@@ -278,6 +307,7 @@ private static synchronized final void getImpl(final WindowCursor curs,
static synchronized void markLoaded(final ByteWindow w) {
if (--w.provider.openCount == 0) {
+ openFileCount--;
w.provider.cacheClose();
}
}
@@ -291,13 +321,17 @@ private static void makeMostRecent(ByteWindow<?> e) {
private static void releaseMemory() {
ByteWindow<?> e = lruTail;
- while (openByteCount > maxByteCount && e != null) {
+ while (isOverLimit() && e != null) {
final ByteWindow<?> p = e.lruPrev;
clear(e);
e = p;
}
}
+ private static boolean isOverLimit() {
+ return openByteCount > maxByteCount || openFileCount > maxFileCount;
+ }
+
/**
* Remove all windows associated with a specific provider.
* <p>
@@ -341,6 +375,7 @@ private static void clear(final ByteWindow<?> e) {
private static void unlinkSize(final ByteWindow<?> e) {
if (e.sizeActive) {
if (--e.provider.openCount == 0) {
+ openFileCount--;
e.provider.cacheClose();
}
openByteCount -= e.size;
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCacheConfig.java b/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCacheConfig.java
index b4c4638..d906a7c 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCacheConfig.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/WindowCacheConfig.java
@@ -45,6 +45,8 @@
/** 1024 {@link #KB} (number of bytes in one mebibyte/megabyte) */
public static final int MB = 1024 * KB;
+ private int packedGitOpenFiles;
+
private int packedGitLimit;
private int packedGitWindowSize;
@@ -55,6 +57,7 @@
/** Create a default configuration. */
public WindowCacheConfig() {
+ packedGitOpenFiles = 128;
packedGitLimit = 10 * MB;
packedGitWindowSize = 8 * KB;
packedGitMMAP = false;
@@ -62,6 +65,23 @@ public WindowCacheConfig() {
}
/**
+ * @return maximum number of streams to open at a time. Open packs count
+ * against the process limits. <b>Default is 128.</b>
+ */
+ public int getPackedGitOpenFiles() {
+ return packedGitOpenFiles;
+ }
+
+ /**
+ * @param fdLimit
+ * maximum number of streams to open at a time. Open packs count
+ * against the process limits
+ */
+ public void setPackedGitOpenFiles(final int fdLimit) {
+ packedGitOpenFiles = fdLimit;
+ }
+
+ /**
* @return maximum number bytes of heap memory to dedicate to caching pack
* file data. <b>Default is 10 MB.</b>
*/
--
1.6.2.1.286.g8173
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
