November 2015 - 389-commits - Fedora mailing-lists

3 commits - dirsrvtests/suites ldap/admin ldap/servers
by William Brown 10 Nov '15

10 Nov '15

dirsrvtests/suites/mep_plugin/mep_test.py | 93 ------------------------------ ldap/admin/src/scripts/DSCreate.pm.in | 9 +- ldap/servers/slapd/daemon.c | 23 ++++++- 3 files changed, 25 insertions(+), 100 deletions(-) New commits: commit 49aaf98732d1e16dde3edb81272de8203aded21c Author: William Brown <firstyear(a)redhat.com> Date: Fri Nov 6 14:56:44 2015 +1000 Ticket 48311 -nunc-stans: Attempt to release connection that is not acquired https://fedorahosted.org/389/ticket/48311 Bug Description: DS with nunc stans enabled produces lots of messages like [13/Oct/2015:11:29:24 -0400] connection - conn=98 fd=161 Attempt to release connection that is not acquired FixDescription: From the original patch: * Do not call connection_acquire_nolock() inside a PR_ASSERT call. * Also changed other PR_ASSERTs to only be called if DEBUG is set This additionally guarantees the return codes of these functions since we have removed the PR_ASSERT that previously wrapped these function calls. If these assertions fail, we log to the error log in all cases. Author: wibrown Review by: mreynolds, nhosoi (Thanks!) diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c index 90f0523..5d70647 100644 --- a/ldap/servers/slapd/daemon.c +++ b/ldap/servers/slapd/daemon.c @@ -1836,7 +1836,12 @@ ns_handle_closure(struct ns_job_t *job) #ifdef DEBUG PR_ASSERT(0 == NS_JOB_IS_THREAD(ns_job_get_type(job))); #else - NS_JOB_IS_THREAD(ns_job_get_type(job)); + /* This doesn't actually confirm it's in the event loop thread, but it's a start */ + if (NS_JOB_IS_THREAD(ns_job_get_type(job)) != 0) { + LDAPDebug2Args(LDAP_DEBUG_ANY, "ns_handle_closure: Attempt to close outside of event loop thread %" NSPRIu64 " for fd=%d\n", + c->c_connid, c->c_sd); + return; + } #endif PR_Lock(c->c_mutex); connection_release_nolock_ext(c, 1); /* release ref acquired for event framework */ @@ -1893,7 +1898,14 @@ ns_connection_post_io_or_closing(Connection *conn) #ifdef DEBUG PR_ASSERT(0 == connection_acquire_nolock(conn)); #else - connection_acquire_nolock(conn); /* event framework now has a reference */ + if (connection_acquire_nolock(conn) != 0) { /* event framework now has a reference */ + /* + * This has already been logged as an error in ./ldap/servers/slapd/connection.c + * The error occurs when we get a connection in a closing state. + * For now we return, but there is probably a better way to handle the error case. + */ + return; + } #endif ns_add_io_timeout_job(conn->c_tp, conn->c_prfd, &tv, NS_JOB_READ|NS_JOB_PRESERVE_FD, @@ -1919,7 +1931,12 @@ ns_handle_pr_read_ready(struct ns_job_t *job) #ifdef DEBUG PR_ASSERT(0 == NS_JOB_IS_THREAD(ns_job_get_type(job))); #else - NS_JOB_IS_THREAD(ns_job_get_type(job)); + /* This doesn't actually confirm it's in the event loop thread, but it's a start */ + if (NS_JOB_IS_THREAD(ns_job_get_type(job)) != 0) { + LDAPDebug2Args(LDAP_DEBUG_ANY, "ns_handle_pr_read_ready: Attempt to handle read ready outside of event loop thread %" NSPRIu64 " for fd=%d\n", + c->c_connid, c->c_sd); + return; + } #endif PR_Lock(c->c_mutex); commit 7bb6a9a856600a99d9865b3aea02fb59ac975c66 Author: William Brown <firstyear(a)redhat.com> Date: Tue Nov 3 09:19:54 2015 +1000 Ticket #48317: SELinux port labeling retry attempts are excessive https://fedorahosted.org/389/ticket/48317 Bug Description: In dscreate.pm we attempt to label the ldap_port_t type 60 times in the case of a failure. This is excessive, and it means the setup-ds.pl appears to hang in certain cases. Fix Description: Reduce this number to 5 attempts, and when debug is enabled, display the amount of attempts remaining. Author: wibrown(a)redhat.com Review by: nhosoi(a)redhat.com (Thank you Noriko!) diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in index 3ce5a73..7f272f6 100644 --- a/ldap/admin/src/scripts/DSCreate.pm.in +++ b/ldap/admin/src/scripts/DSCreate.pm.in @@ -1011,10 +1011,11 @@ sub updateSelinuxPolicy { if ($need_label == 1) { my $semanage_err; my $rc; - my $retry = 60; + # 60 is a bit excessive, we should fail faster. + my $retry = 5; $ENV{LANG} = "C"; while (($retry > 0) && ($semanage_err = `semanage port -a -t ldap_port_t -p tcp $inf->{slapd}->{ServerPort} 2>&1`) && ($rc = $?)) { - debug(1, "Adding port $inf->{slapd}->{ServerPort} to selinux policy failed - $semanage_err (return code: $rc).\n"); + debug(1, "Adding port $inf->{slapd}->{ServerPort} to selinux policy failed - $semanage_err (return code: $rc, $retry attempts remain).\n"); debug(1, "Retrying in 5 seconds\n"); sleep(5); $retry--; @@ -1413,13 +1414,13 @@ sub removeDSInstance { { my $semanage_err; my $rc; - my $retry = 60; + my $retry = 5; $ENV{LANG} = "C"; while (($retry > 0) && ($semanage_err = `semanage port -d -t ldap_port_t -p tcp $port 2>&1`) && ($rc = $?)) { if (($semanage_err =~ /defined in policy, cannot be deleted/) || ($semanage_err =~ /is not defined/)) { $retry = -1; } else { - debug(1, "Warning: Port $port not removed from selinux policy correctly. Error: $semanage_err\n"); + debug(1, "Warning: Port $port not removed from selinux policy correctly, $retry attempts remain. Error: $semanage_err\n"); debug(1, "Retrying in 5 seconds\n"); sleep(5); $retry--; commit 02d7b19be95764255f5d948aa5eebf4af49c4ed9 Author: William Brown <wibrown(a)redhat.com> Date: Wed Oct 28 09:31:06 2015 +1000 Ticket 48313 - MEP suite tests for major functionality https://fedorahosted.org/389/ticket/48313 http://directory.fedoraproject.org/docs/389ds/design/mep-rework.html http://www.port389.org/docs/389ds/design/managed-entry-design.html Bug Description: The managed entries plugin works well for the IPA use case, but has a number of shortcomings when used with existing objects. Before the rewrite as described can be carried out, a complete functional test suite of MEP is required to validate the changes made to the plugin do not break existing use cases. Fix Description: This patch provides tests that cover the current states MEP is capable of handling. This does not cover the states that will be covered by the rework of the plugin. Author: wibrown Reviewed by: spichugi (Thank you!) diff --git a/dirsrvtests/suites/mep_plugin/mep_test.py b/dirsrvtests/suites/mep_plugin/mep_test.py deleted file mode 100644 index 2bda08d..0000000 --- a/dirsrvtests/suites/mep_plugin/mep_test.py +++ /dev/null @@ -1,93 +0,0 @@ -# --- BEGIN COPYRIGHT BLOCK --- -# Copyright (C) 2015 Red Hat, Inc. -# All rights reserved. -# -# License: GPL (version 3 or any later version). -# See LICENSE for details. -# --- END COPYRIGHT BLOCK --- -# -import os -import sys -import time -import ldap -import logging -import pytest -from lib389 import DirSrv, Entry, tools, tasks -from lib389.tools import DirSrvTools -from lib389._constants import * -from lib389.properties import * -from lib389.tasks import * -from lib389.utils import * - -logging.getLogger(__name__).setLevel(logging.DEBUG) -log = logging.getLogger(__name__) - -installation1_prefix = None - - -class TopologyStandalone(object): - def __init__(self, standalone): - standalone.open() - self.standalone = standalone - - -(a)pytest.fixture(scope="module") -def topology(request): - global installation1_prefix - if installation1_prefix: - args_instance[SER_DEPLOYED_DIR] = installation1_prefix - - # Creating standalone instance ... - standalone = DirSrv(verbose=False) - args_instance[SER_HOST] = HOST_STANDALONE - args_instance[SER_PORT] = PORT_STANDALONE - args_instance[SER_SERVERID_PROP] = SERVERID_STANDALONE - args_instance[SER_CREATION_SUFFIX] = DEFAULT_SUFFIX - args_standalone = args_instance.copy() - standalone.allocate(args_standalone) - instance_standalone = standalone.exists() - if instance_standalone: - standalone.delete() - standalone.create() - standalone.open() - - # Clear out the tmp dir - standalone.clearTmpDir(__file__) - - return TopologyStandalone(standalone) - - -def test_mep_init(topology): - ''' - Write any test suite initialization here(if needed) - ''' - - return - - -def test_mep_(topology): - ''' - Write a single test here... - ''' - - return - - -def test_mep_final(topology): - topology.standalone.delete() - log.info('mep test suite PASSED') - - -def run_isolated(): - global installation1_prefix - installation1_prefix = None - - topo = topology(True) - test_mep_init(topo) - test_mep_(topo) - test_mep_final(topo) - - -if __name__ == '__main__': - run_isolated() -

