openldap-bugs

openldap-bugs@openldap.org

1 participants
21003 discussions

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by h.b.furuseth＠usit.uio.no 18 Jun '13

18 Jun '13

Howard Chu writes: > Try this instead. Currently testing it on my PC. Passes all tests. Dropped P_FAKE and pushed to mdb.master. -- Hallvard

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by hyc＠symas.com 17 Jun '13

17 Jun '13

This is a multi-part message in MIME format. --------------010507020109080701050704 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hallvard Breien Furuseth wrote: > Howard Chu writes: >> The flag is being propagated when the page grows and turns into a real page. >> Fixed by this simple patch. >> (...) >> mp->mp_flags = fp->mp_flags | P_DIRTY; >> + mp->mp_flags &= ~(P_SUBP|P_FAKE); >> mp->mp_pad = fp->mp_pad; > > This fixes test043, but breaks test046-dds: ldapexop exits with 49 > (invalidCredentials) for "Refreshing the meeting as $BJORNSDN...". > It passes without the patch. This is RE24 (4dc62839c2324b46bfd6) > or RE24 + mdb.master (60086c1bc77fafecef27). Try this instead. Currently testing it on my PC. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/ --------------010507020109080701050704 Content-Type: text/plain; charset=UTF-8; name="dif.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dif.txt" diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index c9f98cc..33642c8 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -5190,6 +5190,7 @@ more: MDB_page *mp; unsigned int offset; unsigned int i; + uint16_t fp_flags; fp = NODEDATA(leaf); if (flags == MDB_CURRENT) { @@ -5209,6 +5210,7 @@ reuse: offset = NODESIZE + sizeof(indx_t) + data->mv_size; } offset += offset & 1; + fp_flags = fp->mp_flags; if (NODESIZE + sizeof(indx_t) + NODEKSZ(leaf) + NODEDSZ(leaf) + offset >= mc->mc_txn->mt_env->me_nodemax) { /* yes, convert it */ @@ -5232,6 +5234,7 @@ reuse: offset = mc->mc_txn->mt_env->me_psize - NODEDSZ(leaf); flags |= F_DUPDATA|F_SUBDATA; dummy.md_root = mp->mp_pgno; + fp_flags &= ~(P_SUBP|P_FAKE); } else { /* no, just grow it */ rdata = &xdata; @@ -5241,7 +5244,7 @@ reuse: mp->mp_pgno = mc->mc_pg[mc->mc_top]->mp_pgno; flags |= F_DUPDATA; } - mp->mp_flags = fp->mp_flags | P_DIRTY; + mp->mp_flags = fp_flags | P_DIRTY; mp->mp_pad = fp->mp_pad; mp->mp_lower = fp->mp_lower; mp->mp_upper = fp->mp_upper + offset; --------------010507020109080701050704--

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by h.b.furuseth＠usit.uio.no 17 Jun '13

17 Jun '13

Howard Chu writes: > The flag is being propagated when the page grows and turns into a real page. > Fixed by this simple patch. > (...) > mp->mp_flags = fp->mp_flags | P_DIRTY; > + mp->mp_flags &= ~(P_SUBP|P_FAKE); > mp->mp_pad = fp->mp_pad; This fixes test043, but breaks test046-dds: ldapexop exits with 49 (invalidCredentials) for "Refreshing the meeting as $BJORNSDN...". It passes without the patch. This is RE24 (4dc62839c2324b46bfd6) or RE24 + mdb.master (60086c1bc77fafecef27). Ignoring 2nd patch, it did did not fix test043: ldapadd fails (32) when populating provider. -- Hallvard

1 0

