mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Fabio Pistolesi
11.48.2015 d12cc90fc15f432f43abc394b4090f9b4f7b2a03
OPENDJ-1869 CR-6727 Fix NPE in EntryCachePreloader.EntryCacheCollector

Entry Cache Preloading is now not supported anymore. Feature and configuration are deleted.
3 files deleted
31 files modified
1160 ■■■■■ changed files
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml 23 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/resource/config/config.ldif 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/resource/schema/02-config.ldif 7 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_de.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_es.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_fr.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_ja.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_ko.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_zh_CN.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_zh_TW.properties 1 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/docbkx/admin-guide/chap-tuning.xml 21 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java 14 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java 7 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java 7 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java 8 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryCachePreloader.java 377 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java 9 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java 324 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java 7 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java 24 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java 6 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java 16 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java 248 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/tests/unit-tests-testng/resource/config-small.ldif 3 ●●●● patch | view | raw | blame | history
opendj-maven-plugin/src/main/resources/config/xml/org/forgerock/opendj/server/config/GlobalConfiguration.xml
@@ -23,7 +23,7 @@
  !
  !
  !      Copyright 2007-2010 Sun Microsystems, Inc.
  !      Portions Copyright 2011-2014 ForgeRock AS
  !      Portions Copyright 2011-2015 ForgeRock AS
  ! -->
<adm:managed-object name="global" plural-name="globals"
  package="org.forgerock.opendj.server.config"
@@ -799,27 +799,6 @@
      </ldap:attribute>
    </adm:profile>
  </adm:property>
  <adm:property name="entry-cache-preload" mandatory="false">
    <adm:synopsis>
      Indicates whether or not to preload the entry cache on startup.
    </adm:synopsis>
    <adm:requires-admin-action>
      <adm:server-restart />
    </adm:requires-admin-action>
    <adm:default-behavior>
      <adm:defined>
        <adm:value>false</adm:value>
      </adm:defined>
    </adm:default-behavior>
    <adm:syntax>
      <adm:boolean />
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:name>ds-cfg-entry-cache-preload</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>
  <adm:property name="max-allowed-client-connections">
    <adm:synopsis>
      Specifies the maximum number of client connections that may be
opendj-server-legacy/resource/config/config.ldif
@@ -51,7 +51,6 @@
ds-cfg-idle-time-limit: 0 seconds
ds-cfg-save-config-on-successful-startup: true
ds-cfg-etime-resolution: milliseconds
ds-cfg-entry-cache-preload: false
ds-cfg-max-allowed-client-connections: 0
ds-cfg-max-psearches: -1
ds-cfg-allowed-task: org.opends.server.tasks.AddSchemaFileTask
opendj-server-legacy/resource/schema/02-config.ldif
@@ -2577,12 +2577,6 @@
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.446
  NAME 'ds-cfg-entry-cache-preload'
  EQUALITY booleanMatch
  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
  SINGLE-VALUE
  X-ORIGIN 'OpenDS Directory Server' )
attributeTypes: ( 1.3.6.1.4.1.26027.1.1.447
  NAME 'ds-cfg-num-update-replay-threads'
  EQUALITY integerMatch
@@ -4245,7 +4239,6 @@
        ds-cfg-workflow-configuration-mode $
        ds-cfg-save-config-on-successful-startup $
        ds-cfg-etime-resolution $
        ds-cfg-entry-cache-preload $
        ds-cfg-max-allowed-client-connections $
        ds-cfg-max-psearches $
        ds-cfg-max-internal-buffer-size )