1 0

Changes to '725c471333972cd89a114436823c8d6a427b811c'
by William Brown 10 Nov '15

10 Nov '15

New branch '725c471333972cd89a114436823c8d6a427b811c' available with the following commits: commit 49aaf98732d1e16dde3edb81272de8203aded21c Author: William Brown <firstyear(a)redhat.com> Date: Fri Nov 6 14:56:44 2015 +1000 Ticket 48311 -nunc-stans: Attempt to release connection that is not acquired https://fedorahosted.org/389/ticket/48311 Bug Description: DS with nunc stans enabled produces lots of messages like [13/Oct/2015:11:29:24 -0400] connection - conn=98 fd=161 Attempt to release connection that is not acquired FixDescription: From the original patch: * Do not call connection_acquire_nolock() inside a PR_ASSERT call. * Also changed other PR_ASSERTs to only be called if DEBUG is set This additionally guarantees the return codes of these functions since we have removed the PR_ASSERT that previously wrapped these function calls. If these assertions fail, we log to the error log in all cases. Author: wibrown Review by: mreynolds, nhosoi (Thanks!) commit 7bb6a9a856600a99d9865b3aea02fb59ac975c66 Author: William Brown <firstyear(a)redhat.com> Date: Tue Nov 3 09:19:54 2015 +1000 Ticket #48317: SELinux port labeling retry attempts are excessive https://fedorahosted.org/389/ticket/48317 Bug Description: In dscreate.pm we attempt to label the ldap_port_t type 60 times in the case of a failure. This is excessive, and it means the setup-ds.pl appears to hang in certain cases. Fix Description: Reduce this number to 5 attempts, and when debug is enabled, display the amount of attempts remaining. Author: wibrown(a)redhat.com Review by: nhosoi(a)redhat.com (Thank you Noriko!) commit 02d7b19be95764255f5d948aa5eebf4af49c4ed9 Author: William Brown <wibrown(a)redhat.com> Date: Wed Oct 28 09:31:06 2015 +1000 Ticket 48313 - MEP suite tests for major functionality https://fedorahosted.org/389/ticket/48313 http://directory.fedoraproject.org/docs/389ds/design/mep-rework.html http://www.port389.org/docs/389ds/design/managed-entry-design.html Bug Description: The managed entries plugin works well for the IPA use case, but has a number of shortcomings when used with existing objects. Before the rewrite as described can be carried out, a complete functional test suite of MEP is required to validate the changes made to the plugin do not break existing use cases. Fix Description: This patch provides tests that cover the current states MEP is capable of handling. This does not cover the states that will be covered by the rework of the plugin. Author: wibrown Reviewed by: spichugi (Thank you!)

1 0

Branch '389-ds-base-1.3.4' - ldap/servers
by Noriko Hosoi 10 Nov '15

10 Nov '15

ldap/servers/plugins/acl/aclutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1a6390d6ffa743f38be206f7ed7bb0ac3bcfe26b Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Nov 10 15:35:41 2015 -0800 Ticket #48344 - acl - regression - trailing ', (comma)' in macro matched value is not removed. Description: acl_match_macro_in_target in acl plug-in returns matched value with a trailing comma, e.g., "o=kaki.com,". It's used to create a group DN, e.g., "cn=Domain Administrators,ou=Groups,o=kaki.como=ace industry,c=us". Due to the duplicated commas, the bind unexpectedly fails with 50 (insufficient access). In getting the matched value from target DN, it checks if a character at the end position is a comma or not. If it is, '\0' is set there. The position was one byte ahead. It was introduced by #48141 - aci with wildcard and macro not correctly evaluated. https://fedorahosted.org/389/ticket/48344 Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!) (cherry picked from commit 8e421fb9af2752144cc93e62090fd873524c5633) diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c index 2f37107..308cf8b 100644 --- a/ldap/servers/plugins/acl/aclutil.c +++ b/ldap/servers/plugins/acl/aclutil.c @@ -935,7 +935,7 @@ acl_match_macro_in_target( const char *ndn, char * match_this, matched_val_len = ndn_len-macro_suffix_len- ndn_prefix_end; - if (ndn[ndn_len - macro_suffix_len] == ',') + if (ndn[ndn_len - macro_suffix_len - 1] == ',') matched_val_len -= 1; matched_val = (char *)slapi_ch_malloc(matched_val_len + 1);

1 0

ldap/servers
by Noriko Hosoi 10 Nov '15

10 Nov '15

ldap/servers/plugins/acl/aclutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8e421fb9af2752144cc93e62090fd873524c5633 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Tue Nov 10 15:35:41 2015 -0800 Ticket #48344 - acl - regression - trailing ', (comma)' in macro matched value is not removed. Description: acl_match_macro_in_target in acl plug-in returns matched value with a trailing comma, e.g., "o=kaki.com,". It's used to create a group DN, e.g., "cn=Domain Administrators,ou=Groups,o=kaki.como=ace industry,c=us". Due to the duplicated commas, the bind unexpectedly fails with 50 (insufficient access). In getting the matched value from target DN, it checks if a character at the end position is a comma or not. If it is, '\0' is set there. The position was one byte ahead. It was introduced by #48141 - aci with wildcard and macro not correctly evaluated. https://fedorahosted.org/389/ticket/48344 Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!) diff --git a/ldap/servers/plugins/acl/aclutil.c b/ldap/servers/plugins/acl/aclutil.c index 2f37107..308cf8b 100644 --- a/ldap/servers/plugins/acl/aclutil.c +++ b/ldap/servers/plugins/acl/aclutil.c @@ -935,7 +935,7 @@ acl_match_macro_in_target( const char *ndn, char * match_this, matched_val_len = ndn_len-macro_suffix_len- ndn_prefix_end; - if (ndn[ndn_len - macro_suffix_len] == ',') + if (ndn[ndn_len - macro_suffix_len - 1] == ',') matched_val_len -= 1; matched_val = (char *)slapi_ch_malloc(matched_val_len + 1);

1 0

rpm/389-ds-base.spec.in
by Noriko Hosoi 09 Nov '15

09 Nov '15

rpm/389-ds-base.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fb541208f67bf155ed07abf4bae8b45d1a68fd7 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Nov 9 13:14:15 2015 -0800 bump nunc-stans version to 0.1.6 diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in index 52a0245..724e625 100644 --- a/rpm/389-ds-base.spec.in +++ b/rpm/389-ds-base.spec.in @@ -16,7 +16,7 @@ %global use_nunc_stans __NUNC_STANS_ON__ %if %{use_nunc_stans} -%global nunc_stans_ver 0.1.5 +%global nunc_stans_ver 0.1.6 %endif # fedora 15 and later uses tmpfiles.d

1 0

Branch '389-ds-base-1.3.2' - ldap/servers
by Mark Reynolds 06 Nov '15

06 Nov '15

