From d7983b7e6eef579bc5f86cefa6932fecc7aec7bd Mon Sep 17 00:00:00 2001 From: abobrov <abobrov@localhost> Date: Tue, 04 Sep 2007 16:01:28 +0000 Subject: [PATCH] entry cache cleanup: - remove obsolete methods, fields and messages. - aggregate filters evaluation for config phases. - simplify filters evaluation and error reporting. - use a single set of filter messages. --- opends/src/messages/messages/extension.properties | 223 ++++--------------------------------------------------- 1 files changed, 16 insertions(+), 207 deletions(-) diff --git a/opends/src/messages/messages/extension.properties b/opends/src/messages/messages/extension.properties index e31c424..9fede71 100644 --- a/opends/src/messages/messages/extension.properties +++ b/opends/src/messages/messages/extension.properties @@ -60,113 +60,18 @@ MILD_ERR_PWSCHEME_CANNOT_ENCODE_PASSWORD_5=An unexpected error occurred while \ attempting to encode a password using the storage scheme defined in class %s: \ %s -INFO_FIFOCACHE_DESCRIPTION_MAX_MEMORY_PCT_6=Specifies the maximum percentage \ - of available memory in the JVM that the entry cache should be allowed to \ - consume. Its value should be an integer between 1 and 100. Changes to this \ - configuration attribute will take effect immediately, although if the value \ - is reduced to a percentage that is less than the current consumption in the \ - JVM, it may take some time for existing cache items to be purged -SEVERE_ERR_FIFOCACHE_CANNOT_DETERMINE_MAX_MEMORY_PCT_7=An error occurred \ - while attempting to determine the value of the ds-cfg-max-memory-percent \ - attribute in configuration entry %s: %s. The default of %d will be used -INFO_FIFOCACHE_DESCRIPTION_MAX_ENTRIES_8=Specifies the maximum number of \ - entries that may be held in the entry cache, with a value of zero indicating \ - that there should be no limit to the number of entries (although the memory \ - percentage will still be observed). Changes to this configuration attribute \ - will take effect immediately, although if it is reduced to a value that is \ - less than the number of entries currently held in the cache, it may take some \ - time for existing cache items to be purged -SEVERE_ERR_FIFOCACHE_CANNOT_DETERMINE_MAX_ENTRIES_9=An error occurred while \ - attempting to determine the value of the ds-cfg-max-entries attribute in \ - configuration entry %s: %s. No hard limit on the number of entries will be \ - enforced, but the value of ds-cfg-max-memory-percent will still be observed -INFO_FIFOCACHE_DESCRIPTION_LOCK_TIMEOUT_10=Specifies the maximum length of \ - time in milliseconds that the entry cache should block while attempting to \ - acquire a lock for an entry. Changes to this configuration attribute will \ - take effect immediately -SEVERE_ERR_FIFOCACHE_CANNOT_DETERMINE_LOCK_TIMEOUT_11=An error occurred while \ - attempting to determine the value of the ds-cfg-lock-timeout attribute in \ - configuration entry %s: %s. The default of %d will be used -INFO_FIFOCACHE_DESCRIPTION_INCLUDE_FILTERS_12=Specifies a set of search \ - filters that may be used to indicate which entries should be included in the \ - entry cache. Entries that do not match at least one of these filters will \ - not be stored in the cache. If no filters are provided, then any entry will \ - be accepted. Changes to this configuration attribute will take effect \ - immediately, but will not impact existing entries that are already held in \ - the cache -SEVERE_WARN_FIFOCACHE_CANNOT_DECODE_INCLUDE_FILTER_13=An error occurred while \ - attempting to decode the value "%s" from attribute ds-cfg-include-filter of \ - entry %s: %s. This filter will not be used when determining whether to \ - store an entry in the cache -SEVERE_WARN_FIFOCACHE_CANNOT_DECODE_ANY_INCLUDE_FILTERS_14=An error occurred \ - while attempting to decode any of the values from attribute \ - ds-cfg-include-filter of entry %s. All entries will be considered eligible \ - for inclusion in the cache -SEVERE_ERR_FIFOCACHE_CANNOT_DETERMINE_INCLUDE_FILTERS_15=An error occurred \ - while attempting to determine the value of the ds-cfg-include-filter \ - attribute in configuration entry %s: %s. All entries will be considered \ - eligible for inclusion in the cache -INFO_FIFOCACHE_DESCRIPTION_EXCLUDE_FILTERS_16=Specifies a set of search \ - filters that may be used to indicate which entries should be excluded from \ - the entry cache. Entries that match any of these filters will not be stored \ - in the cache. If no filters are provided, then any entry will be accepted. \ - Changes to this configuration attribute will take effect immediately, but \ - will not impact existing entries that are already held in the cache -SEVERE_WARN_FIFOCACHE_CANNOT_DECODE_EXCLUDE_FILTER_17=An error occurred while \ - attempting to decode the value "%s" from attribute ds-cfg-exclude-filter of \ - entry %s: %s. This filter will not be used when determining whether to \ - store an entry in the cache -SEVERE_WARN_FIFOCACHE_CANNOT_DECODE_ANY_EXCLUDE_FILTERS_18=An error occurred \ - while attempting to decode any of the values from attribute \ - ds-cfg-exclude-filter of entry %s. All entries will be considered eligible \ - for inclusion in the cache -SEVERE_ERR_FIFOCACHE_CANNOT_DETERMINE_EXCLUDE_FILTERS_19=An error occurred \ - while attempting to determine the value of the ds-cfg-exclude-filter \ - attribute in configuration entry %s: %s. All entries will be considered \ - eligible for inclusion in the cache -FATAL_ERR_FIFOCACHE_CANNOT_INITIALIZE_20=A fatal error occurred while trying \ +SEVERE_ERR_CACHE_INVALID_INCLUDE_FILTER_6=The ds-cfg-include-filter \ + attribute of configuration entry %s, which specifies a set of search filters \ + that may be used to control which entries are included in the cache, has an \ + invalid value of "%s": %s +SEVERE_ERR_CACHE_INVALID_EXCLUDE_FILTER_7=The ds-cfg-exclude-filter \ + attribute of configuration entry %s, which specifies a set of search filters \ + that may be used to control which entries are excluded from the cache, has an \ + invalid value of "%s": %s +FATAL_ERR_FIFOCACHE_CANNOT_INITIALIZE_8=A fatal error occurred while trying \ to initialize fifo entry cache: %s -SEVERE_ERR_FIFOCACHE_INVALID_MAX_ENTRIES_21=The ds-cfg-max-entries attribute \ - of entry %s, which specifies the maximum number of entries that may be held \ - in the entry cache, has an invalid value: %s. Its value must be a positive \ - integer, or zero to indicate that no limit should be enforced -SEVERE_ERR_FIFOCACHE_INVALID_LOCK_TIMEOUT_22=The ds-cfg-lock-timeout \ - attribute of entry %s, which specifies the maximum length of time in \ - milliseconds that the cache should block while attempting to obtain a lock on \ - an entry, has an invalid value: %s. Its value must be a positive integer, \ - or zero to indicate that it should never block -SEVERE_ERR_FIFOCACHE_INVALID_INCLUDE_FILTER_23=The ds-cfg-include-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are included in the cache, has an invalid value \ - of "%s": %s -SEVERE_ERR_FIFOCACHE_INVALID_INCLUDE_FILTERS_24=The ds-cfg-include-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are included in the cache, has an invalid \ - value: %s -SEVERE_ERR_FIFOCACHE_INVALID_EXCLUDE_FILTER_25=The ds-cfg-exclude-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are excluded from the cache, has an invalid \ - value of "%s": %s -SEVERE_ERR_FIFOCACHE_INVALID_EXCLUDE_FILTERS_26=The ds-cfg-exclude-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are excluded from the cache, has an invalid \ - value: %s -INFO_FIFOCACHE_UPDATED_MAX_MEMORY_PCT_27=The amount of memory that may be \ - used for the entry cache has been updated to %d percent of the total memory \ - available to the JVM, or approximately %d bytes. If this percentage has been \ - reduced, it may take some time for entries to be purged so that the current \ - cache memory consumption can reflect this new setting -INFO_FIFOCACHE_UPDATED_MAX_ENTRIES_28=The number of entries that may be held \ - in the entry cache has been updated to %d. If this value has been reduced, \ - it may take some time for entries to be purged so that the cache can reflect \ - this new setting -INFO_FIFOCACHE_UPDATED_LOCK_TIMEOUT_29=The lock timeout that will be used to \ - determine the length of time that the cache should block while attempting to \ - acquire a lock for an entry has been set to %d milliseconds -INFO_FIFOCACHE_UPDATED_INCLUDE_FILTERS_30=The set of search filters that will \ - control which entries may be included in the cache has been updated -INFO_FIFOCACHE_UPDATED_EXCLUDE_FILTERS_31=The set of search filters that will \ - control which entries should be be excluded from the cache has been updated +FATAL_ERR_SOFTREFCACHE_CANNOT_INITIALIZE_9=A fatal error occurred while \ + trying to initialize soft reference entry cache: %s MILD_ERR_EXTOP_PASSMOD_ILLEGAL_REQUEST_ELEMENT_TYPE_32=The password modify \ extended request sequence included an ASN.1 element of an invalid type: %s MILD_ERR_EXTOP_PASSMOD_CANNOT_DECODE_REQUEST_33=An unexpected error occurred \ @@ -967,78 +872,6 @@ GSSAPI authentication SEVERE_ERR_EXTOP_WHOAMI_PROXYAUTH_INSUFFICIENT_PRIVILEGES_277=You do not have \ sufficient privileges to use the proxied authorization control -INFO_SOFTREFCACHE_DESCRIPTION_LOCK_TIMEOUT_278=Specifies the maximum length \ - of time in milliseconds that the entry cache should block while attempting to \ - acquire a lock for an entry. Changes to this configuration attribute will \ - take effect immediately -FATAL_ERR_SOFTREFCACHE_CANNOT_INITIALIZE_279=A fatal error occurred while \ - trying to initialize soft reference entry cache: %s -INFO_SOFTREFCACHE_DESCRIPTION_INCLUDE_FILTERS_280=Specifies a set of search \ - filters that may be used to indicate which entries should be included in the \ - entry cache. Entries that do not match at least one of these filters will \ - not be stored in the cache. If no filters are provided, then any entry will \ - be accepted. Changes to this configuration attribute will take effect \ - immediately, but will not impact existing entries that are already held in \ - the cache -SEVERE_WARN_SOFTREFCACHE_CANNOT_DECODE_INCLUDE_FILTER_281=An error occurred \ - while attempting to decode the value "%s" from attribute \ - ds-cfg-include-filter of entry %s: %s. This filter will not be used when \ - determining whether to store an entry in the cache -SEVERE_WARN_SOFTREFCACHE_CANNOT_DECODE_ANY_INCLUDE_FILTERS_282=An error \ - occurred while attempting to decode any of the values from attribute \ - ds-cfg-include-filter of entry %s. All entries will be considered eligible \ - for inclusion in the cache -SEVERE_ERR_SOFTREFCACHE_CANNOT_DETERMINE_INCLUDE_FILTERS_283=An error \ - occurred while attempting to determine the value of the ds-cfg-include-filter \ - attribute in configuration entry %s: %s. All entries will be considered \ - eligible for inclusion in the cache -INFO_SOFTREFCACHE_DESCRIPTION_EXCLUDE_FILTERS_284=Specifies a set of search \ - filters that may be used to indicate which entries should be excluded from \ - the entry cache. Entries that match any of these filters will not be stored \ - in the cache. If no filters are provided, then any entry will be accepted. \ - Changes to this configuration attribute will take effect immediately, but \ - will not impact existing entries that are already held in the cache -SEVERE_WARN_SOFTREFCACHE_CANNOT_DECODE_EXCLUDE_FILTER_285=An error occurred \ - while attempting to decode the value "%s" from attribute \ - ds-cfg-exclude-filter of entry %s: %s. This filter will not be used when \ - determining whether to store an entry in the cache -SEVERE_WARN_SOFTREFCACHE_CANNOT_DECODE_ANY_EXCLUDE_FILTERS_286=An error \ - occurred while attempting to decode any of the values from attribute \ - ds-cfg-exclude-filter of entry %s. All entries will be considered eligible \ - for inclusion in the cache -SEVERE_ERR_SOFTREFCACHE_CANNOT_DETERMINE_EXCLUDE_FILTERS_287=An error \ - occurred while attempting to determine the value of the ds-cfg-exclude-filter \ - attribute in configuration entry %s: %s. All entries will be considered \ - eligible for inclusion in the cache -SEVERE_ERR_SOFTREFCACHE_INVALID_LOCK_TIMEOUT_288=The ds-cfg-lock-timeout \ - attribute of entry %s, which specifies the maximum length of time in \ - milliseconds that the cache should block while attempting to obtain a lock on \ - an entry, has an invalid value: %s. Its value must be a positive integer, \ - or zero to indicate that it should never block -SEVERE_ERR_SOFTREFCACHE_INVALID_INCLUDE_FILTER_289=The ds-cfg-include-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are included in the cache, has an invalid value \ - of "%s": %s -SEVERE_ERR_SOFTREFCACHE_INVALID_INCLUDE_FILTERS_290=The ds-cfg-include-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are included in the cache, has an invalid \ - value: %s -SEVERE_ERR_SOFTREFCACHE_INVALID_EXCLUDE_FILTER_291=The ds-cfg-exclude-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are excluded from the cache, has an invalid \ - value of "%s": %s -SEVERE_ERR_SOFTREFCACHE_INVALID_EXCLUDE_FILTERS_292=The ds-cfg-exclude-filter \ - attribute of entry %s, which specifies a set of search filters that may be \ - used to control which entries are excluded from the cache, has an invalid \ - value: %s -INFO_SOFTREFCACHE_UPDATED_LOCK_TIMEOUT_293=The lock timeout that will be used \ - to determine the length of time that the cache should block while attempting \ - to acquire a lock for an entry has been set to %d milliseconds -INFO_SOFTREFCACHE_UPDATED_INCLUDE_FILTERS_294=The set of search filters that \ - will control which entries may be included in the cache has been updated -INFO_SOFTREFCACHE_UPDATED_EXCLUDE_FILTERS_295=The set of search filters that \ - will control which entries should be be excluded from the cache has been \ - updated INFO_EXACTMAP_DESCRIPTION_MATCH_ATTR_298=Specifies the name or OID of the \ attribute whose value should exactly match the ID string provided to this \ identity mapper. At least one value must be provided. All values must refer \ @@ -1549,36 +1382,12 @@ group %s references target group %s which is itself a virtual static group. \ One virtual static group is not allowed to reference another as its target \ group -INFO_FSCACHE_UPDATED_MAX_ENTRIES_477=The number of entries that may be held \ - in the entry cache has been updated to %d. If this value has been reduced, \ - it may take some time for entries to be purged so that the cache can reflect \ - this new setting -INFO_FSCACHE_UPDATED_LOCK_TIMEOUT_478=The lock timeout that will be used to \ - determine the length of time that the cache should block while attempting to \ - acquire a lock for an entry has been set to %d milliseconds -INFO_FSCACHE_UPDATED_INCLUDE_FILTERS_479=The set of search filters that will \ - control which entries may be included in the cache has been updated -INFO_FSCACHE_UPDATED_EXCLUDE_FILTERS_480=The set of search filters that will \ - control which entries should be be excluded from the cache has been updated -INFO_FSCACHE_UPDATED_MAX_MEMORY_SIZE_481=The amount of space that may be used \ - for the entry cache has been updated to %d bytes. If the previous amount has \ - been reduced, it may take some time for entries to be purged so that the \ - current cache space consumption can reflect this new setting -INFO_FSCACHE_UPDATED_TYPE_482=The entry cache type has been changed to %s -INFO_FSCACHE_UPDATED_JE_MEMORY_PCT_483=The amount of memory that may be used \ - for the entry cache Berkeley DB JE internal cache has been updated to %d \ - percent of the total memory available to the JVM -INFO_FSCACHE_UPDATED_JE_MEMORY_SIZE_484=The amount of JVM memory that may be \ - used for the entry cache Berkeley DB JE internal cache has been updated to %d \ - bytes -INFO_FSCACHE_UPDATED_IS_PERSISTENT_485=The persistence state for the entry \ - cache has been changed to %s -SEVERE_ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA_486=An error occurred while \ - trying to load persistent cache. Persistent cache will be flushed now -SEVERE_ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA_487=An error occurred while \ - trying to store persistent cache. Persistent cache will be flushed now -FATAL_ERR_FSCACHE_CANNOT_INITIALIZE_488=A fatal error occurred while trying \ +FATAL_ERR_FSCACHE_CANNOT_INITIALIZE_486=A fatal error occurred while trying \ to initialize file system entry cache: %s +SEVERE_ERR_FSCACHE_CANNOT_LOAD_PERSISTENT_DATA_487=An error occurred while \ + trying to load persistent cache. Persistent cache will be flushed now +SEVERE_ERR_FSCACHE_CANNOT_STORE_PERSISTENT_DATA_488=An error occurred while \ + trying to store persistent cache. Persistent cache will be flushed now SEVERE_ERR_FSCACHE_CANNOT_STORE_ENTRY_489=Unable to store new cache entry in \ the file system entry cache SEVERE_ERR_FSCACHE_CANNOT_RETRIEVE_ENTRY_490=Unable to retrieve an existing \ -- Gitblit v1.10.0