Skip to content

Commit

Permalink
Switch default backend to lmdb and bump version to 3.0 (#6013)
Browse files Browse the repository at this point in the history
Changes:
[1] use lmdb by default
[2] Change version number to 3.0.0

Issue: #5941

Reviewed by: @droideck, @tbordaz (Thanks!)
  • Loading branch information
progier389 authored Jan 19, 2024
1 parent 9e595d4 commit 7082c82
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
path: dist.tar

test:
name: Test
name: BDB Test
runs-on: ubuntu-22.04
needs: build
strategy:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
sudo docker exec $CID sh -c "systemctl enable --now cockpit.socket"
sudo docker exec $CID sh -c "mkdir -p /workspace/assets/cores && chmod 777 /workspace{,/assets{,/cores}}"
sudo docker exec $CID sh -c "echo '/workspace/assets/cores/core.%e.%P' > /proc/sys/kernel/core_pattern"
sudo docker exec -e WEBUI=1 -e DEBUG=pw:api -e PASSWD="${PASSWD}" $CID py.test --suppress-no-test-exit-code -m "not flaky" --junit-xml=pytest.xml --html=pytest.html --browser=firefox --browser=chromium -v dirsrvtests/tests/suites/${{ matrix.suite }}
sudo docker exec -e WEBUI=1 -e NSSLAPD_DB_LIB=bdb -e DEBUG=pw:api -e PASSWD="${PASSWD}" $CID py.test --suppress-no-test-exit-code -m "not flaky" --junit-xml=pytest.xml --html=pytest.html --browser=firefox --browser=chromium -v dirsrvtests/tests/suites/${{ matrix.suite }}
- name: Make the results file readable by all
if: always()
Expand Down
4 changes: 2 additions & 2 deletions VERSION.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ capbrand=389
vendor="389 Project"

# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=2
VERSION_MINOR=5
VERSION_MAJOR=3
VERSION_MINOR=0
VERSION_MAINT=0
# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
VERSION_PREREL=
Expand Down
12 changes: 11 additions & 1 deletion ldap/servers/slapd/tools/dbscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1262,9 +1262,19 @@ main(int argc, char **argv)
int ret = 0;
char *find_key = NULL;
uint32_t entry_id = 0xffffffff;
char *dbimpl_name = (char*) "bdb";
char *defdbimpl = getenv("NSSLAPD_DB_LIB");
char *dbimpl_name = (char*) "mdb";
int c;

if (defdbimpl) {
if (strcasecmp(defdbimpl, "bdb") == 0) {
dbimpl_name = (char*) "bdb";
}
if (strcasecmp(defdbimpl, "mdb") == 0) {
dbimpl_name = (char*) "mdb";
}
}

while ((c = getopt(argc, argv, "Af:RL:S:l:nG:srk:K:hvt:D:X:I:d")) != EOF) {
switch (c) {
case 'A':
Expand Down
2 changes: 1 addition & 1 deletion src/lib389/lib389/_constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
DEFAULT_ENV_HEAD = 'dirsrv-'
DEFAULT_CHANGELOG_NAME = "changelog5"
DEFAULT_CHANGELOG_DB = 'changelogdb'
DEFAULT_DB_LIB = 'bdb'
DEFAULT_DB_LIB = 'mdb'

# CONF_DIR = 'etc/dirsrv'
# ENV_SYSCONFIG_DIR = '/etc/sysconfig'
Expand Down

0 comments on commit 7082c82

Please sign in to comment.