ldap/servers/plugins/replication/repl5_replica_config.c | 1 + 1 file changed, 1 insertion(+) New commits: commit 378de6aabc37e2efa1176b8b41e2dd661c750036 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Fri Nov 6 14:41:36 2015 -0500 Ticket 48325 - Replica promotion leaves RUV out of order Bug Description: When promoting a consumer to a master the new RUV element is appended to the RUV. However, when trying to replicate from the newly promoted replica the remote replica checks the first element in the RUV and sees that its the same replica ID, and aborts the replication session. Essentailly this completely breaks replication between the two servers, and can actually corrupt other RUVs on other replicas. Fix Description: When promoting a replica to a master, reorder the RUV so that it is the first in the list. https://fedorahosted.org/389/ticket/48325 Reviewed by: nhosoi(Thanks!) (cherry picked from commit b896840d270a540698f35a4aac4f7a91742952b0) diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c index 755097a..08fd9b3 100644 --- a/ldap/servers/plugins/replication/repl5_replica_config.c +++ b/ldap/servers/plugins/replication/repl5_replica_config.c @@ -983,6 +983,7 @@ replica_config_change_type_and_id (Replica *r, const char *new_type, csngen_rewrite_rid(gen, rid); if(purl && type == REPLICA_TYPE_UPDATABLE){ ruv_add_replica(ruv, rid, purl); + ruv_move_local_supplier_to_first(ruv, rid); replica_reset_csn_pl(r); } ruv_delete_replica(ruv, oldrid);

1 0

Branch '389-ds-base-1.3.3' - ldap/servers
by Mark Reynolds 06 Nov '15

06 Nov '15

ldap/servers/plugins/replication/repl5_replica_config.c | 1 + 1 file changed, 1 insertion(+) New commits: commit 2764bc455bef2e88713fc014d917c74df9c484ae Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Fri Nov 6 14:41:36 2015 -0500 Ticket 48325 - Replica promotion leaves RUV out of order Bug Description: When promoting a consumer to a master the new RUV element is appended to the RUV. However, when trying to replicate from the newly promoted replica the remote replica checks the first element in the RUV and sees that its the same replica ID, and aborts the replication session. Essentailly this completely breaks replication between the two servers, and can actually corrupt other RUVs on other replicas. Fix Description: When promoting a replica to a master, reorder the RUV so that it is the first in the list. https://fedorahosted.org/389/ticket/48325 Reviewed by: nhosoi(Thanks!) (cherry picked from commit b896840d270a540698f35a4aac4f7a91742952b0) diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c index 8718f92..849184f 100644 --- a/ldap/servers/plugins/replication/repl5_replica_config.c +++ b/ldap/servers/plugins/replication/repl5_replica_config.c @@ -1032,6 +1032,7 @@ replica_config_change_type_and_id (Replica *r, const char *new_type, csngen_rewrite_rid(gen, rid); if(purl && type == REPLICA_TYPE_UPDATABLE){ ruv_add_replica(ruv, rid, purl); + ruv_move_local_supplier_to_first(ruv, rid); replica_reset_csn_pl(r); } ruv_delete_replica(ruv, oldrid);

1 0

Branch '389-ds-base-1.3.4' - ldap/servers
by Mark Reynolds 06 Nov '15

06 Nov '15

ldap/servers/plugins/replication/repl5_replica_config.c | 1 + 1 file changed, 1 insertion(+) New commits: commit 6180b91c3f65e9c5e375816a72baa95678458a0a Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Fri Nov 6 14:41:36 2015 -0500 Ticket 48325 - Replica promotion leaves RUV out of order Bug Description: When promoting a consumer to a master the new RUV element is appended to the RUV. However, when trying to replicate from the newly promoted replica the remote replica checks the first element in the RUV and sees that its the same replica ID, and aborts the replication session. Essentailly this completely breaks replication between the two servers, and can actually corrupt other RUVs on other replicas. Fix Description: When promoting a replica to a master, reorder the RUV so that it is the first in the list. https://fedorahosted.org/389/ticket/48325 Reviewed by: nhosoi(Thanks!) (cherry picked from commit b896840d270a540698f35a4aac4f7a91742952b0) diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c index e85ae3e..4d7135c 100644 --- a/ldap/servers/plugins/replication/repl5_replica_config.c +++ b/ldap/servers/plugins/replication/repl5_replica_config.c @@ -1003,6 +1003,7 @@ replica_config_change_type_and_id (Replica *r, const char *new_type, csngen_rewrite_rid(gen, rid); if(purl && type == REPLICA_TYPE_UPDATABLE){ ruv_add_replica(ruv, rid, purl); + ruv_move_local_supplier_to_first(ruv, rid); replica_reset_csn_pl(r); } ruv_delete_replica(ruv, oldrid);

1 0

ldap/servers
by Mark Reynolds 06 Nov '15

06 Nov '15

ldap/servers/plugins/replication/repl5_replica_config.c | 1 + 1 file changed, 1 insertion(+) New commits: commit b896840d270a540698f35a4aac4f7a91742952b0 Author: Mark Reynolds <mreynolds(a)redhat.com> Date: Fri Nov 6 14:41:36 2015 -0500 Ticket 48325 - Replica promotion leaves RUV out of order Bug Description: When promoting a consumer to a master the new RUV element is appended to the RUV. However, when trying to replicate from the newly promoted replica the remote replica checks the first element in the RUV and sees that its the same replica ID, and aborts the replication session. Essentailly this completely breaks replication between the two servers, and can actually corrupt other RUVs on other replicas. Fix Description: When promoting a replica to a master, reorder the RUV so that it is the first in the list. https://fedorahosted.org/389/ticket/48325 Reviewed by: nhosoi(Thanks!) diff --git a/ldap/servers/plugins/replication/repl5_replica_config.c b/ldap/servers/plugins/replication/repl5_replica_config.c index e85ae3e..4d7135c 100644 --- a/ldap/servers/plugins/replication/repl5_replica_config.c +++ b/ldap/servers/plugins/replication/repl5_replica_config.c @@ -1003,6 +1003,7 @@ replica_config_change_type_and_id (Replica *r, const char *new_type, csngen_rewrite_rid(gen, rid); if(purl && type == REPLICA_TYPE_UPDATABLE){ ruv_add_replica(ruv, rid, purl); + ruv_move_local_supplier_to_first(ruv, rid); replica_reset_csn_pl(r); } ruv_delete_replica(ruv, oldrid);

1 0

ldap/servers
by Noriko Hosoi 05 Nov '15

05 Nov '15

ldap/servers/slapd/daemon.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit ab8ed9a5ebb0d15b55d7525ed1d5dbeebd8c7563 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Nov 5 13:08:56 2015 -0800 Ticket #48339 - Share nsslapd-threadnumber in the case nunc-stans is enabled, as well. Description: When nunc-stans is enabled, instead of getting the thread number from the environment variable MAX_THREADS, use the value of config parameter nsslapd-threadnumber. https://fedorahosted.org/389/ticket/48339 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) diff --git a/ldap/servers/slapd/daemon.c b/ldap/servers/slapd/daemon.c index 82099bc..90f0523 100644 --- a/ldap/servers/slapd/daemon.c +++ b/ldap/servers/slapd/daemon.c @@ -1199,10 +1199,7 @@ void slapd_daemon( daemon_ports_t *ports ) #ifdef ENABLE_NUNC_STANS if (enable_nunc_stans && !g_get_shutdown()) { int ii; - PRInt32 maxthreads = 3; - if (getenv("MAX_THREADS")) { - maxthreads = atoi(getenv("MAX_THREADS")); - } + PRInt32 maxthreads = (PRInt32)config_get_threadnumber(); /* Set the nunc-stans thread pool config */ ns_thrpool_config_init(&tp_config);

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Noriko Hosoi 05 Nov '15

05 Nov '15

