From 86d6566a6943c86d19f1a2bfd2ccd82d97223804 Mon Sep 17 00:00:00 2001
From: coulbeck <coulbeck@localhost>
Date: Tue, 10 Jul 2007 20:40:52 +0000
Subject: [PATCH] Fix for issue #1957: import from LDIF is too verbose.
---
opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java | 33 +++++++++-------
opends/src/server/org/opends/server/messages/JebMessages.java | 2
opends/src/server/org/opends/server/backends/jeb/BackendImpl.java | 10 +++--
opends/src/server/org/opends/server/backends/jeb/ImportJob.java | 23 +++++------
4 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
index b5e2aad..eae4c00 100644
--- a/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
+++ b/opends/src/server/org/opends/server/backends/jeb/BackendImpl.java
@@ -1162,10 +1162,12 @@
rootContainer = null;
// Sync the environment to disk.
- int msgID = MSGID_JEB_IMPORT_CLOSING_DATABASE;
- String message = getMessage(msgID);
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_IMPORT_CLOSING_DATABASE;
+ String message = getMessage(msgID);
+ TRACER.debugInfo(message);
+ }
}
catch (DatabaseException de)
{
diff --git a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
index 41cc438..8e077a1 100644
--- a/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
+++ b/opends/src/server/org/opends/server/backends/jeb/ImportJob.java
@@ -173,19 +173,17 @@
logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
message, msgID);
- msgID = MSGID_JEB_IMPORT_BUFFER_SIZE;
- message = getMessage(msgID, bufferSize);
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ msgID = MSGID_JEB_IMPORT_BUFFER_SIZE;
+ message = getMessage(msgID, bufferSize);
+ TRACER.debugInfo(message);
- msgID = MSGID_JEB_IMPORT_ENVIRONMENT_CONFIG;
- message = getMessage(msgID,
- rootContainer.getEnvironmentConfig().toString());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
-
- TRACER.debugInfo(
- rootContainer.getEnvironmentConfig().toString());
+ msgID = MSGID_JEB_IMPORT_ENVIRONMENT_CONFIG;
+ message = getMessage(msgID,
+ rootContainer.getEnvironmentConfig().toString());
+ TRACER.debugInfo(message);
+ }
// Create the import contexts for each base DN.
DN baseDN;
@@ -324,7 +322,6 @@
// Create merge threads for each base DN.
for (ImportContext importContext : importMap.values())
{
- String containerName = importContext.getContainerName();
EntryContainer entryContainer = importContext.getEntryContainer();
// For each configured attribute index.
diff --git a/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java b/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
index 3f1d131..53ac583 100644
--- a/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
+++ b/opends/src/server/org/opends/server/backends/jeb/IndexMergeThread.java
@@ -28,8 +28,6 @@
import org.opends.server.api.DirectoryThread;
import org.opends.server.protocols.asn1.ASN1OctetString;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
import org.opends.server.types.LDIFImportConfig;
import com.sleepycat.je.*;
@@ -49,7 +47,6 @@
import org.opends.server.types.DebugLogLevel;
import static org.opends.server.messages.MessageHandler.getMessage;
-import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
import static org.opends.server.messages.JebMessages.*;
@@ -193,17 +190,21 @@
if (files == null || files.length == 0)
{
- int msgID = MSGID_JEB_INDEX_MERGE_NO_DATA;
- String message = getMessage(msgID, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_NO_DATA;
+ String message = getMessage(msgID, index.getName());
+ TRACER.debugInfo(message);
+ }
return;
}
- int msgID = MSGID_JEB_INDEX_MERGE_START;
- String message = getMessage(msgID, files.length, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_START;
+ String message = getMessage(msgID, files.length, index.getName());
+ TRACER.debugInfo(message);
+ }
MergeReader[] readers = new MergeReader[files.length];
@@ -343,10 +344,12 @@
}
}
- msgID = MSGID_JEB_INDEX_MERGE_COMPLETE;
- message = getMessage(msgID, index.getName());
- logError(ErrorLogCategory.BACKEND, ErrorLogSeverity.NOTICE,
- message, msgID);
+ if (debugEnabled())
+ {
+ int msgID = MSGID_JEB_INDEX_MERGE_COMPLETE;
+ String message = getMessage(msgID, index.getName());
+ TRACER.debugInfo(message);
+ }
}
/**
diff --git a/opends/src/server/org/opends/server/messages/JebMessages.java b/opends/src/server/org/opends/server/messages/JebMessages.java
index 1e5b8fc..b10809a 100644
--- a/opends/src/server/org/opends/server/messages/JebMessages.java
+++ b/opends/src/server/org/opends/server/messages/JebMessages.java
@@ -1426,7 +1426,7 @@
"Exported %d records and skipped %d " +
"(recent rate %.1f/sec)");
registerMessage(MSGID_JEB_IMPORT_THREAD_COUNT,
- "Import thread count = %d");
+ "Starting LDIF import (using %d threads)");
registerMessage(MSGID_JEB_IMPORT_BUFFER_SIZE,
"Buffer size per thread = %,d");
registerMessage(MSGID_JEB_IMPORT_LDIF_PROCESSING_TIME,
--
Gitblit v1.10.0