CVS log for servers/slapd/back-bdb/init.c

Up to [OpenLDAP] / servers / slapd / back-bdb

Request diff between arbitrary revisions

Keyword substitution: kv
Default branch: MAIN

Happy New Year

happy belated New Year

implement support for selective iteration in slaptools (ITS#6442)

ITS#6222 dncachesize defaults to 0 == unlimited

ITS#6176 silently raise dncache to cachesize if smaller

Don't do alock recovery in readonly mode since we didn't do BDB recovery

More for prev commit - fill in other opattrs when creating stub

ITS#6006 dummy entry needs objectclass attr. (Previous fix to ITS#4961
was incomplete. This patch obsoletes the patch for ITS#3616.)

ITS#5961 fix prev commit

Cleanup prev commit

ITS#5956 only retry attaching to SHM once

Update copyright notices

ITS#5745 long-lived TXNs must be closed before DBs

Add DBFLAG_CLEAN for a DB that was cleanly shut down; don't bother
scanning to verify contextCSN for clean shutdowns (ITS#5640)

BDB_PAGESIZE not used any more, use BDB/FS default instead

Add checksum keyword to enable DB checksum validation

Add dbpagesize keyword for configuring DB file page sizes

stop and remove checkpoint task in _db_destroy (ITS#5698)

Avoid deadlocks on reader txns

Use read-only txn's instead of read lockers. Support BDB 4.4-4.7

ITS#5322 don't try to free a NULL locker

Happy New Year (belated)

Support DB encryption

Re-introduce hdb dup_compare function, default compares too much

ITS#5183 preliminary fix - this whole approach needs re-design

ITS#5186 check for multiple suffixes at config time, not open time

ITS#5129 fix alock_close with Quick mode

ITS#5129 disallow Quick mode if DB_CONFIG has changed

quote suffix (ITS#5128) and use it as much as possible to identify databases

More for BDB 4.6 compatibility

Add config keyword for DN cache size (aka EntryInfoSize)
default is 2x entry cache size

Remove tool_id2entry_get

add monitor support for unindexed attributes (need to manually #define BDB_MONITOR_IDX)

workaround open() being a macro in glibc 2.6 (ITS#5075)

Reworked recent backend API changes, now using a separate struct,
(ConfigReply) for the error messages.

Added a new parameter (ConfigArgs*) to the _db_init, _db_open, _db_close and
_db_destroy functions.

Silence warnings in prev commit

Set GLUE ocflag on dummy context entry

ITS#4961 read context glue entry if it exists

ITS#4851 retry if opening a supposedly clean shared memory env fails

Fix prev commit, cleanup fakeroot entry before freeing

Fix prev commit, free fakeroot on teardown

ITS#4838 fix fake root handling broken by prev commit

Free main-thread keys in db_close, can't do it later because the env
will be gone.

Partially revert prev commit, fix lru_purge loop

Unify use of BDB lockers

Fix prev commits...

Simpler fix

Fix idl_cache teardown again - skip if cache is empty

Use Clock algorithm for IDL cache too

happy new year

partial revert - keep acquiring BDB lock in lru_purge.

Ditch LRU cache replacement in favor of 2nd-chance/clock.
Much better concurrency.

use right, although empty, function in bdb_db_destroy()

minor cleanup

Add BackendInfo.bi_extra for backend custom APIs
Use bi_extra for back-monitor entry points. Backends should never
directly reference each other's symbols.

leave monitor calls in place, hide contents; in the long run, enable monitor and build as static by default

Use #ifdef SLAPD_MONITOR for monitor APIs

further improve monitoring setup and cleanup

cleanup monitoring resources

- setup framework for monitoring of back-bdb/back-hdb stuff in their
  database entry in cn=monitor
- improve support for custom attribute/callback registration
  in back-monitor
- design API for registered antry/attr/callback removal in back-monitor

HEADS UP: now back-bdb requires back-monitor to be present, either static
or dynamically loaded __before__ back-bdb/back-hdb is initialized.
This works for sure if both back-bdb & back-monitor are static or dynamic
(provided back-monitor.la is loaded before back_bdb.la); it is not clear
what happens if back-bdb is static and back-monitor is dynamic.  In case,
either make back-bdb monitoring conditional, or hardwire back-monitor
much like back-config and back-ldif.

Entry/Attribute struct caching, to minimize malloc fragmentation
Note: this breaks LDAP_COMP_MATCH and SLAP_ZONE_MALLOC. But they
were probably broken already anyway.

cleanup

Add Pre- and Postread Control to the supported controls (ITS#4538)

Warnings: Unused vars. funcptr=0, not =NULL. if(b=...) -> if((b=...) != NULL).

Some more txn infrastructure

ITS#4373, fix prev commit

ITS#4361, 4362 fix autorecovery logic, add ALOCK_NOSAVE flag to record
txn/non-txn status of the environment.

ITS#4360 must init c_minfree

ITS#4324 don't auto-recover in slapcat. Don't trigger a recovery if
DB_CONFIG has same mtime as DB environment.

Happy new year!

cleanup db_close

ITS#4259 revert prev commit, fixed in alock.c instead.

ITS#4259 don't try to alock_close if we never opened...

cache LRU concurrency improvements, reorder DB accesses for consistency

unifdef -DBDB_SUBENTRIES -DLDBM_SUBENTRIES

Remove some unnecessary #ifdefs

ITS#4201 undo all bdb_db_open() steps if any step fails.

Use sorted array for indexed attrs instead of AVL tree

Lower id2entry cache priority in tool mode

ITS#3992 check bi_dbenv

Fix another leaked environment.

Must close env before removing it.

utime is not needed here any more

Rework auto-recovery logic:
  Removes ITS#3824 patch.
  Adds trace message for ITS#3833.
  Streamlines ITS#3607 patch.

suffix must be present (ITS#3901)

Update previous fix: utime() needs <sys/types.h> as well as <utime.h> on Linux

silence warning(s)

ITS#3841 fix test in rev 1.220

Silence "unused <something>" warnings

ITS#3857 fix bottom-up modrdn cascades, use a global modrdn counter.

ITS#3841 skip db_close if db_open was never called

ITS#3847 silence warnings

ITS#3824 remove env after slapadd/slapindex -q

ITS#3833 assume environment was already recovered by an external action
if it's missing, just succeed in this case.

ITS#3796 fix IDL cache lock setup/teardown

Additional manageDIT changes.
Now require be_isroot() instead of "manage".

manageDIT framework and obsolete objectclasses/DIT-content-rule override

Restructured to allow miscellaneous Adds under database/overlay objects

ITS#3703 skip checkpoint on close if ReadOnly mode

Fix DB_CONFIG loading

More for dynamic dbenv swapping

ITS#3607 use shared memory when configured

Cleanup db_close vs db_destroy steps

Fix checkpoint task start/stop

Dynamic indexing support

ITS#3660 fix BDB verbose calls

ITS#3607 more enhancements
  - recovers correctly, logs status
  - for Quick mode, where no transactional environment exists, refuses to
     start if the database is inconsistent
  - warns of poor performance if DB_CONFIG is not present
  - detects changes to DB_CONFIG and forces a recovery

unifdef BDB_SUBDIRS, was never used

Fix checkpoint task - must call stoptask before returning

Fix slapMode parens

apply naming scheme to global/database schema

Truncate \r if it appears at end of DB_CONFIG lines

Add dbconfig directive for creating/writing the DB_CONFIG file

ITS#3607 add automatic BDB recovery

db mismatch (including patch mismatch) should be an error

ITS#3579 fixes

More back-config / back-ldif integration, added config_generic_wrapper,
added -F option to specify config directory

Added config compatibility wrapper for overlays etc...

ITS#3533 use LDAP_DEBUG_TRACE for version info

Reorganized config/bconfig. Migrated back-bdb config.

Cleanup unused variables

matched values is "global"

Cleanup obsolete bits

More for SLAP_TOOL_QUICK, disable locks as well

Omit transaction support when running with SLAP_TOOL_QUICK

Delete obsolete syncprovider stuff

Clean up unused bt_compare references

Byte-order independence for HDB: dn2id format changed again.

Start removing custom sort functions from hdb

clarify error message and allow -u (dryrun) option for slaptest, to circumvent database startup

Happy New Year!

list permissive in supported controls (ITS#3453)

adaptive caching implementation

Store entryIDs in big-endian order, no more custom sort function.
back-hdb still needs work.

Add a checkpoint task if time-based checkpointing is configured.

More migration of syncrepl from frontend to syncprov overlay
define OPERATION_BUFFER_SIZE for dummy Operations

Disable back-bdb native syncrepl support, enable syncprov overlay,
remove syncrepl stuff from Operation struct

revert last commit

Fix BDB 4.3 fasttool, flag must be set before opening environment

cleanup previous commit

log the right function names

remove back-*/external.h

first step towards removing back-*/external.h

rework static backend initialization

unifdef -DBDB_ALIASES
delete dead code

define DB_VERSION_FULL to simplify version checks

further cleanup of search data upon exit, abandon, cancel

Revert ITS#3353 patch, it needs to be reworked.

ITS#3353 consolidate slapd globals into a single struct

Modified @oc supprot code to the share anlist routines; Revised anlist routines

unifdef -UNEW_LOGGING

Release cache locker on db close

log what backend is starting (bdb/hdb)

Use long-lived per-thread TXNs for loading entries from DB.
Make sure only one thread tries to load a given entry at a time.
Bump up the DB environment's max TXNs to accomodate the new TXNs.

SLAP_IDL_CACHE macro removed

ITS#3201 partial fix. still encountering deadlocks.

Consolidated static/dynamic backend switches

use BER_BVNULL

First rounds of backend/database flag cleanup

Revert to original code

Store IDs in BeigEndian format on disk

Fix prev commit

unifdef SLAP_IDL_CACHE

Happy new year

fix for concurrent persistent searches

unifdef -DLDAP_CONTROL_PAGEDRESULTS (as it is always defined)

Minor cleanup

Notices

ITS#2816 init_module for dynamic HDB

Revert to previous behavior:
  always use DB_AUTO_COMMIT when opening a database, don't make it
  dependent on an in-progress transaction

  use mutex instead of DB lock for db access.

Clarify/standardize library version mismatch error messages

slaptool update for LDAP Sync replication

unifdef LDAP_SYNC and LDAP_SYNCREPL

Add initial support for modify/increment.  No over/under flow detection.
Currently discovered via a "feature", but should use a control.
Start of a control made, but needs to be better integrated (with
auto use in ldapmodify(1)).

LCUP primitive routines removed

IDL cache AVL tree initialize

ITS#2440 unmunge init_module names

Add server side assert control support.

Added SLAP_TOOL_READMAIN and SLAP_TOOL_READONLY slapMode flags. The rw
arg to tool_entry_open comes too late for back-bdb to use.

Function renaming, make internal funcs static, etc.

Trim dead BDB_HIER stuff

memory context tweaks

Add shm_key config keyword to use shared memory for BDB environment
Unmeasurable performance difference on my tests, but who knows...

Caching non-existing index entries in the IDL cache - caching keys only

Hierarchical cache management.

Free IDL_CACHE locks

free cache only if required

bdb->bi_idl_tree_lrulock initialize

IDL cache locking change (mutex -> rwlock)

Major API change - (SLAP_OP_BLOCKS) All request parameters are
consolidated into the Operation structure. All reply parameters
are consolidated into the new SlapReply structure. Most operations
now have identical call signatures... Changes are not #ifdef'd,
revert to -r NO_SLAP_OP_BLOCKS if necessary to back out.

Deleted bi_database_mutex, use DB_LOCK instead. Changed bdb_locker_id to
lookup the threadctx if no Op * is provided. (bdb_db_cache doesn't know
its thread context when it acquires a locker ID.)

Deleted BackendInfo->bi_acl_attribute, bi_acl_group.
Replaced with bi_entry_get_rw.
Implemented for back-bdb, back-ldbm, back-ldap.

Still need DB_AUTO_COMMIT flag

Don't use DB_AUTO_COMMIT when opening a database

ITS#2371, fix BDB_SUBDIRs

AVL delete upon shutdown (ITS#2367)

Added lutil_passwd_init, _destroy, _add for dynamically adding passwd
schemes. Declarations in lutil.h require lutil.h never be included before
lber.h, always after.

Multiple-suffix fail msg should be logged at ERR/ANY, not ARGS.

Use function pointers to get at backend routines.

Rework #ifdef'ing of expermental controls to ease release engineering
using LDAP_DEVEL (to indicate experimental) to enable experimental features
(true for HEAD unless LDAP_REL_ENG is defined)

LDAP Sync Operation (draft-zeilenga-ldup-sync) as a groundwork for an LDAP replication design

Disallow multiple suffixes by default. Otherwise subtree index optimization
breaks. #define BDB_MULTIPLE_SUFFIXES if you want multiple suffix support.
If you use it, subtree indexing will slow down by factor of 2.

Silence gcc warnings (signed vs. unsigned, implicit declarations, unused vars).

Happy new year

Fix previous commit, compare must return signed result

Don't reeval expression

Added config keyword "searchstack" for setting search stack cache depth.
Default is still 16.

Added IDL caching, modified from ITS#2182. Uses "idlcachesize" config
keyword. Code is #ifdef'd, currently defined, with default cache of 0.

#unifdef paged results, remove lint

Support for RFC 2696:
LDAP Control Extension for Simple Paged Results Manipulation

contributed by Lynn Moss <lynnmoss@us.ibm.com> (ITS#2189)

applied with changes.

silence warnings; fix messages

remove #ifdef SLAP_FILTER_HASSUBORDINATES

fix hasSubordinate filtering; now it can be safely turned on

LCUP persistent search code drop

Simpler fix for NO_THREADS

Don't set bdb yield with NO_THREADS

Fixes for NO_THREADS
	Use a per-env locker ID
	Always set lock_detect, since we allow slapadd etc. concurrently
Also removed unused lock_detect_task code. lockdetect config keyword only
needs <policy>, no <seconds> argument.

Add LDAP_CONTROL_CLIENT_UPDATE to list of supported controls

Set BDB's global allocators to ber_*, don't bother with the per-env setting.

Unifdef BDB_IDL_MULTI.

define macros for appropriate sizing of lutil buffers

OS/390 EBCDIC support

Added support for BDB 4.1.17

Never use DB_RECOVER flag when opening DB_ENV. Recovery must be done
manually. Automatic recovery would interfere with gentlehup restarts.

Plug config leaks

Fix ITS#1994, Windows heap consistency

Tweak: For slap tools, don't set DB_RECOVERY flag when opening DB environment.
This allows slapcat to run while slapd is running, otherwise causes db
corruption.

Coverted LDAP_LOG macro to use subsystem ID int values instead of string values

Turn these functions on again. Need backend_attribute for SASLauthz stuff.
Fix to work with NULL op.

Matched Values implementation (ITS#1776) based upon submission
form Mikhail Sahalaev <M.Sahalayev@pgr.salford.ac.uk>.
Further work needed:
	add testxxx-matchedvalues
	rework ldapsearch(1) portion of patch to generalize use of options
---
Copyright 2001, Mikhail Sahalaev, All rights reserved.
This software is not subject to any license of University Of
Salford.

Redistribution and use in source and binary forms are permitted
without restriction or fee of any kind as long as this notice
is preserved.

Changed be_[n]suffix, be_[n]suffixAlias to BerVarray. No more bvec's anywhere.

Hallvard B. Furuseth's patch for cache lock and mutex

concurrent cache access: separation of cache lock (reader/writer) and lru lock (mutex)

port hasSubordinates handling to back-bdb

Added LDAP_LOG messages

#ifdef experimental controls

Revert most of last change

Use UUID to generate a GID for txn_prepare.   Based upon submission
from Jong Hyuk Choi <jongchoi@us.ibm.com> (ITS#1585 for ITS1575).

Move BDB backend initialization to bdb_open.  bdb_initialize()
shouldn't do much more than register callbacks.

Switch to openldap-data directory

BDB_ALIASES and BDB_SUBENTRIES cleanup

Add first cut BDB no-op control support.

Delete CDB (no transactions) support

Add whoami extended operation.
Add no-op control (needs backend implementation)
Updated modify password extended option API
Kludged control infrastructure to support frontend only controls

Entry caching. Based on ITS#1545 from Jong Hyuk Choi, jongchoi@us.ibm.com

Set lock detector to DEFAULT, not NORUN.
Clean up some error handling

ITS#1541 fix.

Do deadlock detection on any conflict, instead of in a separate thread

In db_destroy, cannot checkpoint a NULL dbenv.

DB_NODUPDATA is not a valid open flag

Don't use BDB group/attribute callbacks as they may cause deadlock.
Add code to bdb_attribute and bdb_group where use TXN id and to
provide error, but need to rework callers (and their callers) to
ensure error is properly bubbled up to the backend operation routine
handling the transaction.  Ugh.

Remove unused deprecated DN routines.
Only dn_validate, dn_normalize, and dn_parent remain (for now).

Misc. cleanup, remove lint, remove unused deprecated functions, etc.

Add system schema flags to backends supporting system schema.

Update copyright statements

Remove abandon cruft

More struct berval DNs

Fix - don't free constant database names

more cleanup from jon@symas.com

More cleanup for bdb_db_close

Remove lint and misc MSVC updates

Disallow duplicate duplicate data

Some fixes for BDB_IDL_MULTI. Experimental back-hdb code.

Re-introduce BDB_ID2ENTRY_PAGESIZE. Even if the index databases can get
by on 4K pages, the id2entry database still needs more (16K).

Minor fixes for BDB_IDL_MULTI

Bare minimum changes to support BDB 4.0

Renamed BDB_ID2ENTRY_PAGESIZE to just BDB_PAGESIZE; set it on each database
instead of just the id2entry db. It helps. I also found that tweaking the
environment (set_lg_bsize 2MB; set_cachesize 2MB) helps but those can be
taken care of in a DB_CONFIG file. Tweaked the bdb_bt_compare function; it
really only needs to be set on little-endian machines. (On big-endian machines
a lexical sort gives the same result as an integer sort.) Moved the final
checkpoint back to the dbenv_close, I think this leaves a cleaner log file.

Added experimental support for DB_DIRTY_READ.

Set the id2entry database pagesize to BDB_ID2ENTRY_PAGESIZE to avoid
overflow/fragmentation. (This is now 16K vs default 4K.) It turns out
that the entries' on-disk format is quite space-inefficient, storing
4 bytes per pointer or integer when typically >50% of those bytes are
zero. Oh well. It's about a 2:1 space increase over ldbm now, vs 4:1
before when all the entries were overflowing the 4K pages.

Eliminated nextid database. id2entry database is now maintained in numerical
order, so the lastid is always the same as the last entry's ID. This is
an incompatible db file change.

Fix segv in slapcat. Tool must use be_entry_return to free entries
returned from the backend.

Misc code cleanup

Added "dbnotxn" config keyword. If present, back-bdb uses DB_INIT_CDB
(Concurrent Data Store mode) instead of DB_INIT_TXN. Faster, but tends
to impede writers.

Added bdb_attribute and bdb_group ACL support routines

Fix for dbnosync - DB_TXN_NOSYNC is not a valid flag for dbenv_open,
must be set later using dbenv_set_flags.

BDB updates...  haven't had a chance to work on this for a while,
committin what I have so that someone else might be able to work it.

BDB_INDEX code does no harm (but no good yet, not used by filters yet).

Another round.  BDB_INDEX almost ready for functional testing.

More changes to let BDB build without LDBM.

An incremental step.

Fix build errors

Fix basic operations

Fix slapadd crash when only a subset of databases have been initialized.
Likely should have a general solution to this.

Fix thread handling and error printing

Fix no_threads build

Add dead lock detection thread.

Disable debugging

Mostly working modify

Rough in extended ops, modify, and modrdn.
General code cleanup.

Rough in passwd and referral routines
add diag and fix a few idl bugs

Fix initialization, add additional diagnostics

Add bdb_bind, clean up init, s/Backend/BackendDB/

Clean up debug messages

Disable sub directory support for now

Add minimal config support

Update build environment for back-bdb

Finish search rough in (w/o alias nor indexing support)

Add dn2entry.c

rough in an add/delete and deadlock avoidance

Add bdb_add() and supporting routines

remove lint
update bdb codes

Add dn2id code
Add idl_insert

Reply on DB_CONFIG for tuning...

Add new nextid code.

Add rough implementation of tool callbacks.

Add BDB errcall

Don't set DB_PRIVATE yet.

Add errpfx and errcall

Add set_*_dir calls

Fix up back-bdb framework

Framework for back-bdb

ITS#2917 don't try to use uninit'd mutex

Fix ITS#2848 - revert dbcache behavior to REL_ENG_2_1_5.

New version management code
back-bdb cache/dbcache fixes
oidm destroy fix

Lots of fixes from HEAD

Update BDB_SUBDIRS code
(which really should be removed as being redundant to DB_CONFIG)

Suck in BDB changes including fixes for
and LDBM idl fixes

Fix logging error

fix BDB-less builds, fix passwd locking, and align with HEAD

First round of imports from HEAD

Sync with HEAD

Add IDL caching codes (only slab enabled)

Misc changes from HEAD

LCUP and hasSubordinates, both behind #ifdefs
modrdn newSuperior fix

Fix NO_THREADS issues

update malloc handlers

Sync with HEAD

Sync with HEAD, including
	- subclass indexing
	- bdb locker id fixes

Change recover logic

Memory alloc issues

set BDB malloc function pointers

mostly new logging

Suck in latest changes from HEAD

Resync with HEAD

Suck in HEAD changes since 2.1alpha

Import control ifdefs from HEAD

suffix must be present (ITS#3901)

Import ITS#3857 fix from HEAD (hdb modrdn)

ITS#3703 from HEAD

ITS#3533 - import fix from HEAD

Happy new year!

list permissive in supported controls (ITS#3453)

ITS#3448 fixes

Additional cache / BDB 4.3 / cleanup from HEAD

Sync with HEAD:
   updated Debug labels, unifdef NEW_LOGGING, add BDB 4.3 support
   fix ITS#3356, 3358, 3385 (back-bdb part), ctxcsn memleaks

psearch consistency patch for releng

Changes from HEAD, namely back-bdb updates
but also SASL, DN, matchedValues, and misc other fixes

Sync with HEAD

From HEAD:
New module build stuff
updateref updates, new SHADOW DBFLAGS, etc.
paging control updates
limits updates
fixed duplicate value checks
fixed permissive modify
sasl auxprop propname changes
back-bdb "" suffix fixes
fixed back-bdb/ldbm approx non-indexing fixings
updated back-sql

Suck in changes from HEAD (CHANGES needs ITS #s)
+       Fixed slapd syncrepl replication bugs
+       Fixed slapd slurpd update bugs
+       Fixed slapd inappropriate bind error disclosure bugs
+       Fixed slapd sun_path portability bug
+       Fixed slapd passwd referral memory leak
+       Fixed slapd sasl userdb checkpass bug
+       Added slapd Delivery Method syntax validation
+       Updated slapd overlay framework
+       Updated back-ldap backend
+       Updated back-meta backend

Happy new year

Sync with HEAD

Sync with HEAD

First rounded of changes in prep for 2.2.beta3

Merge in latest changes from HEAD

Changes from HEAD for beta

Happy new year! (belated)

ITS#5262 fixes from HEAD

import fix to ITS#5075

Import ITS#4851 fix from HEAD

ITS#4805 memleak fixes from HEAD

happy new year

Pre/Post-Read Control to the supported controls (ITS#4538)

Update ITS#4361 fix

From HEAD:
+       Fixed slapd-hdb livelock issue (ITS#4360)
+       Fixed slapd-bdb/hdb auto-recovery issue (ITS#4361)
+       Fixed slapd-bdb/hdb BDB 4.4 compatibility issues (ITS#4362)
+       Fixed slapo-ppolicy modify issue (ITS#4355)

remove yields

Happy new year!

Sync back-bdb with HEAD

Sync with HEAD

Sync with HEAD

Ready for release

Sync with HEAD

Sync with HEAD (need to update CHANGES)

Sync with HEAD

Pick up last remaining changes

Sync with HEAD

Sync with HEAD

Sync with HEAD in prep for 2.3.3beta

Merge from HEAD

Initial round of changes for 2.3 beta

Sync with HEAD

Sync with HEAD

Sync with HEAD
ready for 1alpha release

Sync with HEAD

Sync with HEAD

Sync with HEAD

Sync with HEAD

Happy New Year!

ITS#6442

happy belated new year

ITS#6222

ITS#6176

Don't do alock recovery in readonly mode since we didn't do BDB recovery

ITS#6006

ITS#5961

ITS#5956

Update copyright for next release

ITS#5745

ITS#5640

dbpagesize, checksum keywords

ITS#5698

Use read-only txn's instead of read lockers. Support BDB 4.4-4.7

Happy new year! (belated)

ITS#5322

ITS5359

Sync with HEAD

ITS#5240 sync ITS#5183 fix.

ITS#5186 check for multiple suffixes at config time, not open time

ITS#5128 fix
ITS#5129 fixes

Sync with HEAD for OL 2.4.5