From db4562c1de42de3e2e9d2fcc45816ad302a77189 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 04 Mar 2013 12:25:31 +0000
Subject: [PATCH] OPENDJ-770 Simplify the "rebuild-index --clearDegradedState" command output - If in cleardegradedState mode, output just displays the following msg "Degraded state of index(es) [indexe(s) name] has been removed".
---
opends/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java | 30 +++++++++++++++++++++++-------
opends/src/messages/messages/jeb.properties | 3 ++-
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/opends/src/messages/messages/jeb.properties b/opends/src/messages/messages/jeb.properties
index fa9c435..1cd74b3 100644
--- a/opends/src/messages/messages/jeb.properties
+++ b/opends/src/messages/messages/jeb.properties
@@ -451,4 +451,5 @@
disabled for database backend %s
NOTICE_JEB_REBUILD_DEGRADED_START_231=Rebuild of all degraded indexes started \
with %d total entries to process
-
+NOTICE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS_232=Degraded state of \
+index(es) : %s has been removed
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 c3cc9b9..1d2a054 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
@@ -3194,7 +3194,7 @@
}
totalEntries = suffix.getID2Entry().getRecordCount();
- Message message;
+ Message message = null;
switch (rebuildConfig.getRebuildMode())
{
case ALL:
@@ -3204,10 +3204,15 @@
message = NOTE_JEB_REBUILD_DEGRADED_START.get(totalEntries);
break;
default:
- message = NOTE_JEB_REBUILD_START.get(sb.toString(), totalEntries);
+ if (!rebuildConfig.isClearDegradedState())
+ {
+ message = NOTE_JEB_REBUILD_START.get(sb.toString(), totalEntries);
+ }
break;
}
- logError(message);
+ if ( message != null ) {
+ logError(message);
+ }
}
/**
@@ -3225,10 +3230,14 @@
{
rate = 1000f * entriesProcessed.get() / totalTime;
}
- Message message =
- NOTE_JEB_REBUILD_FINAL_STATUS.get(entriesProcessed.get(),
- totalTime / 1000, rate);
- logError(message);
+
+ if (!rebuildConfig.isClearDegradedState())
+ {
+ Message message =
+ NOTE_JEB_REBUILD_FINAL_STATUS.get(entriesProcessed.get(),
+ totalTime / 1000, rate);
+ logError(message);
+ }
}
/**
@@ -3306,6 +3315,13 @@
}
phaseTwo();
}
+ else
+ {
+ Message message =
+ NOTE_JEB_REBUILD_CLEARDEGRADEDSTATE_FINAL_STATUS.get(
+ rebuildConfig.getRebuildList().toString());
+ logError(message);
+ }
setRebuildListIndexesTrusted(true);
}
--
Gitblit v1.10.0