From 0a8225c9469a29f6133ddd31c8cc0624d6a1de97 Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Wed, 12 Nov 2008 03:43:10 +0000
Subject: [PATCH] Fixed an issue where adding a local backend with dsconfig resulted in a number of erroneous messages printed to the error log.
---
opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index ac18901..4f0cb6e 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -58,6 +58,7 @@
import org.opends.messages.MessageBuilder;
import static org.opends.server.loggers.debug.DebugLogger.*;
import org.opends.server.loggers.debug.DebugTracer;
+import static org.opends.server.loggers.ErrorLogger.logError;
import static org.opends.server.util.ServerConstants.*;
import org.opends.server.admin.std.server.LocalDBBackendCfg;
import org.opends.server.admin.std.server.LocalDBIndexCfg;
@@ -225,6 +226,12 @@
AttributeIndex index =
new AttributeIndex(cfg, state, env, EntryContainer.this);
index.open();
+ if(!index.isTrusted())
+ {
+ adminActionRequired = true;
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ cfg.getAttribute().getNameOrOID()));
+ }
attrIndexMap.put(cfg.getAttribute(), index);
}
catch(Exception e)
@@ -236,9 +243,6 @@
return ccr;
}
- adminActionRequired = true;
- messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
- cfg.getAttribute().getNameOrOID()));
return new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired,
messages);
}
@@ -375,6 +379,12 @@
{
VLVIndex vlvIndex = new VLVIndex(cfg, state, env, EntryContainer.this);
vlvIndex.open();
+ if(!vlvIndex.isTrusted())
+ {
+ adminActionRequired = true;
+ messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ cfg.getName()));
+ }
vlvIndexMap.put(cfg.getName().toLowerCase(), vlvIndex);
}
catch(Exception e)
@@ -386,10 +396,6 @@
return ccr;
}
- adminActionRequired = true;
-
- messages.add(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
- cfg.getName()));
return new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired,
messages);
}
@@ -540,12 +546,25 @@
config.getIndexEntryLimit(), 0, true,
env,this);
id2children.open();
+
+ if(!id2children.isTrusted())
+ {
+ logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ id2children.getName()));
+ }
+
id2subtree = new Index(databasePrefix + "_" + ID2SUBTREE_DATABASE_NAME,
new ID2SIndexer(), state,
config.getIndexEntryLimit(), 0, true,
env, this);
id2subtree.open();
+ if(!id2subtree.isTrusted())
+ {
+ logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ id2subtree.getName()));
+ }
+
dn2uri = new DN2URI(databasePrefix + "_" + REFERRAL_DATABASE_NAME,
env, this);
dn2uri.open();
@@ -554,11 +573,14 @@
{
LocalDBIndexCfg indexCfg = config.getLocalDBIndex(idx);
- //TODO: When issue 1793 is fixed, use inherited default values in
- //admin framework instead for the entry limit.
AttributeIndex index =
new AttributeIndex(indexCfg, state, env, this);
index.open();
+ if(!index.isTrusted())
+ {
+ logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ index.getName()));
+ }
attrIndexMap.put(indexCfg.getAttribute(), index);
}
@@ -568,6 +590,13 @@
VLVIndex vlvIndex = new VLVIndex(vlvIndexCfg, state, env, this);
vlvIndex.open();
+
+ if(!vlvIndex.isTrusted())
+ {
+ logError(NOTE_JEB_INDEX_ADD_REQUIRES_REBUILD.get(
+ vlvIndex.getName()));
+ }
+
vlvIndexMap.put(vlvIndexCfg.getName().toLowerCase(), vlvIndex);
}
}
--
Gitblit v1.10.0