opendj-server-legacy/src/admin/messages/GlobalCfgDefn.properties
@@ -40,7 +40,6 @@
property.disabled-privilege.syntax.enumeration.value.subentry-write.synopsis=Allows the associated user to perform LDAP subentry write operations.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Allows the user to request that the server process a search that cannot be optimized using server indexes.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Allows the user to make changes to the server schema.
property.entry-cache-preload.synopsis=Indicates whether or not to preload the entry cache on startup.
property.etime-resolution.synopsis=Specifies the resolution to use for operation elapsed processing time (etime) measurements.
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Use millisecond resolution.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Use nanosecond resolution.
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_de.properties
@@ -37,7 +37,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=Erlaubt dem Benutzer, vom Server Herunterfahren anzufordern.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Erlaubt dem Benutzer vom Server das Verarbeiten einer Suche anzufordern, die nicht mithilfe von Serverindizes optimiert werden kann.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Erlaubt dem Benutzer, \u00c4nderungen am Serverschema vorzunehmen.
property.entry-cache-preload.synopsis=Gibt an, ob der Eintragscache beim Start vorab geladen werden soll.
property.etime-resolution.synopsis=Gibt die Aufl\u00f6sung f\u00fcr Messungen der verstrichenen Vorgangsverarbeitungszeit (etime) an.
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Millisekundenaufl\u00f6sung verwenden.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Nanosekundenaufl\u00f6sung verwenden.
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_es.properties
@@ -37,7 +37,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=Permite al usuario solicitar el cierre del servidor.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Permite al usuario solicitar el procesamiento por parte del servidor de una b\u00fasqueda que no se optimice mediante \u00edndices de b\u00fasqueda.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Permite al usuario realizar cambios en el esquema del servidor.
property.entry-cache-preload.synopsis=Indica si se ha cargado previamente la cach\u00e9 de entrada durante el inicio.
property.etime-resolution.synopsis=Especifica la resoluci\u00f3n que se utilizar\u00e1 para las mediciones de tiempo de procesamiento de operaciones transcurrido ("etime").
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Utilizar una resoluci\u00f3n de milisegundos.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Utilizar una resoluci\u00f3n de nanosegundos.
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_fr.properties
@@ -37,7 +37,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=Autorise l'utilisateur \u00e0 demander la fermeture du serveur.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Autorise l'utilisateur \u00e0 demander que le serveur traite une recherche qui ne peut \u00eatre optimis\u00e9e en utilisant des index de serveur.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Autorise un utilisateur \u00e0 faire des modifications \u00e0 un sch\u00e9ma de serveur.
property.entry-cache-preload.synopsis=Indique s'il faut (ou non) pr\u00e9charger le cache d'entr\u00e9e au d\u00e9marrage.
property.etime-resolution.synopsis=Sp\u00e9cifie la r\u00e9solution \u00e0 utiliser pour des mesures de temps de traitement \u00e9coul\u00e9 (etime) pour une op\u00e9ration.
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Utiliser la r\u00e9solution en millisecondes.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Utiliser la r\u00e9solution en nanosecondes.
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_ja.properties
@@ -37,7 +37,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=\u30b5\u30fc\u30d0\u30fc\u304c\u30b7\u30e3\u30c3\u30c8\u30c0\u30a6\u30f3\u3059\u308b\u3088\u3046\u306b\u30e6\u30fc\u30b6\u30fc\u304c\u8981\u6c42\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=\u30b5\u30fc\u30d0\u30fc\u30a4\u30f3\u30c7\u30c3\u30af\u30b9\u3092\u4f7f\u7528\u3057\u3066\u6700\u9069\u5316\u3067\u304d\u306a\u3044\u691c\u7d22\u3092\u30b5\u30fc\u30d0\u30fc\u304c\u51e6\u7406\u3059\u308b\u3088\u3046\u306b\u30e6\u30fc\u30b6\u30fc\u304c\u8981\u6c42\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=\u30e6\u30fc\u30b6\u30fc\u304c\u30b5\u30fc\u30d0\u30fc\u30b9\u30ad\u30fc\u30de\u3092\u5909\u66f4\u3067\u304d\u308b\u3088\u3046\u306b\u3057\u307e\u3059\u3002
property.entry-cache-preload.synopsis=\u8d77\u52d5\u6642\u306b\u30a8\u30f3\u30c8\u30ea\u30ad\u30e3\u30c3\u30b7\u30e5\u3092\u30d7\u30ea\u30ed\u30fc\u30c9\u3059\u308b\u304b\u3069\u3046\u304b\u3092\u793a\u3057\u307e\u3059\u3002
property.etime-resolution.synopsis=\u64cd\u4f5c\u306e\u51e6\u7406\u7d4c\u904e\u6642\u9593 (etime) \u306e\u6e2c\u5b9a\u306b\u4f7f\u7528\u3059\u308b\u89e3\u50cf\u5ea6\u3092\u6307\u5b9a\u3057\u307e\u3059\u3002
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=\u30df\u30ea\u79d2\u306e\u89e3\u50cf\u5ea6\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=\u30ca\u30ce\u79d2\u306e\u89e3\u50cf\u5ea6\u3092\u4f7f\u7528\u3057\u307e\u3059\u3002
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_ko.properties
@@ -35,7 +35,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=Allows the user to request that the server shut down.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Allows the user to request that the server process a search that cannot be optimized using server indexes.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Allows the user to make changes to the server schema.
property.entry-cache-preload.synopsis=Indicates whether or not to preload the entry cache on startup.
property.etime-resolution.synopsis=Specifies the resolution to use for operation elapsed processing time (etime) measurements.
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Use millisecond resolution.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Use nanosecond resolution.
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_zh_CN.properties
@@ -37,7 +37,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=\u5141\u8bb8\u7528\u6237\u8bf7\u6c42\u5173\u95ed\u670d\u52a1\u5668\u3002
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=\u5141\u8bb8\u7528\u6237\u8bf7\u6c42\u670d\u52a1\u5668\u5904\u7406\u65e0\u6cd5\u4f7f\u7528\u670d\u52a1\u5668\u7d22\u5f15\u4f18\u5316\u7684\u641c\u7d22\u3002
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=\u5141\u8bb8\u7528\u6237\u5bf9\u670d\u52a1\u5668\u6a21\u5f0f\u8fdb\u884c\u66f4\u6539\u3002
property.entry-cache-preload.synopsis=\u6307\u793a\u662f\u5426\u5728\u542f\u52a8\u65f6\u9884\u52a0\u8f7d\u6761\u76ee\u9ad8\u901f\u7f13\u5b58\u3002
property.etime-resolution.synopsis=\u6307\u5b9a\u7528\u4e8e\u64cd\u4f5c\u5b9e\u8017\u5904\u7406\u65f6\u95f4 (etime) \u6d4b\u91cf\u7684\u5206\u8fa8\u7387\u3002
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=\u4f7f\u7528\u6beb\u79d2\u5206\u8fa8\u7387\u3002
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=\u4f7f\u7528\u7eb3\u79d2\u5206\u8fa8\u7387\u3002
opendj-server-legacy/src/admin/messages/GlobalCfgDefn_zh_TW.properties
@@ -35,7 +35,6 @@
property.disabled-privilege.syntax.enumeration.value.server-shutdown.synopsis=Allows the user to request that the server shut down.
property.disabled-privilege.syntax.enumeration.value.unindexed-search.synopsis=Allows the user to request that the server process a search that cannot be optimized using server indexes.
property.disabled-privilege.syntax.enumeration.value.update-schema.synopsis=Allows the user to make changes to the server schema.
property.entry-cache-preload.synopsis=Indicates whether or not to preload the entry cache on startup.
property.etime-resolution.synopsis=Specifies the resolution to use for operation elapsed processing time (etime) measurements.
property.etime-resolution.syntax.enumeration.value.milliseconds.synopsis=Use millisecond resolution.
property.etime-resolution.syntax.enumeration.value.nanoseconds.synopsis=Use nanosecond resolution.
opendj-server-legacy/src/main/docbkx/admin-guide/chap-tuning.xml
@@ -546,27 +546,6 @@
 --no-prompt</userinput>
   </screen>
   <para>
    You can use the global setting,
    <link
     xlink:show="new"
     xlink:href="${configRefBase}global.html#entry-cache-preload"
    ><literal>entry-cache-preload</literal></link>,
    to force OpenDJ to load the entry cache as part of server startup.
   </para>
  <screen>
