From 6f8b95863248de31df15db6d77317baf82a2b2c6 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 22 Dec 2015 13:56:26 +0000
Subject: [PATCH] OPENDJ-2570 - rebuild-index --rebuildDegraded fails if no indexes are degraded. OnDiskMergeImporter.java : Detect an empty index list and log a message.
---
opendj-server-legacy/src/messages/org/opends/messages/backend.properties | 1 +
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/OnDiskMergeImporter.java | 5 +++++
2 files changed, 6 insertions(+), 0 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 48c48cc..14dc106 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
@@ -291,6 +291,11 @@
private void rebuildIndex(EntryContainer entryContainer, String tmpDirectory, Set<String> indexesToRebuild,
long totalEntries) throws Exception
{
+ if (indexesToRebuild.isEmpty())
+ {
+ logger.info(NOTE_REBUILD_NOTHING_TO_REBUILD);
+ return;
+ }
rootContainer.getStorage().close();
final long availableMemory = calculateAvailableMemory();
final int threadCount = Runtime.getRuntime().availableProcessors();
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/backend.properties b/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
index 1985863..f795e42 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/backend.properties
@@ -1359,3 +1359,4 @@
ERR_VERIFY_ID2COUNT_WRONG_COUNT_596=File id2childrenCount has wrong number of \
children for DN <%s> (got %d, expecting %d)
ERR_VERIFY_ID2COUNT_WRONG_ID_597=File id2ChildrenCount references non-existing EntryID <%d>.
+NOTE_REBUILD_NOTHING_TO_REBUILD_598=Rebuilding index finished: no indexes to rebuild.
\ No newline at end of file
--
Gitblit v1.10.0