ldap/servers/slapd/opshared.c | 13 ++++++++----- ldap/servers/slapd/pagedresults.c | 28 ++++++++++++++++++---------- ldap/servers/slapd/proto-slap.h | 5 ++--- 3 files changed, 28 insertions(+), 18 deletions(-) New commits: commit d5ccc06cefa6f423d80c6cc0e527b57c116b0cb8 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Nov 5 10:44:08 2015 -0800 Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results Description: An abandon request for a SimplePagedResults request could happened between the abandon check and the code for sending the search results. The abandon frees the search results although sending result code still refers it. Fix description: The code (from getting search results through sending the search results) in op_shared_search is protected by c_mutex locking. https://fedorahosted.org/389/ticket/48338 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 390b8bd9076e8976facc0858e60985d6b4fac05c) (cherry picked from commit 8f49d33d30fade7b579062414250a0ddb1a66c62) (cherry picked from commit a7a8b2d3cb8452cc629ec5228bea6571d72e6538) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index 31d41e8..391d1c3 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -530,7 +530,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) be = be_list[index]; } } - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 0/*not locked*/, pr_idx); estimate = pagedresults_get_search_result_set_size_estimate(pb->pb_conn, operation, pr_idx); if (pagedresults_get_unindexed(pb->pb_conn, operation, pr_idx)) { opnote |= SLAPI_OP_NOTE_UNINDEXED; @@ -700,13 +700,15 @@ op_shared_search (Slapi_PBlock *pb, int send_result) * In async paged result case, the search result might be released * by other theads. We need to double check it in the locked region. */ - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + PR_Lock(pb->pb_conn->c_mutex); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx); if (pr_search_result) { - if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) { pagedresults_unlock(pb->pb_conn, pr_idx); /* Previous operation was abandoned and the simplepaged object is not in use. */ send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL); rc = LDAP_SUCCESS; + PR_Unlock(pb->pb_conn->c_mutex); goto free_and_return; } else { slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result ); @@ -714,7 +716,8 @@ op_shared_search (Slapi_PBlock *pb, int send_result) /* search result could be reset in the backend/dse */ slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr); - pagedresults_set_search_result(pb->pb_conn, operation, sr, 0, pr_idx); + pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx); + PR_Unlock(pb->pb_conn->c_mutex); } } else { pr_stat = PAGEDRESULTS_SEARCH_END; @@ -745,7 +748,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); - if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 0/*not locked*/, pr_idx)) { pagedresults_free_one(pb->pb_conn, operation, pr_idx); } pagedresults_unlock(pb->pb_conn, pr_idx); diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index 434e48d..c1947f1 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -408,20 +408,25 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int } void * -pagedresults_get_search_result(Connection *conn, Operation *op, int index) +pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index) { void *sr = NULL; if (!op_is_pagedresults(op)) { return sr; /* noop */ } - LDAPDebug1Arg(LDAP_DEBUG_TRACE, - "--> pagedresults_get_search_result: idx=%d\n", index); + LDAPDebug2Args(LDAP_DEBUG_TRACE, + "--> pagedresults_get_search_result(%s): idx=%d\n", + locked?"locked":"not locked", index); if (conn && (index > -1)) { - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } if (index < conn->c_pagedresults.prl_maxlen) { sr = conn->c_pagedresults.prl_list[index].pr_search_result_set; } - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } } LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_get_search_result: %p\n", sr); @@ -429,8 +434,7 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int index) } int -pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, - int locked, int index) +pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index) { int rc = -1; if (!op_is_pagedresults(op)) { @@ -1016,15 +1020,19 @@ pagedresults_unlock( Connection *conn, int index ) } int -pagedresults_is_abandoned_or_notavailable( Connection *conn, int index ) +pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index) { PagedResults *prp; if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) { return 1; /* not abandoned, but do not want to proceed paged results op. */ } - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } prp = conn->c_pagedresults.prl_list + index; - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED; } diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index 8f86eb7..decc29e 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -1438,8 +1438,7 @@ void pagedresults_set_response_control(Slapi_PBlock *pb, int iscritical, int curr_search_count, int index); Slapi_Backend *pagedresults_get_current_be(Connection *conn, int index); int pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int nolock); -void *pagedresults_get_search_result(Connection *conn, Operation *op, - int index); +void *pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index); int pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index); int pagedresults_get_search_result_count(Connection *conn, Operation *op, @@ -1480,7 +1479,7 @@ int pagedresults_cleanup_all(Connection *conn, int needlock); void op_set_pagedresults(Operation *op); void pagedresults_lock(Connection *conn, int index); void pagedresults_unlock(Connection *conn, int index); -int pagedresults_is_abandoned_or_notavailable(Connection *conn, int index); +int pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index); int pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked); /*

1 0

Branch '389-ds-base-1.3.3' - ldap/servers
by Noriko Hosoi 05 Nov '15

05 Nov '15

ldap/servers/slapd/opshared.c | 13 ++++++++----- ldap/servers/slapd/pagedresults.c | 28 ++++++++++++++++++---------- ldap/servers/slapd/proto-slap.h | 5 ++--- 3 files changed, 28 insertions(+), 18 deletions(-) New commits: commit a7a8b2d3cb8452cc629ec5228bea6571d72e6538 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Nov 5 10:44:08 2015 -0800 Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results Description: An abandon request for a SimplePagedResults request could happened between the abandon check and the code for sending the search results. The abandon frees the search results although sending result code still refers it. Fix description: The code (from getting search results through sending the search results) in op_shared_search is protected by c_mutex locking. https://fedorahosted.org/389/ticket/48338 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 390b8bd9076e8976facc0858e60985d6b4fac05c) (cherry picked from commit 8f49d33d30fade7b579062414250a0ddb1a66c62) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index fa506b3..873a78b 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -537,7 +537,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) be = be_list[index]; } } - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 0/*not locked*/, pr_idx); estimate = pagedresults_get_search_result_set_size_estimate(pb->pb_conn, operation, pr_idx); if (pagedresults_get_unindexed(pb->pb_conn, operation, pr_idx)) { opnote |= SLAPI_OP_NOTE_UNINDEXED; @@ -707,13 +707,15 @@ op_shared_search (Slapi_PBlock *pb, int send_result) * In async paged result case, the search result might be released * by other theads. We need to double check it in the locked region. */ - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + PR_Lock(pb->pb_conn->c_mutex); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx); if (pr_search_result) { - if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) { pagedresults_unlock(pb->pb_conn, pr_idx); /* Previous operation was abandoned and the simplepaged object is not in use. */ send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL); rc = LDAP_SUCCESS; + PR_Unlock(pb->pb_conn->c_mutex); goto free_and_return; } else { slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result ); @@ -721,7 +723,8 @@ op_shared_search (Slapi_PBlock *pb, int send_result) /* search result could be reset in the backend/dse */ slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr); - pagedresults_set_search_result(pb->pb_conn, operation, sr, 0, pr_idx); + pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx); + PR_Unlock(pb->pb_conn->c_mutex); } } else { pr_stat = PAGEDRESULTS_SEARCH_END; @@ -752,7 +755,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); - if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 0/*not locked*/, pr_idx)) { pagedresults_free_one(pb->pb_conn, operation, pr_idx); } pagedresults_unlock(pb->pb_conn, pr_idx); diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index 434e48d..c1947f1 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -408,20 +408,25 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int } void * -pagedresults_get_search_result(Connection *conn, Operation *op, int index) +pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index) { void *sr = NULL; if (!op_is_pagedresults(op)) { return sr; /* noop */ } - LDAPDebug1Arg(LDAP_DEBUG_TRACE, - "--> pagedresults_get_search_result: idx=%d\n", index); + LDAPDebug2Args(LDAP_DEBUG_TRACE, + "--> pagedresults_get_search_result(%s): idx=%d\n", + locked?"locked":"not locked", index); if (conn && (index > -1)) { - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } if (index < conn->c_pagedresults.prl_maxlen) { sr = conn->c_pagedresults.prl_list[index].pr_search_result_set; } - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } } LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_get_search_result: %p\n", sr); @@ -429,8 +434,7 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int index) } int -pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, - int locked, int index) +pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index) { int rc = -1; if (!op_is_pagedresults(op)) { @@ -1016,15 +1020,19 @@ pagedresults_unlock( Connection *conn, int index ) } int -pagedresults_is_abandoned_or_notavailable( Connection *conn, int index ) +pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index) { PagedResults *prp; if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) { return 1; /* not abandoned, but do not want to proceed paged results op. */ } - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } prp = conn->c_pagedresults.prl_list + index; - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED; } diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index 5fa2310..b119546 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -1482,8 +1482,7 @@ void pagedresults_set_response_control(Slapi_PBlock *pb, int iscritical, int curr_search_count, int index); Slapi_Backend *pagedresults_get_current_be(Connection *conn, int index); int pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int nolock); -void *pagedresults_get_search_result(Connection *conn, Operation *op, - int index); +void *pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index); int pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index); int pagedresults_get_search_result_count(Connection *conn, Operation *op, @@ -1524,7 +1523,7 @@ int pagedresults_cleanup_all(Connection *conn, int needlock); void op_set_pagedresults(Operation *op); void pagedresults_lock(Connection *conn, int index); void pagedresults_unlock(Connection *conn, int index); -int pagedresults_is_abandoned_or_notavailable(Connection *conn, int index); +int pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index); int pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked); /*

