From 328ec50e683c622586d30aeb9dee55bebdebfe0c Mon Sep 17 00:00:00 2001
From: dugan <dugan@localhost>
Date: Fri, 24 Jul 2009 22:32:43 +0000
Subject: [PATCH] Commit of new import code.

---
 opends/src/messages/messages/jeb.properties |   45 +++++++++++++++++++++++----------------------
 1 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/opends/src/messages/messages/jeb.properties b/opends/src/messages/messages/jeb.properties
index c128494..97f7497 100644
--- a/opends/src/messages/messages/jeb.properties
+++ b/opends/src/messages/messages/jeb.properties
@@ -178,7 +178,10 @@
 NOTICE_JEB_EXPORT_PROGRESS_REPORT_88=Exported %d records and skipped %d (recent \
  rate %.1f/sec)
 NOTICE_JEB_IMPORT_THREAD_COUNT_89=Import Thread Count: %d threads
-INFO_JEB_IMPORT_BUFFER_SIZE_90=Buffer size per thread = %,d
+
+SEVERE_ERR_IMPORT_LDIF_LACK_MEM_90=Insufficiant free memory to perform import. \
+At least %dMB of free memory is required
+
 INFO_JEB_IMPORT_LDIF_PROCESSING_TIME_91=LDIF processing took %d seconds
 INFO_JEB_IMPORT_INDEX_PROCESSING_TIME_92=Index processing took %d seconds
 NOTICE_JEB_IMPORT_CLOSING_DATABASE_93=Flushing data to disk
@@ -276,8 +279,8 @@
  the import process can start
 SEVERE_ERR_JEB_IMPORT_THREAD_EXCEPTION_153=An error occurred in import thread \
  %s: %s. The thread can not continue
-SEVERE_ERR_JEB_IMPORT_NO_WORKER_THREADS_154=There are no more import worker \
- threads to process the imported entries
+NOTICE_JEB_IMPORT_LDIF_PHASE_TWO_REPORT_154=Index %s: bytes left = %d, \
+key processed rate = %.1f/sec
 SEVERE_ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR_155=Unable to create the temporary \
  directory %s
 SEVERE_ERR_JEB_INVALID_LOGGING_LEVEL_156=The database logging level string \
@@ -326,27 +329,25 @@
 NOTICE_JEB_IMPORT_STARTING_173=%s starting import (build %s, R%d)
 SEVERE_ERR_JEB_DIRECTORY_DOES_NOT_EXIST_174=The backend database directory \
  '%s' does not exist
-SEVERE_ERR_JEB_IMPORT_LDIF_ABORT_175=The import was aborted because an \
-  uncaught exception was thrown during processing
+SEVERE_ERR_JEB_IMPORT_LDIF_INDEX_FILEWRITER_ERR_175=The following I/O \
+error was received while processing the %s index scratch file: %s
 NOTICE_JEB_IMPORT_LDIF_ROOTCONTAINER_CLOSE_176=Import LDIF environment close \
   took %d seconds
-NOTICE_JEB_IMPORT_LDIF_BUFFER_FLUSH_177=Begin substring buffer flush of %d \
-  elements. Buffer total access: %d  buffer hits: %d
-NOTICE_JEB_IMPORT_LDIF_BUFFER_FLUSH_COMPLETED_178=Substring buffer flush \
-  completed in %d seconds
-NOTICE_JEB_IMPORT_LDIF_FINAL_CLEAN_179=Begin final cleaner run
-NOTICE_JEB_IMPORT_LDIF_CLEAN_180=Begin cleaner run
-NOTICE_JEB_IMPORT_LDIF_CLEANER_RUN_DONE_181=Cleaner run took %d seconds %d logs \
-  removed
-NOTICE_JEB_IMPORT_LDIF_CLEANER_REMOVE_LOGS_182=Cleaner will remove %d logs
-NOTICE_JEB_IMPORT_LDIF_BUFFER_TOT_AVAILMEM_184=Available buffer memory %d bytes is \
-  below the minimum value of %d bytes. Setting available buffer memory to \
-  the minimum
-NOTICE_JEB_IMPORT_LDIF_MEMORY_INFO_185=Setting DB cache to %d bytes and \
-  internal buffer to %d bytes
-NOTICE_JEB_IMPORT_LDIF_BUFFER_CONTEXT_AVAILMEM_186=Available buffer memory %d \
-  bytes is below the minimum value of %d bytes allowed for a single import \
-  context. Setting context available buffer memory to the minimum
+NOTICE_JEB_IMPORT_LDIF_DN_NO_PARENT_177=The DN %s was found to be missing \
+a parent during the phase two parent check
+NOTICE_JEB_IMPORT_LDIF_DN_CLOSE_178=DN phase two processing completed. \
+Processed %d DNs
+NOTICE_JEB_IMPORT_LDIF_INDEX_CLOSE_179=Index %s phase two processing completed
+SEVERE_ERR_EXECUTION_ERROR_180=Execution error during backend operation: %s
+SEVERE_ERR_INTERRUPTED_ERROR_181=Interrupted error during backend operation: %s
+NOTICE_JEB_IMPORT_LDIF_TRUSTED_FAILED_182=Setting indexes trusted failed \
+for the following reason: %s
+NOTICE_JEB_IMPORT_LDIF_LOG_BYTES_184=Setting DB log byte size to %d bytes
+NOTICE_JEB_IMPORT_LDIF_DB_MEM_BUF_INFO_185=Setting DB cache size to %d bytes \
+ and phase one buffer size to to %d bytes
+NOTICE_JEB_IMPORT_LDIF_TOT_MEM_BUF_186=The amount of freeemory available to \
+the import task is %d bytes. The number of phase one buffers required is \
+%d buffers
 NOTICE_JEB_IMPORT_LDIF_BUFFER_CHECKPOINTS_187=Checkpoints performed: %d
 NOTICE_JEB_IMPORT_LDIF_CLEANER_STATS_188=Cleaner runs: %d files deleted: %d \
   entries read: %d IN nodes cleaned: %d

--
Gitblit v1.10.0