From ee4083198254f11548216ed5321195b0d21f0136 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Thu, 16 Jun 2016 09:14:13 +0000
Subject: [PATCH] OPENDJ-2764: rebuild-index: Wrong off-heap memory computation.
---
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
index 4417fb4..798ccf4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java
@@ -309,7 +309,18 @@
rootContainer.getStorage().close();
final int threadCount = Runtime.getRuntime().availableProcessors();
final int nbBuffer = 2 * indexesToRebuild.size() * threadCount;
- final int bufferSize = computeBufferSize(nbBuffer);
+ final int bufferSize;
+ if (BufferPool.SUPPORTS_OFF_HEAP)
+ {
+ bufferSize = MAX_BUFFER_SIZE;
+ logger.info(NOTE_IMPORT_LDIF_OFFHEAP_MEM_BUF_INFO,
+ DB_CACHE_SIZE, (((long) bufferSize) * nbBuffer) / MB, nbBuffer, bufferSize / KB);
+ }
+ else
+ {
+ bufferSize = computeBufferSize(nbBuffer);
+ logger.info(NOTE_IMPORT_LDIF_DB_MEM_BUF_INFO, DB_CACHE_SIZE, bufferSize);
+ }
final ExecutorService sorter = Executors.newFixedThreadPool(
Runtime.getRuntime().availableProcessors(),
--
Gitblit v1.10.0