1 0

Branch '389-ds-base-1.3.4' - ldap/servers
by Noriko Hosoi 05 Nov '15

05 Nov '15

ldap/servers/slapd/opshared.c | 13 ++++++++----- ldap/servers/slapd/pagedresults.c | 28 ++++++++++++++++++---------- ldap/servers/slapd/proto-slap.h | 5 ++--- 3 files changed, 28 insertions(+), 18 deletions(-) New commits: commit 8f49d33d30fade7b579062414250a0ddb1a66c62 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Nov 5 10:44:08 2015 -0800 Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results Description: An abandon request for a SimplePagedResults request could happened between the abandon check and the code for sending the search results. The abandon frees the search results although sending result code still refers it. Fix description: The code (from getting search results through sending the search results) in op_shared_search is protected by c_mutex locking. https://fedorahosted.org/389/ticket/48338 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) (cherry picked from commit 390b8bd9076e8976facc0858e60985d6b4fac05c) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index dcdbb04..586ca1f 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -500,7 +500,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) be = be_list[index]; } } - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 0/*not locked*/, pr_idx); estimate = pagedresults_get_search_result_set_size_estimate(pb->pb_conn, operation, pr_idx); if (pagedresults_get_unindexed(pb->pb_conn, operation, pr_idx)) { opnote |= SLAPI_OP_NOTE_UNINDEXED; @@ -675,13 +675,15 @@ op_shared_search (Slapi_PBlock *pb, int send_result) * In async paged result case, the search result might be released * by other theads. We need to double check it in the locked region. */ - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + PR_Lock(pb->pb_conn->c_mutex); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx); if (pr_search_result) { - if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) { pagedresults_unlock(pb->pb_conn, pr_idx); /* Previous operation was abandoned and the simplepaged object is not in use. */ send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL); rc = LDAP_SUCCESS; + PR_Unlock(pb->pb_conn->c_mutex); goto free_and_return; } else { slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result ); @@ -689,7 +691,8 @@ op_shared_search (Slapi_PBlock *pb, int send_result) /* search result could be reset in the backend/dse */ slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr); - pagedresults_set_search_result(pb->pb_conn, operation, sr, 0, pr_idx); + pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx); + PR_Unlock(pb->pb_conn->c_mutex); } } else { pr_stat = PAGEDRESULTS_SEARCH_END; @@ -720,7 +723,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); - if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 0/*not locked*/, pr_idx)) { pagedresults_free_one(pb->pb_conn, operation, pr_idx); } pagedresults_unlock(pb->pb_conn, pr_idx); diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index 87447c4..4458cfb 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -395,20 +395,25 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int } void * -pagedresults_get_search_result(Connection *conn, Operation *op, int index) +pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index) { void *sr = NULL; if (!op_is_pagedresults(op)) { return sr; /* noop */ } - LDAPDebug1Arg(LDAP_DEBUG_TRACE, - "--> pagedresults_get_search_result: idx=%d\n", index); + LDAPDebug2Args(LDAP_DEBUG_TRACE, + "--> pagedresults_get_search_result(%s): idx=%d\n", + locked?"locked":"not locked", index); if (conn && (index > -1)) { - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } if (index < conn->c_pagedresults.prl_maxlen) { sr = conn->c_pagedresults.prl_list[index].pr_search_result_set; } - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } } LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_get_search_result: %p\n", sr); @@ -416,8 +421,7 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int index) } int -pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, - int locked, int index) +pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index) { int rc = -1; if (!op_is_pagedresults(op)) { @@ -1003,15 +1007,19 @@ pagedresults_unlock( Connection *conn, int index ) } int -pagedresults_is_abandoned_or_notavailable( Connection *conn, int index ) +pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index) { PagedResults *prp; if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) { return 1; /* not abandoned, but do not want to proceed paged results op. */ } - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } prp = conn->c_pagedresults.prl_list + index; - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED; } diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index b10c1eb..e1cb53e 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -1445,8 +1445,7 @@ void pagedresults_set_response_control(Slapi_PBlock *pb, int iscritical, int curr_search_count, int index); Slapi_Backend *pagedresults_get_current_be(Connection *conn, int index); int pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int nolock); -void *pagedresults_get_search_result(Connection *conn, Operation *op, - int index); +void *pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index); int pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index); int pagedresults_get_search_result_count(Connection *conn, Operation *op, @@ -1487,7 +1486,7 @@ int pagedresults_cleanup_all(Connection *conn, int needlock); void op_set_pagedresults(Operation *op); void pagedresults_lock(Connection *conn, int index); void pagedresults_unlock(Connection *conn, int index); -int pagedresults_is_abandoned_or_notavailable(Connection *conn, int index); +int pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index); int pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked); /*

1 0

ldap/servers
by Noriko Hosoi 05 Nov '15

05 Nov '15