Re: (ITS#7626) [Patch] Fix config_build_schema_inc
by jsynacek＠redhat.com 17 Jun '13

17 Jun '13

On 06/17/2013 02:41 PM, Howard Chu wrote: > jsynacek(a)redhat.com wrote: >> Full_Name: Jan Synacek >> Version: master >> OS: Linux - Fedora 18 >> URL: >> http://jsynacek.fedorapeople.org/openldap/0001-Fix-config_build_schema_inc.… >> Submission from: (NULL) (209.132.186.34) >> >> >> When converting a slapd.conf into the DIT configuration, slaptest incorrectly >> handles 'include' directives containing a custom file instead of a schema file. >> >> Example: >> custom.file: >> include /etc/ldap/schema/cosine.ldif >> >> slapd.conf >> ... >> include /path/to/custom.file >> ... >> >> Slaptest does not properly include cosine.ldif into the new configuration. > > Your example is invalid since slapd.conf format doesn't support including LDIF > files. > Sorry, I meant "schema" instead of "ldif". s/cosine.ldif/cosine.schema

1 0

Re: (ITS#7626) [Patch] Fix config_build_schema_inc
by hyc＠symas.com 17 Jun '13

17 Jun '13

jsynacek(a)redhat.com wrote: > Full_Name: Jan Synacek > Version: master > OS: Linux - Fedora 18 > URL: http://jsynacek.fedorapeople.org/openldap/0001-Fix-config_build_schema_inc.… > Submission from: (NULL) (209.132.186.34) > > > When converting a slapd.conf into the DIT configuration, slaptest incorrectly > handles 'include' directives containing a custom file instead of a schema file. > > Example: > custom.file: > include /etc/ldap/schema/cosine.ldif > > slapd.conf > ... > include /path/to/custom.file > ... > > Slaptest does not properly include cosine.ldif into the new configuration. Your example is invalid since slapd.conf format doesn't support including LDIF files. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

(ITS#7626) [Patch] Fix config_build_schema_inc
by jsynacek＠redhat.com 16 Jun '13

16 Jun '13

Full_Name: Jan Synacek Version: master OS: Linux - Fedora 18 URL: http://jsynacek.fedorapeople.org/openldap/0001-Fix-config_build_schema_inc.… Submission from: (NULL) (209.132.186.34) When converting a slapd.conf into the DIT configuration, slaptest incorrectly handles 'include' directives containing a custom file instead of a schema file. Example: custom.file: include /etc/ldap/schema/cosine.ldif slapd.conf ... include /path/to/custom.file ... Slaptest does not properly include cosine.ldif into the new configuration.

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by h.b.furuseth＠usit.uio.no 16 Jun '13

16 Jun '13

I wrote: >Howard Chu writes: >> Obviously this and the preceding line can be reduced to >> mp->mp_flags = fp->mp_flags ^ (P_DIRTY|P_SUBP|P_FAKE); > > They are not equivalent. fp->mp_flags can be P_LEAF|P_DIRTY in branch > "yes, convert it" and P_LEAF|P_DIRTY|P_SUBP|P_FAKE in the other branch. Found by test043 + assert(the patches were equivalent). -- Hallvard

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by h.b.furuseth＠usit.uio.no 16 Jun '13

16 Jun '13

Howard Chu writes: > Obviously this and the preceding line can be reduced to > mp->mp_flags = fp->mp_flags ^ (P_DIRTY|P_SUBP|P_FAKE); They are not equivalent. fp->mp_flags can be P_LEAF|P_DIRTY in branch "yes, convert it" and P_LEAF|P_DIRTY|P_SUBP|P_FAKE in the other branch. > With P_FAKE removed if your patch isn't kept. No, I don't want to steal a bit just for debugging either. I'm happy with "mp->mp_flags = (fp->mp_flags | P_DIRTY) & ~P_SUBP;" if the above was just a thinko. Well, I might include P_FAKE in my mdb/tests branch, #defined as 0 except when the MDB_TEST macro turns it on. -- Hallvard

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by hyc＠symas.com 16 Jun '13

16 Jun '13

hyc(a)symas.com wrote: > This is a multi-part message in MIME format. > --------------010403050509060707070108 > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > Content-Transfer-Encoding: 7bit > > h.b.furuseth(a)usit.uio.no wrote: >> Full_Name: Hallvard B Furuseth >> Version: RE24 + mdb.master 2d0b362b6f2b1247eb693008a39efaf341f15e82 >> OS: Linux x86_64 >> URL: >> Submission from: (NULL) (193.69.163.163) >> Submitted by: hallvard >> >> >> test043-delta-syncrepl crashes in RE24 + mdb.master + this patch. >> A sub-cursor sees a regular (non-sub) page which has P_SUB set, >> in dirty_list. The flag comes from the fake page in cursor_put. > > The flag is being propagated when the page grows and turns into a real page. > Fixed by this simple patch. Obviously this and the preceding line can be reduced to mp->mp_flags = fp->mp_flags ^ (P_DIRTY|P_SUBP|P_FAKE); With P_FAKE removed if your patch isn't kept. -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/

1 0

Re: (ITS#7623) P_SUBP page inn MDB dirty_list
by hyc＠symas.com 16 Jun '13

16 Jun '13

This is a multi-part message in MIME format. --------------010403050509060707070108 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit h.b.furuseth(a)usit.uio.no wrote: > Full_Name: Hallvard B Furuseth > Version: RE24 + mdb.master 2d0b362b6f2b1247eb693008a39efaf341f15e82 > OS: Linux x86_64 > URL: > Submission from: (NULL) (193.69.163.163) > Submitted by: hallvard > > > test043-delta-syncrepl crashes in RE24 + mdb.master + this patch. > A sub-cursor sees a regular (non-sub) page which has P_SUB set, > in dirty_list. The flag comes from the fake page in cursor_put. The flag is being propagated when the page grows and turns into a real page. Fixed by this simple patch. I don't think we actually want to keep the debug code/flag you added, but I'll leave it to you to commit. > > Patch: > - Set P_FAKE flag for debugging, to see where the flag comes from. > - assert(not P_SUB) in page_get. > - valloc pages so we can see from the page address that it is > a regular page. > > --- libraries/liblmdb/mdb.c > +++ libraries/liblmdb/mdb.c > @@ -59,2 +59,3 @@ > #include <unistd.h> > +#include <malloc.h> > > @@ -582,2 +583,3 @@ typedef struct MDB_page { > #define P_SUBP 0x40 /**< for #MDB_DUPSORT sub-pages */ > +#define P_FAKE 0x80 /**< fake page */ > /** @} */ > @@ -1271,3 +1273,3 @@ mdb_page_malloc(MDB_cursor *mc, unsigned num) > } > - if ((ret = malloc(sz)) != NULL) { > + if ((ret = valloc(sz)) != NULL) { > VGMEMP_ALLOC(env, ret, sz); > @@ -2478,2 +2480,3 @@ mdb_txn_commit(MDB_txn *txn) > dp = txn->mt_u.dirty_list[i].mptr; > + assert(!(dp->mp_flags & P_SUBP)); > if (dp->mp_pgno != next) { > @@ -4069,2 +4072,3 @@ mdb_page_get(MDB_txn *txn, pgno_t pgno, MDB_page **ret, > int *lvl) > p = dl[x].mptr; > + /* assert(!(p->mp_flags & P_SUBP)); */ > goto done; > @@ -5164,3 +5168,3 @@ more: > fp->mp_pgno = mc->mc_pg[mc->mc_top]->mp_pgno; > - fp->mp_flags = P_LEAF|P_DIRTY|P_SUBP; > + fp->mp_flags = P_LEAF|P_DIRTY|P_SUBP|P_FAKE; > fp->mp_lower = PAGEHDRSZ; > -- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/ --------------010403050509060707070108 Content-Type: text/plain; charset=UTF-8; name="dif.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="dif.txt" diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index c9f98cc..1bc0f14 100644 --- a/libraries/liblmdb/mdb.c +++ b/libraries/liblmdb/mdb.c @@ -5242,6 +5242,7 @@ reuse: flags |= F_DUPDATA; } mp->mp_flags = fp->mp_flags | P_DIRTY; + mp->mp_flags &= ~(P_SUBP|P_FAKE); mp->mp_pad = fp->mp_pad; mp->mp_lower = fp->mp_lower; mp->mp_upper = fp->mp_upper + offset; --------------010403050509060707070108--

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

openldap-bugs