$ <userinput>dsconfig \
 set-global-configuration-prop \
 --port 4444 \
 --hostname opendj.example.com \
 --bindDN "cn=Directory Manager" \
 --bindPassword password \
 --set entry-cache-preload:true \
 --no-prompt</userinput>
  </screen>
   <para>By default, OpenDJ does not pre-load the entry cache.</para>
  </section>
  
  <section xml:id="perf-logging">
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java
@@ -403,12 +403,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException
  {
  }
  /** {@inheritDoc} */
  @Override
  public void removeBackup(BackupDirectory backupDirectory, String backupID)
  throws DirectoryException
  {
opendj-server-legacy/src/main/java/org/opends/server/api/Backend.java
@@ -211,20 +211,6 @@
  public abstract DN[] getBaseDNs();
  /**
   * Attempts to pre-load all the entries stored within this backend
   * into the entry cache. Note that the caller must ensure that the
   * backend stays in read-only state until this method returns as
   * no entry locking is performed during this operation. Also note
   * that any backend implementing this method should implement pre-
   * load progress reporting and error handling specific to its own
   * implementation.
   *
   * @throws  UnsupportedOperationException if backend does not
   *          support this operation.
   */
  public abstract void preloadEntryCache() throws UnsupportedOperationException;
  /**
   * Indicates whether search operations which target the specified
   * attribute in the indicated manner would be considered indexed
   * in this backend.  The operation should be considered indexed only
opendj-server-legacy/src/main/java/org/opends/server/backends/BackupBackend.java
@@ -1016,10 +1016,4 @@
    ByteString attrValue = ByteString.valueOf(rdnStringValue);
    return parentDN.child(RDN.create(rdnAttrType, attrValue));
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/ChangelogBackend.java
@@ -326,13 +326,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException
  {
    throw new UnsupportedOperationException("Operation not supported.");
  }
  /** {@inheritDoc} */
  @Override
  public boolean isIndexed(final AttributeType attributeType, final IndexType indexType)
  {
    return true;
opendj-server-legacy/src/main/java/org/opends/server/backends/LDIFBackend.java
@@ -1330,10 +1330,4 @@
    return alerts;
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/MemoryBackend.java
@@ -776,10 +776,4 @@
    LocalizableMessage message = ERR_MEMORYBACKEND_BACKUP_RESTORE_NOT_SUPPORTED.get();
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/MonitorBackend.java
@@ -494,13 +494,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException
  {
    throw new UnsupportedOperationException("Operation not supported.");
  }
  /** {@inheritDoc} */
  @Override
  public void removeBackup(final BackupDirectory backupDirectory,
      final String backupID) throws DirectoryException
  {
opendj-server-legacy/src/main/java/org/opends/server/backends/NullBackend.java
@@ -493,10 +493,4 @@
    LocalizableMessage message = LocalizableMessage.raw("The null backend does not support restore operation");
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/RootDSEBackend.java
@@ -1128,10 +1128,4 @@
    return ccr;
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -4169,12 +4169,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
  /** {@inheritDoc} */
  @Override
  public File getDirectory()
  {
    return new File(SchemaConfigManager.getSchemaDirectoryPath());
opendj-server-legacy/src/main/java/org/opends/server/backends/TrustStoreBackend.java
@@ -1530,11 +1530,5 @@
    }
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
}
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/BackendImpl.java
@@ -1418,14 +1418,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws
          UnsupportedOperationException {
    EntryCachePreloader preloader = new EntryCachePreloader(this);
    preloader.preload();
  }
  /** {@inheritDoc} */
  @Override
  public void diskLowThresholdReached(File directory, long thresholdInBytes) {
    storageStatus = StorageStatus.lockedDown(
        WARN_DISK_SPACE_LOW_THRESHOLD_CROSSED.get(directory.getFreeSpace(), directory.getAbsolutePath(),
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/EntryCachePreloader.java
File was deleted
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/BackendImpl.java
@@ -187,6 +187,7 @@
      }
    }
    // Register a monitor provider for the environment.
    rootContainerMonitor = rootContainer.getMonitorProvider();
    DirectoryServer.registerMonitorProvider(rootContainerMonitor);
@@ -1009,14 +1010,6 @@
    }
  }
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException
  {
    EntryCachePreloader preloader = new EntryCachePreloader(this);
    preloader.preload();
  }
  Storage getStorage()
  {
    return storage;
opendj-server-legacy/src/main/java/org/opends/server/backends/pluggable/EntryCachePreloader.java
File was deleted
opendj-server-legacy/src/main/java/org/opends/server/backends/task/TaskBackend.java
@@ -1445,13 +1445,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException
  {
    throw new UnsupportedOperationException("Operation not supported.");
  }
  /** {@inheritDoc} */
  @Override
  public File getDirectory()
  {
    return getFileForPath(taskBackingFile).getParentFile();
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -5064,7 +5064,7 @@
   */
  public static Map<String, Backend> getBackends()
  {
    return (Map) directoryServer.backends;
    return new TreeMap<String, Backend>(directoryServer.backends);
  }
opendj-server-legacy/src/main/java/org/opends/server/core/EntryCacheConfigManager.java
@@ -41,7 +41,6 @@
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.admin.std.server.EntryCacheMonitorProviderCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.api.Backend;
import org.opends.server.api.EntryCache;
import org.opends.server.config.ConfigConstants;
import org.opends.server.config.ConfigEntry;
@@ -53,7 +52,6 @@
import org.opends.server.types.InitializationException;
import static org.opends.messages.ConfigMessages.*;
import static org.opends.messages.ExtensionMessages.*;
import static org.opends.server.util.StaticUtils.*;
/**
@@ -207,28 +205,6 @@
        }
      }
    }
    // If requested preload the entry cache.
    if (rootConfiguration.getGlobalConfiguration().isEntryCachePreload() &&
        !cacheOrderMap.isEmpty()) {
      // Preload from every active public backend.
      Map<DN, Backend> baseDNMap =
        DirectoryServer.getPublicNamingContexts();
      Set<Backend> proccessedBackends = new HashSet<Backend>();
      for (Backend backend : baseDNMap.values()) {
        if (!proccessedBackends.contains(backend)) {
          proccessedBackends.add(backend);
          try {
            backend.preloadEntryCache();
          } catch (UnsupportedOperationException ex) {
            // Some backend implementations might not support entry
            // cache preload. Log a warning and continue.
            logger.warn(WARN_CACHE_PRELOAD_BACKEND_FAILED, backend.getBackendID());
            continue;
          }
        }
      }
    }
  }
opendj-server-legacy/src/main/java/org/opends/server/extensions/ConfigFileHandler.java
@@ -2052,12 +2052,6 @@
  /** {@inheritDoc} */
  @Override
  public void preloadEntryCache() throws UnsupportedOperationException {
    throw new UnsupportedOperationException("Operation not supported.");
  }
  /** {@inheritDoc} */
  @Override
  public File getDirectory()
  {
    return getConfigFileInBackendContext().getParentFile();
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/PluggableBackendImplTestCase.java
@@ -861,21 +861,7 @@
    assertEquals(backend.getNumberOfChildren(testBaseDN.child(DN.valueOf("ou=People"))), ldifNumberOfEntries - 2, "Not enough entries in DIT.");
  }
  @Test(dependsOnMethods = {"testImportLDIF"})
  public void testPreloadEntryCache()
  {
    // There is no backend.isPreloadSupported(), so try and if it fails, just let it go.
    try
    {
      backend.preloadEntryCache();
    }
    catch (UnsupportedOperationException uoe)
    {
      Reporter.log("Skipping unsupported Cache Preload", true);
    }
  }
  @Test(dependsOnMethods = "testPreloadEntryCache")
  @Test(dependsOnMethods = "testImportLDIF")
  public void testBackup() throws Exception
  {
    assertEquals(backend.supports(BackendOperation.BACKUP), true, "Skip Backup");
opendj-server-legacy/src/test/java/org/opends/server/extensions/PreloadEntryCacheTestCase.java
File was deleted
opendj-server-legacy/tests/unit-tests-testng/resource/config-small.ldif
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
#      Copyright 2006-2010 Sun Microsystems, Inc.
#      Portions Copyright 2010-2014 ForgeRock AS.
#      Portions Copyright 2010-2015 ForgeRock AS.
#      Portions Copyright 2012-2014 Manuel Gaupp
#
#
@@ -51,7 +51,6 @@
ds-cfg-idle-time-limit: 0 seconds
ds-cfg-save-config-on-successful-startup: true
ds-cfg-etime-resolution: milliseconds
ds-cfg-entry-cache-preload: false
ds-cfg-max-allowed-client-connections: 0
ds-cfg-max-psearches: -1
ds-cfg-allowed-task: org.opends.server.tasks.AddSchemaFileTask