ldap/servers/slapd/opshared.c | 13 ++++++++----- ldap/servers/slapd/pagedresults.c | 28 ++++++++++++++++++---------- ldap/servers/slapd/proto-slap.h | 5 ++--- 3 files changed, 28 insertions(+), 18 deletions(-) New commits: commit 390b8bd9076e8976facc0858e60985d6b4fac05c Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Nov 5 10:44:08 2015 -0800 Ticket #48338 - SimplePagedResults -- abandon could happen between the abandon check and sending results Description: An abandon request for a SimplePagedResults request could happened between the abandon check and the code for sending the search results. The abandon frees the search results although sending result code still refers it. Fix description: The code (from getting search results through sending the search results) in op_shared_search is protected by c_mutex locking. https://fedorahosted.org/389/ticket/48338 Reviewed by rmeggins(a)redhat.com (Thank you, Rich!!) diff --git a/ldap/servers/slapd/opshared.c b/ldap/servers/slapd/opshared.c index 4fe7969..8a14431 100644 --- a/ldap/servers/slapd/opshared.c +++ b/ldap/servers/slapd/opshared.c @@ -500,7 +500,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) be = be_list[index]; } } - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 0/*not locked*/, pr_idx); estimate = pagedresults_get_search_result_set_size_estimate(pb->pb_conn, operation, pr_idx); if (pagedresults_get_unindexed(pb->pb_conn, operation, pr_idx)) { opnote |= SLAPI_OP_NOTE_UNINDEXED; @@ -675,13 +675,15 @@ op_shared_search (Slapi_PBlock *pb, int send_result) * In async paged result case, the search result might be released * by other theads. We need to double check it in the locked region. */ - pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, pr_idx); + PR_Lock(pb->pb_conn->c_mutex); + pr_search_result = pagedresults_get_search_result(pb->pb_conn, operation, 1/*locked*/, pr_idx); if (pr_search_result) { - if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 1/*locked*/, pr_idx)) { pagedresults_unlock(pb->pb_conn, pr_idx); /* Previous operation was abandoned and the simplepaged object is not in use. */ send_ldap_result(pb, 0, NULL, "Simple Paged Results Search abandoned", 0, NULL); rc = LDAP_SUCCESS; + PR_Unlock(pb->pb_conn->c_mutex); goto free_and_return; } else { slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_SET, pr_search_result ); @@ -689,7 +691,8 @@ op_shared_search (Slapi_PBlock *pb, int send_result) /* search result could be reset in the backend/dse */ slapi_pblock_get(pb, SLAPI_SEARCH_RESULT_SET, &sr); - pagedresults_set_search_result(pb->pb_conn, operation, sr, 0, pr_idx); + pagedresults_set_search_result(pb->pb_conn, operation, sr, 1/*locked*/, pr_idx); + PR_Unlock(pb->pb_conn->c_mutex); } } else { pr_stat = PAGEDRESULTS_SEARCH_END; @@ -720,7 +723,7 @@ op_shared_search (Slapi_PBlock *pb, int send_result) if (PAGEDRESULTS_SEARCH_END == pr_stat) { pagedresults_lock(pb->pb_conn, pr_idx); slapi_pblock_set(pb, SLAPI_SEARCH_RESULT_SET, NULL); - if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, pr_idx)) { + if (!pagedresults_is_abandoned_or_notavailable(pb->pb_conn, 0/*not locked*/, pr_idx)) { pagedresults_free_one(pb->pb_conn, operation, pr_idx); } pagedresults_unlock(pb->pb_conn, pr_idx); diff --git a/ldap/servers/slapd/pagedresults.c b/ldap/servers/slapd/pagedresults.c index 87447c4..4458cfb 100644 --- a/ldap/servers/slapd/pagedresults.c +++ b/ldap/servers/slapd/pagedresults.c @@ -395,20 +395,25 @@ pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int } void * -pagedresults_get_search_result(Connection *conn, Operation *op, int index) +pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index) { void *sr = NULL; if (!op_is_pagedresults(op)) { return sr; /* noop */ } - LDAPDebug1Arg(LDAP_DEBUG_TRACE, - "--> pagedresults_get_search_result: idx=%d\n", index); + LDAPDebug2Args(LDAP_DEBUG_TRACE, + "--> pagedresults_get_search_result(%s): idx=%d\n", + locked?"locked":"not locked", index); if (conn && (index > -1)) { - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } if (index < conn->c_pagedresults.prl_maxlen) { sr = conn->c_pagedresults.prl_list[index].pr_search_result_set; } - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } } LDAPDebug1Arg(LDAP_DEBUG_TRACE, "<-- pagedresults_get_search_result: %p\n", sr); @@ -416,8 +421,7 @@ pagedresults_get_search_result(Connection *conn, Operation *op, int index) } int -pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, - int locked, int index) +pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index) { int rc = -1; if (!op_is_pagedresults(op)) { @@ -1003,15 +1007,19 @@ pagedresults_unlock( Connection *conn, int index ) } int -pagedresults_is_abandoned_or_notavailable( Connection *conn, int index ) +pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index) { PagedResults *prp; if (!conn || (index < 0) || (index >= conn->c_pagedresults.prl_maxlen)) { return 1; /* not abandoned, but do not want to proceed paged results op. */ } - PR_Lock(conn->c_mutex); + if (!locked) { + PR_Lock(conn->c_mutex); + } prp = conn->c_pagedresults.prl_list + index; - PR_Unlock(conn->c_mutex); + if (!locked) { + PR_Unlock(conn->c_mutex); + } return prp->pr_flags & CONN_FLAG_PAGEDRESULTS_ABANDONED; } diff --git a/ldap/servers/slapd/proto-slap.h b/ldap/servers/slapd/proto-slap.h index c49f1d1..ff9dd09 100644 --- a/ldap/servers/slapd/proto-slap.h +++ b/ldap/servers/slapd/proto-slap.h @@ -1446,8 +1446,7 @@ void pagedresults_set_response_control(Slapi_PBlock *pb, int iscritical, int curr_search_count, int index); Slapi_Backend *pagedresults_get_current_be(Connection *conn, int index); int pagedresults_set_current_be(Connection *conn, Slapi_Backend *be, int index, int nolock); -void *pagedresults_get_search_result(Connection *conn, Operation *op, - int index); +void *pagedresults_get_search_result(Connection *conn, Operation *op, int locked, int index); int pagedresults_set_search_result(Connection *conn, Operation *op, void *sr, int locked, int index); int pagedresults_get_search_result_count(Connection *conn, Operation *op, @@ -1488,7 +1487,7 @@ int pagedresults_cleanup_all(Connection *conn, int needlock); void op_set_pagedresults(Operation *op); void pagedresults_lock(Connection *conn, int index); void pagedresults_unlock(Connection *conn, int index); -int pagedresults_is_abandoned_or_notavailable(Connection *conn, int index); +int pagedresults_is_abandoned_or_notavailable(Connection *conn, int locked, int index); int pagedresults_set_search_result_pb(Slapi_PBlock *pb, void *sr, int locked); /*

1 0

Branch '389-ds-base-1.3.4' - ldap/servers
by thierry bordaz 05 Nov '15

05 Nov '15

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55434d308b4e459ba3a169eff94568312dba767c Author: Thierry Bordaz <tbordaz(a)redhat.com> Date: Tue Nov 3 15:59:54 2015 +0100 Ticket 47976: deadlock in mep delete post op Bug Description: When deleting the original entry, some DB pages are acquired in write. The deadlock occurs because when reading the parent entry of the MEP entry MEP plugin requires read access to one of the page acquired by the deletion of the original entry. The read access can be granted if it is using the parent txn. This bug requires that the parent entry of the MEP entry is not found in the entry cache, so it requires database access Fix Description: Fix ldbm_delete, so that it reads id2entry db with parent txn https://fedorahosted.org/389/ticket/47976 Reviewed by: Ludwig Krispenz, Rich Megginson (Thanks you !!) Platforms tested: F17 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index f31d545..100a71d 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -477,7 +477,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) * the parent. If we fail to lock the entry, just try again. */ while(1){ - parent = id2entry(be, pid ,NULL, &retval); + parent = id2entry(be, pid ,&txn, &retval); if (parent && (cache_retry = cache_lock_entry(&inst->inst_cache, parent))) { /* Failed to obtain parent entry's entry lock */ if(cache_retry == RETRY_CACHE_LOCK &&

1 0

Branch '389-ds-base-1.3.3' - ldap/servers
by thierry bordaz 05 Nov '15

05 Nov '15

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a4db5ec54b8207c4f366230a261b68af6b8c773a Author: Thierry Bordaz <tbordaz(a)redhat.com> Date: Tue Nov 3 15:59:54 2015 +0100 Ticket 47976: deadlock in mep delete post op Bug Description: When deleting the original entry, some DB pages are acquired in write. The deadlock occurs because when reading the parent entry of the MEP entry MEP plugin requires read access to one of the page acquired by the deletion of the original entry. The read access can be granted if it is using the parent txn. This bug requires that the parent entry of the MEP entry is not found in the entry cache, so it requires database access Fix Description: Fix ldbm_delete, so that it reads id2entry db with parent txn https://fedorahosted.org/389/ticket/47976 Reviewed by: Ludwig Krispenz, Rich Megginson (Thanks you !!) Platforms tested: F17 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index 4f97c2b..b9fc81b 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -506,7 +506,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) * the parent. If we fail to lock the entry, just try again. */ while(1){ - parent = id2entry(be, pid ,NULL, &retval); + parent = id2entry(be, pid ,&txn, &retval); if (parent && (cache_retry = cache_lock_entry(&inst->inst_cache, parent))) { /* Failed to obtain parent entry's entry lock */ if(cache_retry == RETRY_CACHE_LOCK &&

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by thierry bordaz 05 Nov '15

05 Nov '15

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 24a38f20ae999cf731702ef1d785f5f0d5cd115f Author: Thierry Bordaz <tbordaz(a)redhat.com> Date: Thu Nov 5 11:44:05 2015 +0100 Ticket 47976: deadlock in mep delete post op Bug Description: When deleting the original entry, some DB pages are acquired in write. The deadlock occurs because when reading the parent entry of the MEP entry MEP plugin requires read access to one of the page acquired by the deletion of the original entry. The read access can be granted if it is using the parent txn. This bug requires that the parent entry of the MEP entry is not found in the entry cache, so it requires database access Fix Description: Fix ldbm_delete, so that it reads id2entry db with parent txn https://fedorahosted.org/389/ticket/47976 Reviewed by: Ludwig Krispenz, Rich Megginson (Thanks you !!) Platforms tested: F17 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index b05f251..5a6fbb5 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -370,7 +370,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) * the parent. If we fail to lock the entry, just try again. */ while(1){ - parent = id2entry(be, pid ,NULL, &retval); + parent = id2entry(be, pid ,&txn, &retval); if (parent && (cache_retry = cache_lock_entry(&inst->inst_cache, parent))) { /* Failed to obtain parent entry's entry lock */ if(cache_retry == RETRY_CACHE_LOCK &&

