From 9e28ae3135ebfb043988c89b6b2f8cfd9b4065ff Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:18:53 +0000
Subject: [PATCH] Memory budgeting now accounts for the buffers allocated for writing the temp files.
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
index d74266c..cbad1a3 100644
--- a/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java
@@ -361,7 +361,7 @@
for(;threadCount > 0; threadCount--)
{
phaseOneBufferCount = 2 * (indexCount * threadCount);
- bufferSize = (int) (availMem / phaseOneBufferCount);
+ bufferSize = (int) (availMem/ ((4 * indexCount) + phaseOneBufferCount));
if(bufferSize >= MIN_BUFFER_SIZE)
{
break;
@@ -376,7 +376,7 @@
private boolean getBufferSizes(long availMem)
{
boolean maxBuf = false;
- bufferSize = (int) (availMem/ phaseOneBufferCount);
+ bufferSize = (int) (availMem / ((4 * indexCount) + phaseOneBufferCount));
if(bufferSize >= MIN_BUFFER_SIZE)
{
if(bufferSize > MAX_BUFFER_SIZE)
--
Gitblit v1.10.0