1 0

ldap/servers
by thierry bordaz 04 Nov '15

04 Nov '15

ldap/servers/slapd/back-ldbm/ldbm_delete.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 83c98d9d325ec38396e1fb5fa12a9694b05dd77f Author: Thierry Bordaz <tbordaz(a)redhat.com> Date: Tue Nov 3 15:59:54 2015 +0100 Ticket 47976: deadlock in mep delete post op Bug Description: When deleting the original entry, some DB pages are acquired in write. The deadlock occurs because when reading the parent entry of the MEP entry MEP plugin requires read access to one of the page acquired by the deletion of the original entry. The read access can be granted if it is using the parent txn. This bug requires that the parent entry of the MEP entry is not found in the entry cache, so it requires database access Fix Description: Fix ldbm_delete, so that it reads id2entry db with parent txn https://fedorahosted.org/389/ticket/47976 Reviewed by: Ludwig Krispenz, Rich Megginson (Thanks you !!) Platforms tested: F17 Flag Day: no Doc impact: no diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c index f31d545..100a71d 100644 --- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c +++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c @@ -477,7 +477,7 @@ ldbm_back_delete( Slapi_PBlock *pb ) * the parent. If we fail to lock the entry, just try again. */ while(1){ - parent = id2entry(be, pid ,NULL, &retval); + parent = id2entry(be, pid ,&txn, &retval); if (parent && (cache_retry = cache_lock_entry(&inst->inst_cache, parent))) { /* Failed to obtain parent entry's entry lock */ if(cache_retry == RETRY_CACHE_LOCK &&

1 0

ldap/servers
by Noriko Hosoi 03 Nov '15

03 Nov '15

ldap/servers/slapd/slapi-plugin.h | 2 +- ldap/servers/slapd/slapi2nspr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 0d1ce9de608d582ea2ca0f5e48fe2f2213f0b683 Author: Martin Basti <mbasti(a)redhat.com> Date: Tue Nov 3 17:32:53 2015 +0100 Add 'void' to function definition to avoid compiler warnings During compiling of FreeIPA we are receiving compiler error: slapi-plugin.h:6149, GNU C Compiler 4 (gcc), Priority: Normal function declaration isn't a prototype [-Wstrict-prototypes] This patch should fix the compiler warning. Reviewed by nhosoi(a)redhat.com. diff --git a/ldap/servers/slapd/slapi-plugin.h b/ldap/servers/slapd/slapi-plugin.h index 72f3920..d2b076b 100644 --- a/ldap/servers/slapd/slapi-plugin.h +++ b/ldap/servers/slapd/slapi-plugin.h @@ -6146,7 +6146,7 @@ int slapi_rwlock_unlock( Slapi_RWLock *rwlock ); * * \return the size of Slapi_RWLock */ -int slapi_rwlock_get_size(); +int slapi_rwlock_get_size( void ); /* * thread-safe LDAP connections diff --git a/ldap/servers/slapd/slapi2nspr.c b/ldap/servers/slapd/slapi2nspr.c index 4bd88fe..1bfb306 100644 --- a/ldap/servers/slapd/slapi2nspr.c +++ b/ldap/servers/slapd/slapi2nspr.c @@ -261,7 +261,7 @@ slapi_rwlock_unlock( Slapi_RWLock *rwlock ) } int -slapi_rwlock_get_size() +slapi_rwlock_get_size( void ) { #ifdef USE_POSIX_RWLOCKS return sizeof(pthread_rwlock_t);

1 0

Changes to '94ca981598d2ed6addd438988f71a489fe456769'
by William Brown 02 Nov '15

02 Nov '15

New branch '94ca981598d2ed6addd438988f71a489fe456769' available with the following commits: commit 94ca981598d2ed6addd438988f71a489fe456769 Author: William Brown <firstyear(a)redhat.com> Date: Tue Nov 3 09:19:54 2015 +1000 Ticket #48317: SELinux port labeling retry attempts are excessive https://fedorahosted.org/389/ticket/48317 Bug Description: In dscreate.pm we attempt to label the ldap_port_t type 60 times in the case of a failure. This is excessive, and it means the setup-ds.pl appears to hang in certain cases. Fix Description: Reduce this number to 5 attempts, and when debug is enabled, display the amount of attempts remaining. Author: wibrown(a)redhat.com Review by: nhosoi(a)redhat.com (Thank you Noriko!)

1 0

Changes to 'be1460bde6016834df7cb74b51fb26dc38abd126'
by William Brown 02 Nov '15

02 Nov '15

New branch 'be1460bde6016834df7cb74b51fb26dc38abd126' available with the following commits: commit 8f82a965819baf183840aeaa3377e777ad1c68fe Author: William Brown <wibrown(a)redhat.com> Date: Wed Oct 28 09:31:06 2015 +1000 Ticket 48313 - MEP suite tests for major functionality https://fedorahosted.org/389/ticket/48313 http://directory.fedoraproject.org/docs/389ds/design/mep-rework.html http://www.port389.org/docs/389ds/design/managed-entry-design.html Bug Description: The managed entries plugin works well for the IPA use case, but has a number of shortcomings when used with existing objects. Before the rewrite as described can be carried out, a complete functional test suite of MEP is required to validate the changes made to the plugin do not break existing use cases. Fix Description: This patch provides tests that cover the current states MEP is capable of handling. This does not cover the states that will be covered by the rework of the plugin. Author: wibrown Reviewed by: spichugi (Thank you!)

1 0

ldap/admin
by Noriko Hosoi 02 Nov '15

02 Nov '15

ldap/admin/src/scripts/DSUtil.pm.in | 6 ++++++ 1 file changed, 6 insertions(+) New commits: commit aff9705dc42bb6109c55336a50219473ab948bbe Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Oct 30 10:43:26 2015 -0700 Ticket #48328 - RFE: Allow RHDS to be setup using a DNS CNAME alias for General.FullMachineName Description: When the Directory Server is installed, its FQDN may need to be an alias (CNAME) to let it run behind the proxy such as a load balancer. The current setup script does not allow it. This patch addes to check the given FQDN with CNAME in addition to doing the reverse lookup. https://fedorahosted.org/389/ticket/48328 Reviewed by wibrown(a)redhat.com (Thank you, William!!) diff --git a/ldap/admin/src/scripts/DSUtil.pm.in b/ldap/admin/src/scripts/DSUtil.pm.in index 93bd54a..9830703 100644 --- a/ldap/admin/src/scripts/DSUtil.pm.in +++ b/ldap/admin/src/scripts/DSUtil.pm.in @@ -241,6 +241,12 @@ sub checkHostname { } } } + if (!$found) { + system("@bindir@/host -t CNAME $hn 2>&1 1> /dev/null"); + if ($? == 0){ + $found = 1; + } + } } elsif (eval {require Socket6; 1}) { debug(1, "Socket6\n"); my @aires = getaddrinfo($hn, "ldap", AF_UNSPEC, SOCK_STREAM);

1 0

dirsrvtests/tickets
by Noriko Hosoi 02 Nov '15

02 Nov '15

dirsrvtests/tickets/ticket48326_test.py | 230 ++++++++++++++++++++++++++++++++ 1 file changed, 230 insertions(+) New commits: commit 8982b3008dcf456a1a116a8aede6f9d35b220bda Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Mon Nov 2 13:53:34 2015 -0800 Ticket #48326 - CI test: added test cases for ticket 48326 Description: [RFE] it could be nice to have nsslapd-maxbersize default to bigger than 2Mb diff --git a/dirsrvtests/tickets/ticket48326_test.py b/dirsrvtests/tickets/ticket48326_test.py new file mode 100644 index 0000000..1434f2d --- /dev/null +++ b/dirsrvtests/tickets/ticket48326_test.py @@ -0,0 +1,230 @@ +# --- BEGIN COPYRIGHT BLOCK --- +# Copyright (C) 2015 Red Hat, Inc. +# All rights reserved. +# +# License: GPL (version 3 or any later version). +# See LICENSE for details. +# --- END COPYRIGHT BLOCK --- +# +import os +import sys +import time +import shlex +import subprocess +import ldap +import logging +import pytest +from lib389 import DirSrv, Entry, tools, tasks +from lib389.tools import DirSrvTools +from lib389._constants import * +from lib389.properties import * +from lib389.tasks import * +from lib389.utils import * + +logging.getLogger(__name__).setLevel(logging.DEBUG) +log = logging.getLogger(__name__) + +installation1_prefix = None + +MYDN = 'uid=tuser1M,dc=example,dc=com' +MYLDIF = 'ticket48326.ldif' + +class TopologyReplication(object): + def __init__(self, master1, master2): + master1.open() + self.master1 = master1 + master2.open() + self.master2 = master2 + + +(a)pytest.fixture(scope="module") +def topology(request): + global installation1_prefix + if installation1_prefix: + args_instance[SER_DEPLOYED_DIR] = installation1_prefix + + # Creating master 1... + master1 = DirSrv(verbose=False) + if installation1_prefix: + args_instance[SER_DEPLOYED_DIR] = installation1_prefix + args_instance[SER_HOST] = HOST_MASTER_1 + args_instance[SER_PORT] = PORT_MASTER_1 + args_instance[SER_SERVERID_PROP] = SERVERID_MASTER_1 + args_instance[SER_CREATION_SUFFIX] = DEFAULT_SUFFIX + args_master = args_instance.copy() + master1.allocate(args_master) + instance_master1 = master1.exists() + if instance_master1: + master1.delete() + master1.create() + master1.open() + master1.replica.enableReplication(suffix=SUFFIX, role=REPLICAROLE_MASTER, replicaId=REPLICAID_MASTER_1) + + # Creating master 2... + master2 = DirSrv(verbose=False) + if installation1_prefix: + args_instance[SER_DEPLOYED_DIR] = installation1_prefix + args_instance[SER_HOST] = HOST_MASTER_2 + args_instance[SER_PORT] = PORT_MASTER_2 + args_instance[SER_SERVERID_PROP] = SERVERID_MASTER_2 + args_instance[SER_CREATION_SUFFIX] = DEFAULT_SUFFIX + args_master = args_instance.copy() + master2.allocate(args_master) + instance_master2 = master2.exists() + if instance_master2: + master2.delete() + master2.create() + master2.open() + master2.replica.enableReplication(suffix=SUFFIX, role=REPLICAROLE_MASTER, replicaId=REPLICAID_MASTER_2) + + # + # Create all the agreements + # + # Creating agreement from master 1 to master 2 + properties = {RA_NAME: r'meTo_$host:$port', + RA_BINDDN: defaultProperties[REPLICATION_BIND_DN], + RA_BINDPW: defaultProperties[REPLICATION_BIND_PW], + RA_METHOD: defaultProperties[REPLICATION_BIND_METHOD], + RA_TRANSPORT_PROT: defaultProperties[REPLICATION_TRANSPORT]} + m1_m2_agmt = master1.agreement.create(suffix=SUFFIX, host=master2.host, port=master2.port, properties=properties) + if not m1_m2_agmt: + log.fatal("Fail to create a master -> master replica agreement") + sys.exit(1) + log.debug("%s created" % m1_m2_agmt) + + # Creating agreement from master 2 to master 1 + properties = {RA_NAME: r'meTo_$host:$port', + RA_BINDDN: defaultProperties[REPLICATION_BIND_DN], + RA_BINDPW: defaultProperties[REPLICATION_BIND_PW], + RA_METHOD: defaultProperties[REPLICATION_BIND_METHOD], + RA_TRANSPORT_PROT: defaultProperties[REPLICATION_TRANSPORT]} + m2_m1_agmt = master2.agreement.create(suffix=SUFFIX, host=master1.host, port=master1.port, properties=properties) + if not m2_m1_agmt: + log.fatal("Fail to create a master -> master replica agreement") + sys.exit(1) + log.debug("%s created" % m2_m1_agmt) + + # Allow the replicas to get situated with the new agreements... + time.sleep(5) + + # + # Initialize all the agreements + # + master1.agreement.init(SUFFIX, HOST_MASTER_2, PORT_MASTER_2) + master1.waitForReplInit(m1_m2_agmt) + + # Check replication is working... + if master1.testReplication(DEFAULT_SUFFIX, master2): + log.info('Replication is working.') + else: + log.fatal('Replication is not working.') + assert False + + # Delete each instance in the end + def fin(): + master1.delete() + master2.delete() + request.addfinalizer(fin) + + # Clear out the tmp dir + master1.clearTmpDir(__file__) + + return TopologyReplication(master1, master2) + + +(a)pytest.fixture(scope="module") + + +def add_entry(topology, server, serverPort, expectToFail): + """ + Adding 1Mentry to the given server + Check the add result based upon the expectToFail info. + """ + if expectToFail: + log.info("Adding 1M entry to %s expecting to fail." % server) + else: + log.info("Adding 1M entry to %s expecting to succeed." % server) + + data_dir_path = topology.master1.getDir(__file__, DATA_DIR) + ldif_file = data_dir_path + MYLDIF + + #strcmdline = '/usr/bin/ldapmodify -x -h localhost -p' + str(serverPort) + '-D' + DN_DM + '-w' + PW_DM + '-af' + ldif_file + #cmdline = shlex.split(strcmdline) + cmdline = ['/usr/bin/ldapmodify', '-x', '-h', 'localhost', '-p', str(serverPort), + '-D', DN_DM, '-w', PW_DM, '-af', ldif_file] + log.info("Running cmdline (%s): %s" % (server, cmdline)) + + try: + proc = subprocess.Popen(cmdline, stderr=subprocess.PIPE) + except Exception as e: + log.info("%s caught in exception: %s" % (cmdline, e)) + assert False + + Found = False + Expected = "ldap_result: Can't contact LDAP server" + while True: + l = proc.stderr.readline() + if l == "": + break + if Expected in l: + Found = True + break + + if expectToFail: + if Found: + log.info("Adding 1M entry to %s failed as expected: %s" % (server, l)) + else: + log.fatal("Expected error message %s was not returned: %s" % Expected) + assert False + else: + if Found: + log.fatal("%s failed although expecting to succeed: %s" % (cmdline, l)) + assert False + else: + log.info("Adding 1M entry to %s succeeded as expected" % server) + + +def test_ticket48326(topology): + """ + maxbersize is ignored in the replicated operations. + [settings] + master1 has default size maxbersize (2MB). + master2 has much saller size maxbersize (20KB). + [test case] + Adding an entry which size is larger than 20KB to master2 fails. + But adding an entry which size is larger than 20KB and less than 2MB to master1 succeeds + and the entry is successfully replicated to master2. + """ + log.info("Ticket 48326 - it could be nice to have nsslapd-maxbersize default to bigger than 2Mb") + log.info("Set nsslapd-maxbersize: 20K to master2") + try: + topology.master2.modify_s("cn=config", [(ldap.MOD_REPLACE, 'nsslapd-maxbersize', '20480')]) + except ldap.LDAPError as e: + log.error('Failed to set nsslapd-maxbersize == 20480: error ' + e.message['desc']) + assert False + + add_entry(topology, "master2", PORT_MASTER_2, True) + + add_entry(topology, "master1", PORT_MASTER_1, False) + + time.sleep(1) + + log.info('Searching for %s on master2...', MYDN) + try: + entries = topology.master2.search_s(MYDN, ldap.SCOPE_BASE, '(objectclass=*)') + if not entries: + log.fatal('Entry %s failed to repliate to master2.' % MYDN) + assert False + else: + log.info('SUCCESS: Entry %s is successfully replicated to master2.' % MYDN) + except ldap.LDAPError as e: + log.fatal('Search failed: ' + e.message['desc']) + assert False + + +if __name__ == '__main__': + # Run isolated + # -s for DEBUG mode + + CURRENT_FILE = os.path.realpath(__file__) + pytest.main("-s %s" % CURRENT_FILE)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits November 2015