diff --git a/contrib/ldaptcl/ldap.n b/contrib/ldaptcl/ldap.n index 786df7d6d6..ec75e3d759 100644 --- a/contrib/ldaptcl/ldap.n +++ b/contrib/ldaptcl/ldap.n @@ -84,8 +84,7 @@ Currently simple and kerberos-based authentication, are supported. To use LDAP and still have reasonable security in a networked, Internet/Intranet environment, secure shell can be used to setup secure, encrypted connections between client machines and the LDAP -server, and between the LDAP server and any replica or slave servers -that might be used. +server, and between all LDAP nodes that might be used. To perform the LDAP "bind" operation: diff --git a/contrib/slapd-modules/lastbind/slapo-lastbind.5 b/contrib/slapd-modules/lastbind/slapo-lastbind.5 index d92a95da8d..d0da8b8dea 100644 --- a/contrib/slapd-modules/lastbind/slapo-lastbind.5 +++ b/contrib/slapd-modules/lastbind/slapo-lastbind.5 @@ -60,7 +60,7 @@ attribute is updated on each successful bind operation. .B lastbind_forward_updates Specify that updates of the authTimestamp attribute on a consumer should be forwarded -to a master instead of being written directly into the consumer's local +to a provider instead of being written directly into the consumer's local database. This setting is only useful on a replication consumer, and also requires the .B updateref diff --git a/doc/guide/admin/Makefile b/doc/guide/admin/Makefile index 1d17dc0508..f23e49f294 100644 --- a/doc/guide/admin/Makefile +++ b/doc/guide/admin/Makefile @@ -69,7 +69,7 @@ sdf-img: \ intro_tree.png \ ldap-sync-refreshandpersist.png \ ldap-sync-refreshonly.png \ - n-way-multi-master.png \ + n-way-multi-provider.png \ push-based-complete.png \ push-based-standalone.png \ refint.png \ diff --git a/doc/guide/admin/config.sdf b/doc/guide/admin/config.sdf index 28b3065f26..8f02ea081b 100644 --- a/doc/guide/admin/config.sdf +++ b/doc/guide/admin/config.sdf @@ -45,9 +45,9 @@ H2: Replicated Directory Service slapd(8) includes support for {{LDAP Sync}}-based replication, called {{syncrepl}}, which may be used to maintain shadow copies of directory information on multiple directory servers. In its most basic -configuration, the {{master}} is a syncrepl provider and one or more -{{slave}} (or {{shadow}}) are syncrepl consumers. An example -master-slave configuration is shown in figure 3.3. Multi-Master +configuration, the {{provider}} is a syncrepl provider and one or more +{{consumer}} (or {{shadow}}) are syncrepl consumers. An example +provider-consumer configuration is shown in figure 3.3. Multi-Provider configurations are also supported. !import "config_repl.png"; align="center"; title="Replicated Directory Services" diff --git a/doc/guide/admin/intro.sdf b/doc/guide/admin/intro.sdf index dac2a9d733..dbfd3333da 100644 --- a/doc/guide/admin/intro.sdf +++ b/doc/guide/admin/intro.sdf @@ -33,7 +33,7 @@ tuned to give quick response to high-volume lookup or search operations. They may have the ability to replicate information widely in order to increase availability and reliability, while reducing response time. When directory information is replicated, -temporary inconsistencies between the replicas may be okay, as long +temporary inconsistencies between the consumers may be okay, as long as inconsistencies are resolved in a timely manner. There are many different ways to provide a directory service. @@ -430,11 +430,11 @@ a pool of threads. This reduces the amount of system overhead required while providing high performance. {{B:Replication}}: {{slapd}} can be configured to maintain shadow -copies of directory information. This {{single-master/multiple-slave}} +copies of directory information. This {{single-provider/multiple-consumer}} replication scheme is vital in high-volume environments where a single {{slapd}} installation just doesn't provide the necessary availability or reliability. For extremely demanding environments where a -single point of failure is not acceptable, {{multi-master}} replication +single point of failure is not acceptable, {{multi-provider}} replication is also available. {{slapd}} includes support for {{LDAP Sync}}-based replication. diff --git a/doc/guide/admin/maintenance.sdf b/doc/guide/admin/maintenance.sdf index 706a5dd1b8..17d234fb86 100644 --- a/doc/guide/admin/maintenance.sdf +++ b/doc/guide/admin/maintenance.sdf @@ -87,7 +87,7 @@ type are: .{{S: }} +{{B: Start the server}} -Obviously this doesn't cater for any complicated deployments like {{SECT: MirrorMode}} or {{SECT: N-Way Multi-Master}}, +Obviously this doesn't cater for any complicated deployments like {{SECT: MirrorMode}} or {{SECT: N-Way Multi-Provider}}, but following the above sections and using either commercial support or community support should help. Also check the {{SECT: Troubleshooting}} section. diff --git a/doc/guide/admin/n-way-multi-master.png b/doc/guide/admin/n-way-multi-provider.png similarity index 100% rename from doc/guide/admin/n-way-multi-master.png rename to doc/guide/admin/n-way-multi-provider.png diff --git a/doc/guide/admin/overlays.sdf b/doc/guide/admin/overlays.sdf index 6613c4176a..b5c2cc1528 100644 --- a/doc/guide/admin/overlays.sdf +++ b/doc/guide/admin/overlays.sdf @@ -79,7 +79,7 @@ or in raw form. It is also used for {{SECT:delta-syncrepl replication}} -Note: An accesslog database is unique to a given master. It should +Note: An accesslog database is unique to a given provider. It should never be replicated. H3: Access Logging Configuration @@ -255,13 +255,13 @@ default when {{B:--enable-ldap}}. H3: Chaining Configuration In order to demonstrate how this overlay works, we shall discuss a typical -scenario which might be one master server and three Syncrepl slaves. +scenario which might be one provider server and three Syncrepl replicas. On each replica, add this near the top of the {{slapd.conf}}(5) file (global), before any database definitions: > overlay chain -> chain-uri "ldap://ldapmaster.example.com" +> chain-uri "ldap://ldapprovider.example.com" > chain-idassert-bind bindmethod="simple" > binddn="cn=Manager,dc=example,dc=com" > credentials="" @@ -271,48 +271,48 @@ On each replica, add this near the top of the {{slapd.conf}}(5) file Add this below your {{syncrepl}} statement: -> updateref "ldap://ldapmaster.example.com/" +> updateref "ldap://ldapprovider.example.com/" -The {{B:chain-tls}} statement enables TLS from the slave to the ldap master. +The {{B:chain-tls}} statement enables TLS from the replica to the ldap provider. The DITs are exactly the same between these machines, therefore whatever user -bound to the slave will also exist on the master. If that DN does not have -update privileges on the master, nothing will happen. +bound to the replica will also exist on the provider. If that DN does not have +update privileges on the provider, nothing will happen. -You will need to restart the slave after these {{slapd.conf}} changes. +You will need to restart the replica after these {{slapd.conf}} changes. Then, if you are using {{loglevel stats}} (256), you can monitor an -{{ldapmodify}} on the slave and the master. (If you're using {{cn=config}} +{{ldapmodify}} on the replica and the provider. (If you're using {{cn=config}} no restart is required.) -Now start an {{ldapmodify}} on the slave and watch the logs. You should expect +Now start an {{ldapmodify}} on the replica and watch the logs. You should expect something like: -> Sep 6 09:27:25 slave1 slapd[29274]: conn=11 fd=31 ACCEPT from IP=143.199.102.216:45181 (IP=143.199.102.216:389) -> Sep 6 09:27:25 slave1 slapd[29274]: conn=11 op=0 STARTTLS -> Sep 6 09:27:25 slave1 slapd[29274]: conn=11 op=0 RESULT oid= err=0 text= -> Sep 6 09:27:25 slave1 slapd[29274]: conn=11 fd=31 TLS established tls_ssf=256 ssf=256 -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=1 BIND dn="uid=user1,ou=people,dc=example,dc=com" method=128 -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=1 BIND dn="uid=user1,ou=People,dc=example,dc=com" mech=SIMPLE ssf=0 -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=1 RESULT tag=97 err=0 text= -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=2 MOD dn="uid=user1,ou=People,dc=example,dc=com" -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=2 MOD attr=mail -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=2 RESULT tag=103 err=0 text= -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 op=3 UNBIND -> Sep 6 09:27:28 slave1 slapd[29274]: conn=11 fd=31 closed -> Sep 6 09:27:28 slave1 slapd[29274]: syncrepl_entry: LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_MODIFY) -> Sep 6 09:27:28 slave1 slapd[29274]: syncrepl_entry: be_search (0) -> Sep 6 09:27:28 slave1 slapd[29274]: syncrepl_entry: uid=user1,ou=People,dc=example,dc=com -> Sep 6 09:27:28 slave1 slapd[29274]: syncrepl_entry: be_modify (0) +> Sep 6 09:27:25 replica1 slapd[29274]: conn=11 fd=31 ACCEPT from IP=143.199.102.216:45181 (IP=143.199.102.216:389) +> Sep 6 09:27:25 replica1 slapd[29274]: conn=11 op=0 STARTTLS +> Sep 6 09:27:25 replica1 slapd[29274]: conn=11 op=0 RESULT oid= err=0 text= +> Sep 6 09:27:25 replica1 slapd[29274]: conn=11 fd=31 TLS established tls_ssf=256 ssf=256 +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=1 BIND dn="uid=user1,ou=people,dc=example,dc=com" method=128 +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=1 BIND dn="uid=user1,ou=People,dc=example,dc=com" mech=SIMPLE ssf=0 +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=1 RESULT tag=97 err=0 text= +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=2 MOD dn="uid=user1,ou=People,dc=example,dc=com" +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=2 MOD attr=mail +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=2 RESULT tag=103 err=0 text= +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 op=3 UNBIND +> Sep 6 09:27:28 replica1 slapd[29274]: conn=11 fd=31 closed +> Sep 6 09:27:28 replica1 slapd[29274]: syncrepl_entry: LDAP_RES_SEARCH_ENTRY(LDAP_SYNC_MODIFY) +> Sep 6 09:27:28 replica1 slapd[29274]: syncrepl_entry: be_search (0) +> Sep 6 09:27:28 replica1 slapd[29274]: syncrepl_entry: uid=user1,ou=People,dc=example,dc=com +> Sep 6 09:27:28 replica1 slapd[29274]: syncrepl_entry: be_modify (0) -And on the master you will see this: +And on the provider you will see this: -> Sep 6 09:23:57 ldapmaster slapd[2961]: conn=55902 op=3 PROXYAUTHZ dn="uid=user1,ou=people,dc=example,dc=com" -> Sep 6 09:23:57 ldapmaster slapd[2961]: conn=55902 op=3 MOD dn="uid=user1,ou=People,dc=example,dc=com" -> Sep 6 09:23:57 ldapmaster slapd[2961]: conn=55902 op=3 MOD attr=mail -> Sep 6 09:23:57 ldapmaster slapd[2961]: conn=55902 op=3 RESULT tag=103 err=0 text= +> Sep 6 09:23:57 ldapprovider slapd[2961]: conn=55902 op=3 PROXYAUTHZ dn="uid=user1,ou=people,dc=example,dc=com" +> Sep 6 09:23:57 ldapprovider slapd[2961]: conn=55902 op=3 MOD dn="uid=user1,ou=People,dc=example,dc=com" +> Sep 6 09:23:57 ldapprovider slapd[2961]: conn=55902 op=3 MOD attr=mail +> Sep 6 09:23:57 ldapprovider slapd[2961]: conn=55902 op=3 RESULT tag=103 err=0 text= -Note: You can clearly see the PROXYAUTHZ line on the master, indicating the -proper identity assertion for the update on the master. Also note the slave -immediately receiving the Syncrepl update from the master. +Note: You can clearly see the PROXYAUTHZ line on the provider, indicating the +proper identity assertion for the update on the provider. Also note the replica +immediately receiving the Syncrepl update from the provider. H3: Handling Chaining Errors @@ -678,8 +678,8 @@ H2: The Proxy Cache Engine {{TERM:LDAP}} servers typically hold one or more subtrees of a {{TERM:DIT}}. Replica (or shadow) servers hold shadow copies of -entries held by one or more master servers. Changes are propagated -from the master server to replica (slave) servers using LDAP Sync +entries held by one or more provider servers. Changes are propagated +from the provider server to replica servers using LDAP Sync replication. An LDAP cache is a special type of replica which holds entries corresponding to search filters instead of subtrees. diff --git a/doc/guide/admin/replication.sdf b/doc/guide/admin/replication.sdf index 6859b563a1..a31148e543 100644 --- a/doc/guide/admin/replication.sdf +++ b/doc/guide/admin/replication.sdf @@ -37,12 +37,12 @@ short, is a consumer-side replication engine that enables the consumer {{TERM:LDAP}} server to maintain a shadow copy of a {{TERM:DIT}} fragment. A syncrepl engine resides at the consumer and executes as one of the {{slapd}}(8) threads. It creates and maintains a -consumer replica by connecting to the replication provider to perform +replica by connecting to the replication provider to perform the initial DIT content load followed either by periodic content polling or by timely updates upon content changes. Syncrepl uses the LDAP Content Synchronization protocol (or LDAP Sync for -short) as the replica synchronization protocol. LDAP Sync provides +short) as the consumer synchronization protocol. LDAP Sync provides a stateful replication which supports both pull-based and push-based synchronization and does not mandate the use of a history store. In pull-based replication the consumer periodically @@ -58,11 +58,11 @@ maintaining and exchanging synchronization cookies. Because the syncrepl consumer and provider maintain their content status, the consumer can poll the provider content to perform incremental synchronization by asking for the entries required to make the -consumer replica up-to-date with the provider content. Syncrepl -also enables convenient management of replicas by maintaining replica -status. The consumer replica can be constructed from a consumer-side +consumer up-to-date with the provider content. Syncrepl +also enables convenient management of consumers by maintaining replication +status. The consumer database can be constructed from a consumer-side or a provider-side backup at any synchronization status. Syncrepl -can automatically resynchronize the consumer replica up-to-date +can automatically resynchronize the consumer database to be up-to-date with the current provider content. Syncrepl supports both pull-based and push-based synchronization. @@ -81,7 +81,7 @@ The provider keeps track of the consumer servers that have requested a persistent search and sends them necessary updates as the provider replication content gets modified. -With syncrepl, a consumer server can create a replica without +With syncrepl, a consumer can create a replication agreement without changing the provider's configurations and without restarting the provider server, if the consumer server has appropriate access privileges for the DIT fragment to be replicated. The consumer @@ -90,7 +90,7 @@ changes and restart. Syncrepl supports partial, sparse, and fractional replications. The shadow DIT fragment is defined by a general search criteria consisting of -base, scope, filter, and attribute list. The replica content is +base, scope, filter, and attribute list. The consumer content is also subject to the access privileges of the bind identity of the syncrepl replication connection. @@ -204,13 +204,12 @@ The syncrepl engine utilizes both the present phase and the delete phase of the refresh synchronization. It is possible to configure a session log in the provider which stores the {{EX:entryUUID}}s of a finite number of entries deleted from a -database. Multiple replicas share the same session log. The syncrepl -engine uses the -delete phase if the session log is present and the state of the -consumer server is recent enough that no session log entries are +database. Multiple consumers share the same session log. The syncrepl +engine uses the delete phase if the session log is present and the state +of the consumer server is recent enough that no session log entries are truncated after the last synchronization of the client. The syncrepl engine uses the present phase if no session log is configured for -the replication content or if the consumer replica is too outdated +the replication content or if the consumer is too outdated to be covered by the session log. The current design of the session log store is memory based, so the information contained in the session log is not persistent over multiple provider invocations. @@ -265,9 +264,9 @@ database yielded a greater {{EX:entryCSN}} than was previously recorded in the suffix entry's {{EX:contextCSN}} attribute, a checkpoint will be immediately written with the new value. -The consumer also stores its replica state, which is the provider's +The consumer also stores its replication state, which is the provider's {{EX:contextCSN}} received as a synchronization cookie, in the -{{EX:contextCSN}} attribute of the suffix entry. The replica state +{{EX:contextCSN}} attribute of the suffix entry. The replication state maintained by a consumer server is used as the synchronization state indicator when it performs subsequent incremental synchronization with the provider server. It is also used as a provider-side @@ -281,8 +280,8 @@ actions. Because a general search filter can be used in the syncrepl specification, some entries in the context may be omitted from the synchronization content. The syncrepl engine creates a glue entry -to fill in the holes in the replica context if any part of the -replica content is subordinate to the holes. The glue entries will +to fill in the holes in the consumer context if any part of the +consumer content is subordinate to the holes. The glue entries will not be returned in the search result unless {{ManageDsaIT}} control is provided. @@ -320,7 +319,7 @@ multiple objects. For example, suppose you have a database consisting of 102,400 objects of 1 KB each. Further, suppose you routinely run a batch job to change the value of a single two-byte attribute value that appears in each of the 102,400 objects -on the master. Not counting LDAP and TCP/IP protocol overhead, each time you +on the provider. Not counting LDAP and TCP/IP protocol overhead, each time you run this job each consumer will transfer and process {{B:100 MB}} of data to process {{B:200KB of changes!}} @@ -338,7 +337,7 @@ situations like the one described above. Delta-syncrepl works by maintaining a changelog of a selectable depth in a separate database on the provider. The replication consumer checks the changelog for the changes it needs and, as long as the changelog contains the needed changes, the consumer fetches the changes -from the changelog and applies them to its database. If, however, a replica +from the changelog and applies them to its database. If, however, a consumer is too far out of sync (or completely empty), conventional syncrepl is used to bring it up to date and replication then switches back to the delta-syncrepl mode. @@ -351,12 +350,12 @@ it to another machine. For configuration, please see the {{SECT:Delta-syncrepl}} section. -H3: N-Way Multi-Master replication +H3: N-Way Multi-Provider Replication -Multi-Master replication is a replication technique using Syncrepl to replicate -data to multiple provider ("Master") Directory servers. +Multi-Provider replication is a replication technique using Syncrepl to replicate +data to multiple provider ("Provider") Directory servers. -H4: Valid Arguments for Multi-Master replication +H4: Valid Arguments for Multi-Provider replication * If any provider fails, other providers will continue to accept updates * Avoids a single point of failure @@ -364,21 +363,21 @@ H4: Valid Arguments for Multi-Master replication the network/globe. * Good for Automatic failover/High Availability -H4: Invalid Arguments for Multi-Master replication +H4: Invalid Arguments for Multi-Provider replication -(These are often claimed to be advantages of Multi-Master replication but +(These are often claimed to be advantages of Multi-Provider replication but those claims are false): * It has {{B:NOTHING}} to do with load balancing * Providers {{B:must}} propagate writes to {{B:all}} the other servers, which means the network traffic and write load spreads across all -of the servers the same as for single-master. +of the servers the same as for single-provider. * Server utilization and performance are at best identical for -Multi-Master and Single-Master replication; at worst Single-Master is +Multi-Provider and Single-Provider replication; at worst Single-Provider is superior because indexing can be tuned differently to optimize for the different usage patterns between the provider and the consumers. -H4: Arguments against Multi-Master replication +H4: Arguments against Multi-Provider replication * Breaks the data consistency guarantees of the directory model * {{URL:http://www.openldap.org/faq/data/cache/1240.html}} @@ -387,18 +386,18 @@ H4: Arguments against Multi-Master replication * Typically, a particular machine cannot distinguish between losing contact with a peer because that peer crashed, or because the network link has failed * If a network is partitioned and multiple clients start writing to each of the -"masters" then reconciliation will be a pain; it may be best to simply deny +"providers" then reconciliation will be a pain; it may be best to simply deny writes to the clients that are partitioned from the single provider -For configuration, please see the {{SECT:N-Way Multi-Master}} section below +For configuration, please see the {{SECT:N-Way Multi-Provider}} section below H3: MirrorMode replication MirrorMode is a hybrid configuration that provides all of the consistency -guarantees of single-master replication, while also providing the high -availability of multi-master. In MirrorMode two providers are set up to -replicate from each other (as a multi-master configuration), but an +guarantees of single-provider replication, while also providing the high +availability of multi-provider. In MirrorMode two providers are set up to +replicate from each other (as a multi-provider configuration), but an external frontend is employed to direct all writes to only one of the two servers. The second provider will only be used for writes if the first provider crashes, at which point the frontend will switch to @@ -417,7 +416,7 @@ can be ready to take over (hot standby) H4: Arguments against MirrorMode -* MirrorMode is not what is termed as a Multi-Master solution. This is because +* MirrorMode is not what is termed as a Multi-Provider solution. This is because writes have to go to just one of the mirror nodes at a time * MirrorMode can be termed as Active-Active Hot-Standby, therefore an external server (slapd in proxy mode) or device (hardware load balancer) @@ -452,21 +451,21 @@ H4: Syncrepl configuration Because syncrepl is a consumer-side replication engine, the syncrepl specification is defined in {{slapd.conf}}(5) of the consumer server, not in the provider server's configuration file. The initial -loading of the replica content can be performed either by starting +loading of the consumer content can be performed either by starting the syncrepl engine with no synchronization cookie or by populating -the consumer replica by loading an {{TERM:LDIF}} file dumped as a +the consumer by loading an {{TERM:LDIF}} file dumped as a backup at the provider. When loading from a backup, it is not required to perform the initial loading from the up-to-date backup of the provider content. The syncrepl engine will automatically synchronize the initial consumer -replica to the current provider content. As a result, it is not -required to stop the provider server in order to avoid the replica +to the current provider content. As a result, it is not +required to stop the provider server in order to avoid the replication inconsistency caused by the updates to the provider content during the content backup and loading process. When replicating a large scale directory, especially in a bandwidth -constrained environment, it is advised to load the consumer replica +constrained environment, it is advised to load the consumer from a backup instead of performing a full initial load using syncrepl. @@ -540,8 +539,8 @@ A more complete example of the {{slapd.conf}}(5) content is thus: H4: Set up the consumer slapd -The syncrepl replication is specified in the database section of -{{slapd.conf}}(5) for the replica context. The syncrepl engine +The syncrepl directive is specified in the database section of +{{slapd.conf}}(5) for the consumer context. The syncrepl engine is backend independent and the directive can be defined with any database type. @@ -608,27 +607,27 @@ in order to start the synchronization from a specific state. The cookie is a comma separated list of name=value pairs. Currently supported syncrepl cookie fields are {{csn=}} and {{rid=}}. {{}} represents the current synchronization state of the -consumer replica. {{}} identifies a consumer replica locally +consumer. {{}} identifies a consumer locally within the consumer server. It is used to relate the cookie to the syncrepl definition in {{slapd.conf}}(5) which has the matching -replica identifier. The {{}} must have no more than 3 decimal +{{}}. The {{}} must have no more than 3 decimal digits. The command line cookie overrides the synchronization -cookie stored in the consumer replica database. +cookie stored in the consumer database. H3: Delta-syncrepl H4: Delta-syncrepl Provider configuration -Setting up delta-syncrepl requires configuration changes on both the master and +Setting up delta-syncrepl requires configuration changes on both the provider and replica servers: -> # Give the replica DN unlimited read access. This ACL needs to be +> # Give the replicator DN unlimited read access. This ACL needs to be > # merged with other ACL statements, and/or moved within the scope > # of a database. The "by * break" portion causes evaluation of > # subsequent rules. See slapd.access(5) for details. > access to * -> by dn.base="cn=replicator,dc=symas,dc=com" read +> by dn.base="cn=replicator,dc=example,dc=com" read > by * break > > # Set the module path location @@ -655,8 +654,8 @@ replica servers: > syncprov-nopresent TRUE > syncprov-reloadhint TRUE > -> # Let the replica DN have limitless searches -> limits dn.exact="cn=replicator,dc=symas,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited +> # Let the replicator DN have limitless searches +> limits dn.exact="cn=replicator,dc=example,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited > > # Primary database definitions > database mdb @@ -681,8 +680,8 @@ replica servers: > # scan the accesslog DB every day, and purge entries older than 7 days > logpurge 07+00:00 01+00:00 > -> # Let the replica DN have limitless searches -> limits dn.exact="cn=replicator,dc=symas,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited +> # Let the replicator DN have limitless searches +> limits dn.exact="cn=replicator,dc=example,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited For more information, always consult the relevant man pages ({{slapo-accesslog}}(5) and {{slapd.conf}}(5)) @@ -702,11 +701,11 @@ H4: Delta-syncrepl Consumer configuration > > # syncrepl directives > syncrepl rid=0 -> provider=ldap://ldapmaster.symas.com:389 +> provider=ldap://ldapprovider.example.com:389 > bindmethod=simple -> binddn="cn=replicator,dc=symas,dc=com" +> binddn="cn=replicator,dc=example,dc=com" > credentials=secret -> searchbase="dc=symas,dc=com" +> searchbase="dc=example,dc=com" > logbase="cn=accesslog" > logfilter="(&(objectClass=auditWriteObject)(reqResult=0))" > schemachecking=on @@ -714,20 +713,20 @@ H4: Delta-syncrepl Consumer configuration > retry="60 +" > syncdata=accesslog > -> # Refer updates to the master -> updateref ldap://ldapmaster.symas.com +> # Refer updates to the provider +> updateref ldap://ldapprovider.example.com The above configuration assumes that you have a replicator identity defined in your database that can be used to bind to the provider. -Note: An accesslog database is unique to a given master. It should +Note: An accesslog database is unique to a given provider. It should never be replicated. -H3: N-Way Multi-Master +H3: N-Way Multi-Provider -For the following example we will be using 3 Master nodes. Keeping in line with -{{B:test050-syncrepl-multimaster}} of the OpenLDAP test suite, we will be configuring +For the following example we will be using 3 Provider nodes. Keeping in line with +{{B:test050-syncrepl-multiprovider}} of the OpenLDAP test suite, we will be configuring {{slapd(8)}} via {{B:cn=config}} This sets up the config database: @@ -754,7 +753,7 @@ second and third servers will have a different olcServerID obviously: > olcDatabase: {0}config > olcRootPW: secret -This sets up syncrepl as a provider (since these are all masters): +This sets up syncrepl as a provider (since these are all providers): > dn: cn=module,cn=config > objectClass: olcModuleList @@ -762,7 +761,7 @@ This sets up syncrepl as a provider (since these are all masters): > olcModulePath: /usr/local/libexec/openldap > olcModuleLoad: syncprov.la -Now we setup the first Master Node (replace $URI1, $URI2 and $URI3 etc. with your actual ldap urls): +Now we setup the first Provider Node (replace $URI1, $URI2 and $URI3 etc. with your actual ldap urls): > dn: cn=config > changetype: modify @@ -793,9 +792,9 @@ Now we setup the first Master Node (replace $URI1, $URI2 and $URI3 etc. with you > add: olcMirrorMode > olcMirrorMode: TRUE -Now start up the Master and a consumer/s, also add the above LDIF to the first consumer, second consumer etc. It will then replicate {{B:cn=config}}. You now have N-Way Multimaster on the config database. +Now start up the provider and a consumer/s, also add the above LDIF to the first consumer, second consumer etc. It will then replicate {{B:cn=config}}. You now have N-Way Multi-Provider on the config database. -We still have to replicate the actual data, not just the config, so add to the master (all active and configured consumers/masters will pull down this config, as they are all syncing). Also, replace all {{${}}} variables with whatever is applicable to your setup: +We still have to replicate the actual data, not just the config, so add to the provider (all active and configured consumers/providers will pull down this config, as they are all syncing). Also, replace all {{${}}} variables with whatever is applicable to your setup: > dn: olcDatabase={1}$BACKEND,cn=config > objectClass: olcDatabaseConfig @@ -912,8 +911,8 @@ can either setup in normal {{SECT:syncrepl replication}} mode, or in H4: MirrorMode Summary You will now have a directory architecture that provides all of the -consistency guarantees of single-master replication, while also providing the -high availability of multi-master replication. +consistency guarantees of single-provider replication, while also providing the +high availability of multi-provider replication. H3: Syncrepl Proxy @@ -924,7 +923,7 @@ FT[align="Center"] Figure X.Y: Replacing slurpd The following example is for a self-contained push-based replication solution: > ####################################################################### -> # Standard OpenLDAP Master/Provider +> # Standard OpenLDAP Provider > ####################################################################### > > include /usr/local/etc/openldap/schema/core.schema @@ -966,7 +965,7 @@ The following example is for a self-contained push-based replication solution: > overlay syncprov > syncprov-checkpoint 1000 60 > -> # Let the replica DN have limitless searches +> # Let the replicator DN have limitless searches > limits dn.exact="cn=replicator,dc=suretecsystems,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited > > database monitor @@ -1008,7 +1007,7 @@ The following example is for a self-contained push-based replication solution: A replica configuration for this type of setup could be: > ####################################################################### -> # Standard OpenLDAP Slave without Syncrepl +> # Standard OpenLDAP Replica without Syncrepl > ####################################################################### > > include /usr/local/etc/openldap/schema/core.schema @@ -1031,8 +1030,9 @@ A replica configuration for this type of setup could be: > > database mdb > suffix "dc=suretecsystems,dc=com" -> directory /usr/local/var/openldap-slave/data +> directory /usr/local/var/openldap-consumer/data > +> maxsize 85899345920 > checkpoint 1024 5 > > index objectClass eq @@ -1042,12 +1042,12 @@ A replica configuration for this type of setup could be: > rootdn "cn=admin,dc=suretecsystems,dc=com" > rootpw testing > -> # Let the replica DN have limitless searches +> # Let the replicator DN have limitless searches > limits dn.exact="cn=replicator,dc=suretecsystems,dc=com" time.soft=unlimited time.hard=unlimited size.soft=unlimited size.hard=unlimited > > updatedn "cn=replicator,dc=suretecsystems,dc=com" > -> # Refer updates to the master +> # Refer updates to the provider > updateref ldap://localhost:9011 > > database monitor @@ -1057,7 +1057,7 @@ A replica configuration for this type of setup could be: You can see we use the {{updatedn}} directive here and example ACLs ({{F:usr/local/etc/openldap/slapd.acl}}) for this could be: -> # Give the replica DN unlimited read access. This ACL may need to be +> # Give the replicator DN unlimited read access. This ACL may need to be > # merged with other ACL statements. > > access to * @@ -1082,10 +1082,10 @@ You can see we use the {{updatedn}} directive here and example ACLs ({{F:usr/loc In order to support more replicas, just add more {{database ldap}} sections and increment the {{syncrepl rid}} number accordingly. -Note: You must populate the Master and Slave directories with the same data, +Note: You must populate the Provider and Replica directories with the same data, unlike when using normal Syncrepl -If you do not have access to modify the master directory configuration you can +If you do not have access to modify the provider directory configuration you can configure a standalone ldap proxy, which might look like: !import "push-based-standalone.png"; align="center"; title="Syncrepl Standalone Proxy Mode" diff --git a/doc/guide/admin/slapdconf2.sdf b/doc/guide/admin/slapdconf2.sdf index bacd074d7d..87d8de25a9 100644 --- a/doc/guide/admin/slapdconf2.sdf +++ b/doc/guide/admin/slapdconf2.sdf @@ -567,12 +567,12 @@ H4: olcSyncrepl > [syncdata=default|accesslog|changelog] -This directive specifies the current database as a replica of the -master content by establishing the current {{slapd}}(8) as a +This directive specifies the current database as a consumer of the +provider content by establishing the current {{slapd}}(8) as a replication consumer site running a syncrepl replication engine. -The master database is located at the replication provider site -specified by the {{EX:provider}} parameter. The replica database is -kept up-to-date with the master content using the LDAP Content +The provider database is located at the provider site +specified by the {{EX:provider}} parameter. The consumer database is +kept up-to-date with the provider content using the LDAP Content Synchronization protocol. See {{REF:RFC4533}} for more information on the protocol. @@ -583,19 +583,16 @@ described by the current {{EX:syncrepl}} directive. {{EX:}} is non-negative and is no more than three decimal digits in length. The {{EX:provider}} parameter specifies the replication provider site -containing the master content as an LDAP URI. The {{EX:provider}} +containing the provider content as an LDAP URI. The {{EX:provider}} parameter specifies a scheme, a host and optionally a port where the provider slapd instance can be found. Either a domain name or IP address may be used for . Examples are {{EX:ldap://provider.example.com:389}} or {{EX:ldaps://192.168.1.1:636}}. If is not given, the standard LDAP port number (389 or 636) is used. Note that the syncrepl uses a consumer-initiated protocol, and hence its -specification is located at the consumer site, whereas the {{EX:replica}} -specification is located at the provider site. {{EX:syncrepl}} and -{{EX:replica}} directives define two independent replication -mechanisms. They do not represent the replication peers of each other. +specification is located on the consumer. -The content of the syncrepl replica is defined using a search +The content of the syncrepl consumer is defined using a search specification as its result set. The consumer slapd will send search requests to the provider slapd according to the search specification. The search specification includes {{EX:searchbase}}, @@ -618,7 +615,7 @@ synchronization operation finishes. The interval is specified by the {{EX:interval}} parameter. It is set to one day by default. In the {{EX:refreshAndPersist}} operation, a synchronization search remains persistent in the provider {{slapd}} instance. Further updates to the -master replica will generate {{EX:searchResultEntry}} to the consumer slapd +provider will generate {{EX:searchResultEntry}} to the consumer slapd as the search responses to the persistent synchronization search. If an error occurs during replication, the consumer will attempt to reconnect @@ -631,8 +628,8 @@ indefinite number of retries until success. The schema checking can be enforced at the LDAP Sync consumer site by turning on the {{EX:schemachecking}} parameter. If it is turned on, every replicated entry will be checked for its -schema as the entry is stored into the replica content. -Every entry in the replica should contain those attributes +schema as the entry is stored on the consumer. +Every entry in the consumer should contain those attributes required by the schema definition. If it is turned off, entries will be stored without checking schema conformance. The default is off. @@ -640,7 +637,7 @@ schema conformance. The default is off. The {{EX:binddn}} parameter gives the DN to bind as for the syncrepl searches to the provider slapd. It should be a DN which has read access to the replication content in the -master database. +provider database. The {{EX:bindmethod}} is {{EX:simple}} or {{EX:sasl}}, depending on whether simple password-based authentication or @@ -705,14 +702,15 @@ for more details. H4: olcUpdateref: -This directive is only applicable in a slave slapd. It +This directive is only applicable in a {{replica}} (or {{shadow}}) +{{slapd}}(8) instance. It specifies the URL to return to clients which submit update requests upon the replica. If specified multiple times, each {{TERM:URL}} is provided. \Example: -> olcUpdateref: ldap://master.example.net +> olcUpdateref: ldap://provider.example.net H4: Sample Entries diff --git a/doc/guide/admin/slapdconfig.sdf b/doc/guide/admin/slapdconfig.sdf index bd1f83aef8..a763ff188f 100644 --- a/doc/guide/admin/slapdconfig.sdf +++ b/doc/guide/admin/slapdconfig.sdf @@ -425,12 +425,12 @@ H4: syncrepl > [syncdata=default|accesslog|changelog] -This directive specifies the current database as a replica of the -master content by establishing the current {{slapd}}(8) as a +This directive specifies the current database as a consumer of the +provider content by establishing the current {{slapd}}(8) as a replication consumer site running a syncrepl replication engine. -The master database is located at the replication provider site -specified by the {{EX:provider}} parameter. The replica database is -kept up-to-date with the master content using the LDAP Content +The provider database is located at the replication provider site +specified by the {{EX:provider}} parameter. The consumer database is +kept up-to-date with the provider content using the LDAP Content Synchronization protocol. See {{REF:RFC4533}} for more information on the protocol. @@ -441,19 +441,16 @@ described by the current {{EX:syncrepl}} directive. {{EX:}} is non-negative and is no more than three decimal digits in length. The {{EX:provider}} parameter specifies the replication provider site -containing the master content as an LDAP URI. The {{EX:provider}} +containing the provider content as an LDAP URI. The {{EX:provider}} parameter specifies a scheme, a host and optionally a port where the provider slapd instance can be found. Either a domain name or IP address may be used for . Examples are {{EX:ldap://provider.example.com:389}} or {{EX:ldaps://192.168.1.1:636}}. If is not given, the standard LDAP port number (389 or 636) is used. Note that the syncrepl uses a consumer-initiated protocol, and hence its -specification is located at the consumer site, whereas the {{EX:replica}} -specification is located at the provider site. {{EX:syncrepl}} and -{{EX:replica}} directives define two independent replication -mechanisms. They do not represent the replication peers of each other. +specification is located on the consumer. -The content of the syncrepl replica is defined using a search +The content of the syncrepl consumer is defined using a search specification as its result set. The consumer slapd will send search requests to the provider slapd according to the search specification. The search specification includes {{EX:searchbase}}, @@ -477,7 +474,7 @@ synchronization operation finishes. The interval is specified by the {{EX:interval}} parameter. It is set to one day by default. In the {{EX:refreshAndPersist}} operation, a synchronization search remains persistent in the provider {{slapd}} instance. Further updates to the -master replica will generate {{EX:searchResultEntry}} to the consumer slapd +provider will generate {{EX:searchResultEntry}} to the consumer slapd as the search responses to the persistent synchronization search. If an error occurs during replication, the consumer will attempt to reconnect @@ -490,8 +487,8 @@ indefinite number of retries until success. The schema checking can be enforced at the LDAP Sync consumer site by turning on the {{EX:schemachecking}} parameter. If it is turned on, every replicated entry will be checked for its -schema as the entry is stored into the replica content. -Every entry in the replica should contain those attributes +schema as the entry is stored on the consumer. +Every entry in the consumer should contain those attributes required by the schema definition. If it is turned off, entries will be stored without checking schema conformance. The default is off. @@ -505,7 +502,7 @@ defaults for these parameters come from {{ldap.conf}}(5). The {{EX:binddn}} parameter gives the DN to bind as for the syncrepl searches to the provider slapd. It should be a DN which has read access to the replication content in the -master database. +provider database. The {{EX:bindmethod}} is {{EX:simple}} or {{EX:sasl}}, depending on whether simple password-based authentication or @@ -570,7 +567,7 @@ more information on how to use this directive. H4: updateref -This directive is only applicable in a {{slave}} (or {{shadow}}) +This directive is only applicable in a {{replica}} (or {{shadow}}) {{slapd}}(8) instance. It specifies the URL to return to clients which submit update requests upon the replica. @@ -578,7 +575,7 @@ If specified multiple times, each {{TERM:URL}} is provided. \Example: -> updateref ldap://master.example.net +> updateref ldap://provider.example.net H3: MDB Database Directives @@ -805,7 +802,7 @@ controls). The next section of the configuration file defines a MDB backend that will handle queries for things in the "dc=example,dc=com" portion of the tree. The -database is to be replicated to two slave slapds, one on +database is to be replicated to two replica slapds, one on truelies, the other on judgmentday. Indices are to be maintained for several attributes, and the {{EX:userPassword}} attribute is to be protected from unauthorized access. diff --git a/doc/guide/images/src/delta-syncrepl.svg b/doc/guide/images/src/delta-syncrepl.svg index 4464a955d3..642bf8a08d 100644 --- a/doc/guide/images/src/delta-syncrepl.svg +++ b/doc/guide/images/src/delta-syncrepl.svg @@ -4621,7 +4621,7 @@ x="96.974648" y="113.75929" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Arial" />Master/Provider Provider Replica Pool Consumer Pool Replica Pool Consumer Pool diff --git a/doc/guide/images/src/n-way-multi-master.dia b/doc/guide/images/src/n-way-multi-provider.dia similarity index 100% rename from doc/guide/images/src/n-way-multi-master.dia rename to doc/guide/images/src/n-way-multi-provider.dia diff --git a/doc/guide/images/src/n-way-multi-master.svg b/doc/guide/images/src/n-way-multi-provider.svg similarity index 99% rename from doc/guide/images/src/n-way-multi-master.svg rename to doc/guide/images/src/n-way-multi-provider.svg index 65896783f9..f0c3717f9f 100644 --- a/doc/guide/images/src/n-way-multi-master.svg +++ b/doc/guide/images/src/n-way-multi-provider.svg @@ -13,12 +13,12 @@ id="svg7893" inkscape:version="0.46" sodipodi:docbase="/home/ghenry/Desktop" - sodipodi:docname="n-way-multi-master.svg" + sodipodi:docname="n-way-multi-provider.svg" sodipodi:version="0.32" width="744.09448" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" - inkscape:export-filename="/home/ghenry/Desktop/n-way-multi-master.png" + inkscape:export-filename="/home/ghenry/Desktop/n-way-multi-provider.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> N-Way Multi-Master N-Way Multi-Provider Master/Provider Provider Primary directory also contains back-ldap databases that replicate from the Master directory and push out changes to the replicas Primary directory also contains back-ldap databases that replicate from the provider directory and push out changes to the replicas Master/Provider Provider Primary directory is a standard OpenLDAP Master, ldap proxy using Syncrepl pulls in changes from the master and pushes out to replicas. Useful if you don't have access to original master. Primary directory is a standard OpenLDAP provider, ldap proxy using Syncrepl pulls in changes from the provider and pushes out to replicas. Useful if you don't have access to original provider. @@ -773,15 +773,15 @@ Specify an integer ID from 0 to 4095 for this server (limited to 3 hexadecimal digits). The ID may also be specified as a hexadecimal ID by prefixing the value with "0x". Non-zero IDs are -required when using multimaster replication and each master must have a -unique non-zero ID. Note that this requirement also applies to separate masters +required when using multi-provider replication and each provider must have a +unique non-zero ID. Note that this requirement also applies to separate providers contributing to a glued set of databases. If the URL is provided, this directive may be specified multiple times, providing a complete list of participating servers and their IDs. The fully qualified hostname of each server should be used in the supplied URLs. The IDs are used in the "replica id" field of all CSNs generated by the specified server. The default value is zero, which -is only valid for single master replication. +is only valid for single provider replication. Example: .LP .nf @@ -1624,7 +1624,7 @@ Specifies the maximum number of aliases to dereference when trying to resolve an entry, used to avoid infinite alias loops. The default is 15. .TP .B olcMirrorMode: TRUE | FALSE -This option puts a replica database into "mirror" mode. Update +This option puts a consumer database into "mirror" mode. Update operations will be accepted from any user, not just the updatedn. The database must already be configured as syncrepl consumer before this keyword may be set. This mode also requires a @@ -1780,13 +1780,13 @@ FALSE, meaning the contextCSN is stored in the context entry. .B [syncdata=default|accesslog|changelog] .B [lazycommit] .RS -Specify the current database as a replica which is kept up-to-date with the -master content by establishing the current +Specify the current database as a consumer which is kept up-to-date with the +provider content by establishing the current .BR slapd (8) as a replication consumer site running a .B syncrepl replication engine. -The replica content is kept synchronized to the master content using +The consumer content is kept synchronized to the provider content using the LDAP Content Synchronization protocol. Refer to the "OpenLDAP Administrator's Guide" for detailed information on setting up a replicated @@ -1802,13 +1802,13 @@ directive within the replication consumer site. It is a non-negative integer having no more than three decimal digits. .B provider -specifies the replication provider site containing the master content +specifies the replication provider site containing the provider content as an LDAP URI. If is not given, the standard LDAP port number (389 or 636) is used. The content of the .B syncrepl -replica is defined using a search +consumer is defined using a search specification as its result set. The consumer .B slapd will send search requests to the provider @@ -1843,7 +1843,7 @@ after each synchronization operation finishes. In the .B refreshAndPersist operation, a synchronization search remains persistent in the provider slapd. -Further updates to the master replica will generate +Further updates to the provider will generate .B searchResultEntry to the consumer slapd as the search responses to the persistent synchronization search. If the initial search fails due to an error, the @@ -1972,7 +1972,7 @@ for the consumer, while sacrificing safety or durability. .RE .TP .B olcUpdateDN: -This option is only applicable in a slave +This option is only applicable in a replica database. It specifies the DN permitted to update (subject to access controls) the replica. It is only needed in certain push-mode @@ -1980,7 +1980,7 @@ replication scenarios. Generally, this DN .I should not be the same as the .B rootdn -used at the master. +used at the provider. .TP .B olcUpdateRef: Specify the referral to pass back when diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5 index 0e4d31f7a1..b02bf02c7c 100644 --- a/doc/man/man5/slapd.conf.5 +++ b/doc/man/man5/slapd.conf.5 @@ -861,7 +861,7 @@ environment. The attribute "cmusaslsecretOTP" is the default value. .B sasl\-auxprops\-dontusecopy\-ignore on | off Used to disable replication of the attribute(s) defined by sasl-auxprops-dontusecopy and instead use a local value for the attribute. This -allows the SASL mechanism to continue to work if the master is offline. This can +allows the SASL mechanism to continue to work if the provider is offline. This can cause replication inconsistency. Defaults to off. .TP .B sasl\-host @@ -962,15 +962,15 @@ Specify an integer ID from 0 to 4095 for this server (limited to 3 hexadecimal digits). The ID may also be specified as a hexadecimal ID by prefixing the value with "0x". Non-zero IDs are -required when using multimaster replication and each master must have a -unique non-zero ID. Note that this requirement also applies to separate masters +required when using multi-provider replication and each provider must have a +unique non-zero ID. Note that this requirement also applies to separate providers contributing to a glued set of databases. If the URL is provided, this directive may be specified multiple times, providing a complete list of participating servers and their IDs. The fully qualified hostname of each server should be used in the supplied URLs. The IDs are used in the "replica id" field of all CSNs generated by the specified server. The default value is zero, which -is only valid for single master replication. +is only valid for single provider replication. Example: .LP .nf @@ -1567,7 +1567,7 @@ Specifies the maximum number of aliases to dereference when trying to resolve an entry, used to avoid infinite alias loops. The default is 15. .TP .B mirrormode on | off -This option puts a replica database into "mirror" mode. Update +This option puts a consumer database into "mirror" mode. Update operations will be accepted from any user, not just the updatedn. The database must already be configured as a syncrepl consumer before this keyword may be set. This mode also requires a @@ -1759,13 +1759,13 @@ the contextCSN is stored in the context entry. .B [syncdata=default|accesslog|changelog] .B [lazycommit] .RS -Specify the current database as a replica which is kept up-to-date with the -master content by establishing the current +Specify the current database as a consumer which is kept up-to-date with the +provider content by establishing the current .BR slapd (8) as a replication consumer site running a .B syncrepl replication engine. -The replica content is kept synchronized to the master content using +The consumer content is kept synchronized to the provider content using the LDAP Content Synchronization protocol. Refer to the "OpenLDAP Administrator's Guide" for detailed information on setting up a replicated @@ -1782,13 +1782,13 @@ It is a non-negative integer not greater than 999 (limited to three decimal digits). .B provider -specifies the replication provider site containing the master content +specifies the replication provider site containing the provider content as an LDAP URI. If is not given, the standard LDAP port number (389 or 636) is used. The content of the .B syncrepl -replica is defined using a search +consumer is defined using a search specification as its result set. The consumer .B slapd will send search requests to the provider @@ -1838,7 +1838,7 @@ after each synchronization operation finishes. In the .B refreshAndPersist operation, a synchronization search remains persistent in the provider slapd. -Further updates to the master replica will generate +Further updates to the provider will generate .B searchResultEntry to the consumer slapd as the search responses to the persistent synchronization search. If the initial search fails due to an error, the @@ -1983,7 +1983,7 @@ for the consumer, while sacrificing safety or durability. .RE .TP .B updatedn -This option is only applicable in a slave +This option is only applicable in a replica database. It specifies the DN permitted to update (subject to access controls) the replica. It is only needed in certain push-mode @@ -1991,7 +1991,7 @@ replication scenarios. Generally, this DN .I should not be the same as the .B rootdn -used at the master. +used at the provider. .TP .B updateref Specify the referral to pass back when diff --git a/doc/man/man5/slapo-dds.5 b/doc/man/man5/slapo-dds.5 index 22583e9415..03c6c34b7e 100644 --- a/doc/man/man5/slapo-dds.5 +++ b/doc/man/man5/slapo-dds.5 @@ -223,8 +223,8 @@ access to dn.onelevel="cn=Meetings" .SH REPLICATION This implementation of RFC 2589 provides a restricted interpretation of how -dynamic objects replicate. Only the master takes care of handling dynamic -object expiration, while replicas simply see the dynamic object as a plain +dynamic objects replicate. Only the provider takes care of handling dynamic +object expiration, while consumers simply see the dynamic object as a plain object. When replicating these objects, one needs to explicitly exclude the diff --git a/doc/man/man5/slapo-memberof.5 b/doc/man/man5/slapo-memberof.5 index b04411f88f..e669a47563 100644 --- a/doc/man/man5/slapo-memberof.5 +++ b/doc/man/man5/slapo-memberof.5 @@ -107,9 +107,9 @@ The memberof overlay may be used with any backend that provides full read-write functionality, but it is mainly intended for use with local storage backends. The maintenance operations it performs are internal to the server on which the overlay is configured and -are never replicated. Replica servers should be configured with their +are never replicated. Consumer servers should be configured with their own instances of the memberOf overlay if it is desired to maintain -these memberOf attributes on the replicas. Note that slapo-memberOf +these memberOf attributes on the consumers. Note that slapo-memberOf is not compatible with syncrepl based replication, and should not be used in a replicated environment. An alternative is to use slapo-dynlist to emulate slapo-memberOf behavior. diff --git a/doc/man/man5/slapo-ppolicy.5 b/doc/man/man5/slapo-ppolicy.5 index 0931b83115..64595ed112 100644 --- a/doc/man/man5/slapo-ppolicy.5 +++ b/doc/man/man5/slapo-ppolicy.5 @@ -62,7 +62,7 @@ and no default is given, then no policies will be enforced. .B ppolicy_forward_updates Specify that policy state changes that result from Bind operations (such as recording failures, lockout, etc.) on a consumer should be forwarded -to a master instead of being written directly into the consumer's local +to a provider instead of being written directly into the consumer's local database. This setting is only useful on a replication consumer, and also requires the .B updateref @@ -692,12 +692,12 @@ module. Note that the current IETF Password Policy proposal does not define how these operational attributes are expected to behave in a replication environment. In general, authentication attempts on -a slave server only affect the copy of the operational attributes -on that slave and will not affect any attributes for -a user's entry on the master server. Operational attribute changes -resulting from authentication attempts on a master server -will usually replicate to the slaves (and also overwrite -any changes that originated on the slave). +a replica server only affect the copy of the operational attributes +on that replica and will not affect any attributes for +a user's entry on the provider. Operational attribute changes +resulting from authentication attempts on a provider +will usually replicate to the replicas (and also overwrite +any changes that originated on the replica). These behaviors are not guaranteed and are subject to change when a formal specification emerges. diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8 index 92f5ea69bc..aaa5f68836 100644 --- a/doc/man/man8/slapadd.8 +++ b/doc/man/man8/slapadd.8 @@ -164,7 +164,7 @@ database will be unusable. .B \-s disable schema checking. This option is intended to be used when loading databases containing special objects, such as fractional objects on a -partial replica. Loading normal objects which do not conform to +partial consumer. Loading normal objects which do not conform to schema may result in unexpected and ill behavior. .TP .BI \-S \ SID diff --git a/doc/man/man8/slapd.8 b/doc/man/man8/slapd.8 index b6ab541364..20403da2cc 100644 --- a/doc/man/man8/slapd.8 +++ b/doc/man/man8/slapd.8 @@ -282,12 +282,12 @@ having the matching replication identifier in its definition. The .B rid must be provided in order for any other specified values to be used. .B sid -is the server id in a multi-master/mirror-mode configuration. +is the server id in a multi-provider configuration. .B csn is the commit sequence number received by a previous synchronization -and represents the state of the consumer replica content which the +and represents the state of the consumer content which the syncrepl engine will synchronize to the current provider content. -In case of \fImirror-mode\fP or \fImulti-master\fP replication agreement, +In case of \fImulti-provider\fP replication agreement, multiple .B csn values, semicolon separated, can appear. diff --git a/libraries/libldap/ldap.conf b/libraries/libldap/ldap.conf index a94cfaab6e..af738ad619 100644 --- a/libraries/libldap/ldap.conf +++ b/libraries/libldap/ldap.conf @@ -6,7 +6,7 @@ # This file should be world readable but not world writable. #BASE dc=example,dc=com -#URI ldap://ldap.example.com ldap://ldap-master.example.com:666 +#URI ldap://ldap.example.com ldap://ldap-provider.example.com:666 #SIZELIMIT 12 #TIMELIMIT 15 diff --git a/servers/slapd/add.c b/servers/slapd/add.c index 4ceec9de97..8a823e8f26 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -293,7 +293,7 @@ fe_op_add( Operation *op, SlapReply *rs ) /* * do the add if 1 && (2 || 3) * 1) there is an add function implemented in this backend; - * 2) this backend is master for what it holds; + * 2) this backend is the provider for what it holds; * 3) it's a replica and the dn supplied is the updatedn. */ if ( op->o_bd->be_add ) { diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c index becd94307f..1069439783 100644 --- a/servers/slapd/backglue.c +++ b/servers/slapd/backglue.c @@ -231,7 +231,7 @@ glue_op_func ( Operation *op, SlapReply *rs ) op->o_bd = glue_back_select (b0, &op->o_req_ndn); - /* If we're on the master backend, let overlay framework handle it */ + /* If we're on the primary backend, let overlay framework handle it */ if ( op->o_bd == b0 ) return SLAP_CB_CONTINUE; @@ -285,7 +285,7 @@ glue_response ( Operation *op, SlapReply *rs ) BackendDB *be = op->o_bd; be = glue_back_select (op->o_bd, &op->o_req_ndn); - /* If we're on the master backend, let overlay framework handle it. + /* If we're on the primary backend, let overlay framework handle it. * Otherwise, bail out. */ return ( op->o_bd == be ) ? SLAP_CB_CONTINUE : SLAP_CB_BYPASS; @@ -349,7 +349,7 @@ glue_chk_controls ( Operation *op, SlapReply *rs ) /* ITS#4615 - overlays configured above the glue overlay should be * invoked for the entire glued tree. Overlays configured below the - * glue overlay should only be invoked on the master backend. + * glue overlay should only be invoked on the primary backend. * So, if we're searching on any subordinates, we need to force the * current overlay chain to stop processing, without stopping the * overall callback flow. @@ -358,7 +358,7 @@ static int glue_sub_search( Operation *op, SlapReply *rs, BackendDB *b0, slap_overinst *on ) { - /* Process any overlays on the master backend */ + /* Process any overlays on the primary backend */ if ( op->o_bd == b0 && on->on_next ) { BackendInfo *bi = op->o_bd->bd_info; int rc = SLAP_CB_CONTINUE; diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c index 81566fc7e2..93ef9c7ac4 100644 --- a/servers/slapd/bconfig.c +++ b/servers/slapd/bconfig.c @@ -1324,7 +1324,7 @@ config_generic(ConfigArgs *c) { break; case CFG_MIRRORMODE: if ( SLAP_SHADOW(c->be)) - c->value_int = (SLAP_MULTIMASTER(c->be) != 0); + c->value_int = (SLAP_MULTIPROVIDER(c->be) != 0); else rc = 1; break; @@ -4042,7 +4042,7 @@ config_shadow( ConfigArgs *c, slap_mask_t flag ) } else { SLAP_DBFLAGS(c->be) |= (SLAP_DBFLAG_SHADOW | flag); - if ( !SLAP_MULTIMASTER( c->be )) + if ( !SLAP_MULTIPROVIDER( c->be )) SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_SINGLE_SHADOW; } diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 3d713d4fb3..6570c9b22a 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -1995,7 +1995,7 @@ slap_client_connect( LDAP **ldp, slap_bindconf *sb ) int rc; struct timeval tv; - /* Init connection to master */ + /* Init connection to provider */ rc = ldap_initialize( &ld, sb->sb_uri.bv_val ); if ( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_ANY, diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index ac1a9fdb21..b590924791 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -159,7 +159,7 @@ fe_op_delete( Operation *op, SlapReply *rs ) /* * do the delete if 1 && (2 || 3) * 1) there is a delete function implemented in this backend; - * 2) this backend is master for what it holds; + * 2) this backend is the provider for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ if ( op->o_bd->be_delete ) { diff --git a/servers/slapd/main.c b/servers/slapd/main.c index 0a76bc4cc2..42894f2b24 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -497,7 +497,7 @@ int main( int argc, char **argv ) urls = optarg; break; - case 'c': /* provide sync cookie, override if exist in replica */ + case 'c': /* provide sync cookie, override if exist in consumer */ scp = (struct sync_cookie *) ch_calloc( 1, sizeof( struct sync_cookie )); ber_str2bv( optarg, 0, 1, &scp->octet_str ); diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index cfdd7b0aa9..05220254bd 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -275,7 +275,7 @@ fe_op_modify( Operation *op, SlapReply *rs ) /* * do the modify if 1 && (2 || 3) * 1) there is a modify function implemented in this backend; - * 2) this backend is master for what it holds; + * 2) this backend is the provider for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ if ( op->o_bd->be_modify ) { diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index 4dd5dce3b8..68e08ce882 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -305,7 +305,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs ) /* * do the modrdn if 1 && (2 || 3) * 1) there is a modrdn function implemented in this backend; - * 2) this backend is master for what it holds; + * 2) this backend is the provider for what it holds; * 3) it's a replica and the dn supplied is the update_ndn. */ if ( op->o_bd->be_modrdn ) { diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c index 447776fe19..a64e7b6a8e 100644 --- a/servers/slapd/overlays/dds.c +++ b/servers/slapd/overlays/dds.c @@ -1102,7 +1102,7 @@ dds_op_extended( Operation *op, SlapReply *rs ) ttl = di->di_min_ttl; } - /* This does not apply to multi-master case */ + /* This does not apply to multi-provider case */ if ( !( !SLAP_SINGLE_SHADOW( op->o_bd ) || be_isupdate( op ) ) ) { /* we SHOULD return a referral in this case */ BerVarray defref = op->o_bd->be_update_refs diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index d718b676dc..b6743ebb78 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -2104,7 +2104,7 @@ ppolicy_add( if ( ppolicy_restrict( op, rs ) != SLAP_CB_CONTINUE ) return rs->sr_err; - /* If this is a replica, assume the master checked everything */ + /* If this is a replica, assume the provider checked everything */ if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ) return SLAP_CB_CONTINUE; @@ -2253,7 +2253,7 @@ ppolicy_modify( Operation *op, SlapReply *rs ) if ( pi->disable_write ) return SLAP_CB_CONTINUE; /* If this is a replica, we may need to tweak some of the - * master's modifications. Otherwise, just pass it through. + * provider's modifications. Otherwise, just pass it through. */ if ( SLAPD_SYNC_IS_SYNCCONN( op->o_connid ) ) { Modifications **prev; diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c index 5beeec178d..fc6d5e70b0 100644 --- a/servers/slapd/passwd.c +++ b/servers/slapd/passwd.c @@ -165,7 +165,7 @@ int passwd_extop( goto error_return; } - /* This does not apply to multi-master case */ + /* This does not apply to multi-provider case */ if(!( !SLAP_SINGLE_SHADOW( op->o_bd ) || be_isupdate( op ))) { /* we SHOULD return a referral in this case */ BerVarray defref = op->o_bd->be_update_refs diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 400f9bbc4c..e762a19bec 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1858,14 +1858,14 @@ struct BackendDB { #define SLAP_DBFLAG_DYNAMIC 0x0400U /* this db allows dynamicObjects */ #define SLAP_DBFLAG_MONITORING 0x0800U /* custom monitoring enabled */ #define SLAP_DBFLAG_SHADOW 0x8000U /* a shadow */ -#define SLAP_DBFLAG_SINGLE_SHADOW 0x4000U /* a single-master shadow */ +#define SLAP_DBFLAG_SINGLE_SHADOW 0x4000U /* a single-provider shadow */ #define SLAP_DBFLAG_SYNC_SHADOW 0x1000U /* a sync shadow */ #define SLAP_DBFLAG_SLURP_SHADOW 0x2000U /* a slurp shadow */ #define SLAP_DBFLAG_SHADOW_MASK (SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SINGLE_SHADOW|SLAP_DBFLAG_SYNC_SHADOW|SLAP_DBFLAG_SLURP_SHADOW) #define SLAP_DBFLAG_CLEAN 0x10000U /* was cleanly shutdown */ #define SLAP_DBFLAG_ACL_ADD 0x20000U /* check attr ACLs on adds */ #define SLAP_DBFLAG_SYNC_SUBENTRY 0x40000U /* use subentry for context */ -#define SLAP_DBFLAG_MULTI_SHADOW 0x80000U /* uses mirrorMode/multi-master */ +#define SLAP_DBFLAG_MULTI_SHADOW 0x80000U /* uses multi-provider */ #define SLAP_DBFLAG_DISABLED 0x100000U #define SLAP_DBFLAG_LASTBIND 0x200000U slap_mask_t be_flags; @@ -1893,7 +1893,7 @@ struct BackendDB { #define SLAP_SYNC_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SYNC_SHADOW) #define SLAP_SLURP_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SLURP_SHADOW) #define SLAP_SINGLE_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SINGLE_SHADOW) -#define SLAP_MULTIMASTER(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_MULTI_SHADOW) +#define SLAP_MULTIPROVIDER(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_MULTI_SHADOW) #define SLAP_DBCLEAN(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_CLEAN) #define SLAP_DBACL_ADD(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_ACL_ADD) #define SLAP_SYNC_SUBENTRY(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SYNC_SUBENTRY) @@ -1975,7 +1975,7 @@ struct BackendDB { slap_access_t be_dfltaccess; /* access given if no acl matches */ AttributeName *be_extra_anlist; /* attributes that need to be added to search requests (ITS#6513) */ - /* Replica Information */ + /* Consumer Information */ struct berval be_update_ndn; /* allowed to make changes (in replicas) */ BerVarray be_update_refs; /* where to refer modifying clients to */ struct be_pcl *be_pending_csn_list; diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index 954cc38585..303c9defb5 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -799,7 +799,7 @@ slap_tool_init( break; } - /* If the named base is a glue master, operate on the + /* If the named base is a glue primary, operate on the * entire context */ if ( SLAP_GLUE_INSTANCE( be ) ) { @@ -827,7 +827,7 @@ slap_tool_init( continue; /* If just doing the first by default and it is a - * glue subordinate, find the master. + * glue subordinate, find the primary. */ if ( SLAP_GLUE_SUBORDINATE(be) ) { nosubordinates = 1; diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 9a3bd920c5..83c30a7775 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -184,7 +184,7 @@ static int syncrepl_dirsync_cookie( static int syncrepl_dsee_update( syncinfo_t *si, Operation *op ) ; -/* delta-mmr overlay handler */ +/* delta-mpr overlay handler */ static int syncrepl_op_modify( Operation *op, SlapReply *rs ); /* callback functions */ @@ -195,7 +195,7 @@ static AttributeDescription *sync_descs[4]; static AttributeDescription *dsee_descs[7]; -/* delta-mmr */ +/* delta-mpr */ static AttributeDescription *ad_reqMod, *ad_reqDN; typedef struct logschema { @@ -272,7 +272,7 @@ init_syncrepl(syncinfo_t *si) overlay_register( &syncrepl_ov ); } - /* delta-MMR needs the overlay, nothing else does. + /* delta-MPR needs the overlay, nothing else does. * This must happen before accesslog overlay is configured. */ if ( si->si_syncdata && @@ -822,7 +822,7 @@ do_syncrep1( si->si_syncCookie.rid = si->si_rid; /* whenever there are multiple data sources possible, advertise sid */ - si->si_syncCookie.sid = ( SLAP_MULTIMASTER( si->si_be ) || si->si_be != si->si_wbe ) ? + si->si_syncCookie.sid = ( SLAP_MULTIPROVIDER( si->si_be ) || si->si_be != si->si_wbe ) ? slap_serverID : -1; #ifdef LDAP_CONTROL_X_DIRSYNC @@ -1432,7 +1432,7 @@ logerr: } ber_scanf( ber, /*"{"*/ "}" ); } - if ( SLAP_MULTIMASTER( op->o_bd ) && check_syncprov( op, si )) { + if ( SLAP_MULTIPROVIDER( op->o_bd ) && check_syncprov( op, si )) { slap_sync_cookie_free( &syncCookie_req, 0 ); slap_dup_sync_cookie( &syncCookie_req, &si->si_syncCookie ); } @@ -1619,7 +1619,7 @@ logerr: continue; } - if ( SLAP_MULTIMASTER( op->o_bd ) && check_syncprov( op, si )) { + if ( SLAP_MULTIPROVIDER( op->o_bd ) && check_syncprov( op, si )) { slap_sync_cookie_free( &syncCookie_req, 0 ); slap_dup_sync_cookie( &syncCookie_req, &si->si_syncCookie ); } @@ -1791,10 +1791,10 @@ do_syncrepl( * in use. This may be complicated by the use of the glue * overlay. * - * Typically there is a single syncprov mastering the entire + * Typically there is a single syncprov controlling the entire * glued tree. In that case, our contextCSN updates should - * go to the master DB. But if there is no syncprov on the - * master DB, then nothing special is needed here. + * go to the primary DB. But if there is no syncprov on the + * primary DB, then nothing special is needed here. * * Alternatively, there may be individual syncprov overlays * on each glued branch. In that case, each syncprov only @@ -2844,14 +2844,14 @@ syncrepl_message_to_op( OpExtraSync oes; op->orm_modlist = modlist; op->o_bd = si->si_wbe; - /* delta-mmr needs additional checks in syncrepl_op_modify */ - if ( SLAP_MULTIMASTER( op->o_bd )) { + /* delta-mpr needs additional checks in syncrepl_op_modify */ + if ( SLAP_MULTIPROVIDER( op->o_bd )) { oes.oe.oe_key = (void *)syncrepl_message_to_op; oes.oe_si = si; LDAP_SLIST_INSERT_HEAD( &op->o_extra, &oes.oe, oe_next ); } rc = op->o_bd->be_modify( op, &rs ); - if ( SLAP_MULTIMASTER( op->o_bd )) { + if ( SLAP_MULTIPROVIDER( op->o_bd )) { LDAP_SLIST_REMOVE( &op->o_extra, &oes.oe, OpExtra, oe_next ); BER_BVZERO( &op->o_csn ); } @@ -4333,11 +4333,11 @@ syncrepl_del_nonpresent( op->ors_limit = NULL; op->ors_attrsonly = 0; op->ors_filter = filter_dup( si->si_filter, op->o_tmpmemctx ); - /* In multimaster, updates can continue to arrive while + /* In multi-provider, updates can continue to arrive while * we're searching. Limit the search result to entries * older than our newest cookie CSN. */ - if ( SLAP_MULTIMASTER( op->o_bd )) { + if ( SLAP_MULTIPROVIDER( op->o_bd )) { Filter *f; int i; @@ -4367,7 +4367,7 @@ syncrepl_del_nonpresent( rc = be->be_search( op, &rs_search ); - if ( SLAP_MULTIMASTER( op->o_bd )) { + if ( SLAP_MULTIPROVIDER( op->o_bd )) { op->ors_filter = of; } if ( op->ors_filter ) filter_free_x( op, op->ors_filter, 1 ); diff --git a/tests/data/acl.out.master b/tests/data/acl.out.provider similarity index 100% rename from tests/data/acl.out.master rename to tests/data/acl.out.provider diff --git a/tests/data/modify.out.master b/tests/data/modify.out.provider similarity index 100% rename from tests/data/modify.out.master rename to tests/data/modify.out.provider diff --git a/tests/data/modrdn.out.master.0 b/tests/data/modrdn.out.provider.0 similarity index 100% rename from tests/data/modrdn.out.master.0 rename to tests/data/modrdn.out.provider.0 diff --git a/tests/data/modrdn.out.master.1 b/tests/data/modrdn.out.provider.1 similarity index 100% rename from tests/data/modrdn.out.master.1 rename to tests/data/modrdn.out.provider.1 diff --git a/tests/data/modrdn.out.master.2 b/tests/data/modrdn.out.provider.2 similarity index 100% rename from tests/data/modrdn.out.master.2 rename to tests/data/modrdn.out.provider.2 diff --git a/tests/data/modrdn.out.master.3 b/tests/data/modrdn.out.provider.3 similarity index 100% rename from tests/data/modrdn.out.master.3 rename to tests/data/modrdn.out.provider.3 diff --git a/tests/data/regressions/its4184/adds.ldif b/tests/data/regressions/its4184/adds.ldif index 716e341d01..439cca4f13 100644 --- a/tests/data/regressions/its4184/adds.ldif +++ b/tests/data/regressions/its4184/adds.ldif @@ -45,11 +45,11 @@ uid: user3 uidNumber: 5387 homeDirectory: /home/user3 loginShell: /bin/false -gecos: Slave +gecos: Consumer gidNumber: 100 userPassword: abc -cn: Slave -sn: Slave +cn: Consumer +sn: Consumer dn: uid=user2,ou=people,dc=example,dc=com objectClass: person diff --git a/tests/data/regressions/its4448/slapd-meta.conf b/tests/data/regressions/its4448/slapd-meta.conf index 68ee6ffb82..9950842020 100644 --- a/tests/data/regressions/its4448/slapd-meta.conf +++ b/tests/data/regressions/its4448/slapd-meta.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/regressions/its8444/its8444 b/tests/data/regressions/its8444/its8444 index b0b5b7d18f..c722ad6ec5 100755 --- a/tests/data/regressions/its8444/its8444 +++ b/tests/data/regressions/its8444/its8444 @@ -41,7 +41,7 @@ fi echo "This test tracks a case where changes are incorrectly skipped" echo "See https://bugs.openldap.org/show_bug.cgi?id=8444 for more information." -MMR=4 +MPR=4 XDIR=$TESTDIR/srv mkdir -p $TESTDIR @@ -54,7 +54,7 @@ ITSDIR=$DATADIR/regressions/its$ITS echo "Initializing server configurations..." n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do DBDIR=${XDIR}$n/db CFDIR=${XDIR}$n/slapd.d @@ -66,7 +66,7 @@ done KILLPIDS= n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do MYURI=`eval echo '$URI'$n` MYLOG=`eval echo '$LOG'$n` CFDIR=${XDIR}$n/slapd.d @@ -204,7 +204,7 @@ EOF TOON4="cn=Bugs_Bunny,ou=People,$BASEDN" for member in $TOON1 $TOON2 $TOON3 $TOON4; do n=1 - while [ $n -le $MMR ]; do + while [ $n -le $MPR ]; do >$SEARCHOUT echo "# Searching member $member after removal from Cartoonia group, provider $n" >> $SEARCHOUT MYURI=`eval echo '$URI'$n` @@ -247,7 +247,7 @@ EOF echo "Searching entire database on each provider after deleting Cartoonia group" n=1 - while [ $n -le $MMR ]; do + while [ $n -le $MPR ]; do echo "# Searching the entire database after deleting Cartoonia, provider $n" >> $SEARCHOUT MYURI=`eval echo '$URI'$n` $LDAPSEARCH -S "" -b "$BASEDN" -H $MYURI -D "cn=manager,$BASEDN" -w $PASSWD \ @@ -287,7 +287,7 @@ EOF echo "Searching entire database on each provider after re-adding Cartoonia group" n=1 - while [ $n -le $MMR ]; do + while [ $n -le $MPR ]; do >$SEARCHOUT echo "# Searching the entire database after re-adding Cartoonia, provider $n" >> $SEARCHOUT MYURI=`eval echo '$URI'$n` diff --git a/tests/data/regressions/its8752/its8752 b/tests/data/regressions/its8752/its8752 index 5732c09601..cff3d84bc8 100755 --- a/tests/data/regressions/its8752/its8752 +++ b/tests/data/regressions/its8752/its8752 @@ -37,7 +37,7 @@ if test $dtest = N; then fi # This mimics the scenario where a single server has been used until now (no -# syncprov either, so no contextCSN) and we convert it to a delta-MMR setup: +# syncprov either, so no contextCSN) and we convert it to a delta-MPR setup: # 1. stop the server (note that there is likely no contextCSN in the DB at this point) # 2. configure all servers to delta-replicate from each other and start them up # - empty servers will start with a refresh of the main DB @@ -47,7 +47,7 @@ fi echo "This test tracks a case where slapd deadlocks during a significant write load" echo "See https://bugs.openldap.org/show_bug.cgi?id=8752 for more information." -MMR=4 +MPR=4 iterations=20000 check_sync_every=100 MAPSIZE=`expr 100 \* 1024 \* 1024` @@ -59,7 +59,7 @@ ITS=8752 ITSDIR=$DATADIR/regressions/its$ITS n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do DBDIR=${XDIR}$n/db mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 n=`expr $n + 1` @@ -158,22 +158,22 @@ if test $RC != 0 ; then exit $RC fi -echo "Stopping slapd and reworking configuration for MMR..." +echo "Stopping slapd and reworking configuration for MPR..." kill -HUP $KILLPIDS wait $KILLPIDS KILLPIDS= n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do MYURI=`eval echo '$URI'$n` MYLOG=`eval echo '$LOG'$n` MYCONF=`eval echo '$CONF'$n` echo "Starting provider slapd on TCP/IP URI $MYURI" - . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mmr > $TESTDIR/slapd.conf - sed -e "s/MMR/$n/g" -e "s/wronglog/log/" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF + . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf + sed -e "s/MPR/$n/g" -e "s/wronglog/log/" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF j=1 - while [ $j -le $MMR ]; do + while [ $j -le $MPR ]; do MMCURI=`eval echo '$URI'$j` sed -e "s|MMC${j}|${MMCURI}|" $MYCONF > $TESTDIR/slapd.conf mv $TESTDIR/slapd.conf $MYCONF @@ -211,10 +211,10 @@ while [ $n -le $MMR ]; do n=`expr $n + 1` done -echo "Setting up accesslog on each master..." +echo "Setting up accesslog on each provider..." n=1 -while [ $n -le $MMR ]; do - echo "Modifying dn: cn=Elmer_Fudd,ou=People,$BASEDN on master $n" +while [ $n -le $MPR ]; do + echo "Modifying dn: cn=Elmer_Fudd,ou=People,$BASEDN on provider $n" MYURI=`eval echo '$URI'$n` $LDAPMODIFY -v -D "$MANAGERDN" -H $MYURI -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS @@ -246,7 +246,7 @@ done for i in 0 1 2 3 4 5; do j=1 - while [ $j -le $MMR ]; do + while [ $j -le $MPR ]; do MYURI=`eval echo '$URI'$j` $LDAPSEARCH -b "$BASEDN" -H "$MYURI" \ '*' '+' >"$TESTDIR/server$j.out" 2>&1 @@ -262,7 +262,7 @@ for i in 0 1 2 3 4 5; do in_sync=1 j=1 - while [ $j -lt $MMR ]; do + while [ $j -lt $MPR ]; do k=$j j=`expr $j + 1` $CMP "$TESTDIR/server$k.flt" "$TESTDIR/server$j.flt" > $CMPOUT @@ -287,7 +287,7 @@ fi echo "The next step of the test will perform $iterations random write operations and may take some time." echo "As this test is for a deadlock, it will take manual intervention to exit the test if one occurs." -echo "Starting random master/entry modifications..." +echo "Starting random provider/entry modifications..." DN1="cn=Elmer_Fudd,ou=People,$BASEDN" VAL1="Fudd" @@ -304,7 +304,7 @@ n=1 while [ $n -le $iterations ]; do seed=`date +%N|sed s/...$//` rvalue=`echo|awk "BEGIN {srand($seed) -{print int(1+rand()*$MMR)}}"` +{print int(1+rand()*$MPR)}}"` MYURI=`eval echo '$URI'$rvalue` seed=`date +%N|sed s/...$//` rvalue=`echo|awk "BEGIN {srand($seed) @@ -332,7 +332,7 @@ EOMODS echo "Checking replication status before we start iteration $n..." for i in 0 1 2 3 4 5; do j=1 - while [ $j -le $MMR ]; do + while [ $j -le $MPR ]; do MYURI=`eval echo '$URI'$j` echo "Reading database from server $j..." $LDAPSEARCH -b "$BASEDN" -H "$MYURI" \ @@ -349,7 +349,7 @@ EOMODS in_sync=1 j=1 - while [ $j -lt $MMR ]; do + while [ $j -lt $MPR ]; do k=`expr $j + 1` $CMP "$TESTDIR/server$j.flt" "$TESTDIR/server$k.flt" > $CMPOUT if test $? != 0 ; then @@ -383,15 +383,15 @@ echo "As this test is for a deadlock, it will take manual intervention to exit t echo "Starting servers again, this time with the wrong logbase setting..." KILLPIDS= n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do MYURI=`eval echo '$URI'$n` MYLOG=`eval echo '$LOG'$n` MYCONF=`eval echo '$CONF'$n` echo "Starting provider slapd on TCP/IP URI $MYURI" - . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mmr > $TESTDIR/slapd.conf - sed -e "s/MMR/$n/g" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF + . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mpr > $TESTDIR/slapd.conf + sed -e "s/MPR/$n/g" -e "s/@MAPSIZE@/$MAPSIZE/" $TESTDIR/slapd.conf > $MYCONF j=1 - while [ $j -le $MMR ]; do + while [ $j -le $MPR ]; do MMCURI=`eval echo '$URI'$j` sed -e "s|MMC${j}|${MMCURI}|" $MYCONF > $TESTDIR/slapd.conf mv $TESTDIR/slapd.conf $MYCONF @@ -429,12 +429,12 @@ while [ $n -le $MMR ]; do n=`expr $n + 1` done - echo "Starting random master/entry modifications..." + echo "Starting random provider/entry modifications..." n=1 while [ $n -le $iterations ]; do seed=`date +%N|sed s/...$//` rvalue=`echo|awk "BEGIN {srand($seed) - {print int(1+rand()*$MMR)}}"` + {print int(1+rand()*$MPR)}}"` MYURI=`eval echo '$URI'$rvalue` seed=`date +%N|sed s/...$//` rvalue=`echo|awk "BEGIN {srand($seed) @@ -462,7 +462,7 @@ if [ "$check_sync_every" -gt 0 ] && [ `expr $n % $check_sync_every` = 0 ]; then echo "Checking replication status before we start iteration $n..." for i in 0 1 2 3 4 5; do j=1 - while [ $j -le $MMR ]; do + while [ $j -le $MPR ]; do MYURI=`eval echo '$URI'$j` echo "Reading database from server $j..." $LDAPSEARCH -b "$BASEDN" -H "$MYURI" \ @@ -479,7 +479,7 @@ if [ "$check_sync_every" -gt 0 ] && [ `expr $n % $check_sync_every` = 0 ]; then in_sync=1 j=1 - while [ $j -lt $MMR ]; do + while [ $j -lt $MPR ]; do k=`expr $j + 1` $CMP "$TESTDIR/server$j.flt" "$TESTDIR/server$k.flt" > $CMPOUT if test $? != 0 ; then diff --git a/tests/data/regressions/its8752/slapd.conf.mmr b/tests/data/regressions/its8752/slapd.conf.mpr similarity index 95% rename from tests/data/regressions/its8752/slapd.conf.mmr rename to tests/data/regressions/its8752/slapd.conf.mpr index 2fc42a00e9..cf088baded 100644 --- a/tests/data/regressions/its8752/slapd.conf.mmr +++ b/tests/data/regressions/its8752/slapd.conf.mpr @@ -21,10 +21,10 @@ include @SCHEMADIR@/nis.schema include @DATADIR@/test.schema # -pidfile @TESTDIR@/slapd.MMR.pid -argsfile @TESTDIR@/slapd.MMR.args +pidfile @TESTDIR@/slapd.MPR.pid +argsfile @TESTDIR@/slapd.MPR.args -serverid MMR +serverid MPR #mod#modulepath ../servers/slapd/back-@BACKEND@/:../servers/slapd/overlays #mod#moduleload back_@BACKEND@.la #monitormod#modulepath ../servers/slapd/back-monitor/ @@ -41,7 +41,7 @@ database @BACKEND@ suffix "dc=example,dc=com" rootdn "cn=Manager,dc=example,dc=com" rootpw secret -#~null~#directory @TESTDIR@/srvMMR/db.1 +#~null~#directory @TESTDIR@/srvMPR/db.1 #indexdb#index objectClass eq #indexdb#index cn,sn,uid pres,eq,sub @@ -132,7 +132,7 @@ logpurge 24:00 01+00:00 database @BACKEND@ suffix "cn=log" rootdn "cn=Manager,dc=example,dc=com" -#~null~#directory @TESTDIR@/srvMMR/db.2 +#~null~#directory @TESTDIR@/srvMPR/db.2 #indexdb#index objectClass eq #indexdb#index entryCSN,entryUUID,reqEnd,reqResult,reqStart eq #mdb#maxsize @MAPSIZE@ diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800 index 45ac3e0614..99a5dca1bf 100755 --- a/tests/data/regressions/its8800/its8800 +++ b/tests/data/regressions/its8800/its8800 @@ -38,7 +38,7 @@ fi echo "This test tracks a case where changes are not refreshed when an old db is reloaded" echo "See https://bugs.openldap.org/show_bug.cgi?id=8800 for more information." -MMR=4 +MPR=4 XDIR=$TESTDIR/srv mkdir -p $TESTDIR @@ -50,8 +50,8 @@ ITSDIR=$DATADIR/regressions/its$ITS n=1 -while [ $n -le $MMR ]; do - echo "Initializing server configuration for MMR$n..." +while [ $n -le $MPR ]; do + echo "Initializing server configuration for MPR$n..." DBDIR=${XDIR}$n/db CFDIR=${XDIR}$n/slapd.d @@ -64,7 +64,7 @@ done KILLPIDS= n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do MYURI=`eval echo '$URI'$n` MYLOG=`eval echo '$LOG'$n` CFDIR=${XDIR}$n/slapd.d @@ -128,14 +128,14 @@ echo -n "Sleeping 1 minute to ensure consumers catch up..." sleep 60 echo "done" -echo -n "Stopping MMR1 slapd..." +echo -n "Stopping MPR1 slapd..." kill -HUP $MPID wait $MPID KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $MPID / /"`; sleep $SLEEP2 echo "done" -echo -n "Wiping primary and accesslog databases for MMR1..." +echo -n "Wiping primary and accesslog databases for MPR1..." DBDIR="$TESTDIR/srv1/db" CFDIR="$TESTDIR/srv1/slapd.d" mv $DBDIR.1 $DBDIR.1.orig diff --git a/tests/data/search.out.master b/tests/data/search.out.provider similarity index 100% rename from tests/data/search.out.master rename to tests/data/search.out.provider diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf index bbc8270b2c..ca995a129d 100644 --- a/tests/data/slapd-acl.conf +++ b/tests/data/slapd-acl.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-asyncmeta.conf b/tests/data/slapd-asyncmeta.conf index 802287295f..92eb18a53b 100644 --- a/tests/data/slapd-asyncmeta.conf +++ b/tests/data/slapd-asyncmeta.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-cache-master-proxyauthz.conf b/tests/data/slapd-cache-provider-proxyauthz.conf similarity index 96% rename from tests/data/slapd-cache-master-proxyauthz.conf rename to tests/data/slapd-cache-provider-proxyauthz.conf index d5ed08beca..ac34f86170 100644 --- a/tests/data/slapd-cache-master-proxyauthz.conf +++ b/tests/data/slapd-cache-provider-proxyauthz.conf @@ -1,4 +1,4 @@ -# master slapd config -- for proxy cache testing +# provider slapd config -- for proxy cache testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-cache-master.conf b/tests/data/slapd-cache-provider.conf similarity index 96% rename from tests/data/slapd-cache-master.conf rename to tests/data/slapd-cache-provider.conf index 3b8d8323b4..7ba606da0d 100644 --- a/tests/data/slapd-cache-master.conf +++ b/tests/data/slapd-cache-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for proxy cache testing +# provider slapd config -- for proxy cache testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-chain1.conf b/tests/data/slapd-chain1.conf index 6fb72f347a..d72d613cac 100644 --- a/tests/data/slapd-chain1.conf +++ b/tests/data/slapd-chain1.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-chain2.conf b/tests/data/slapd-chain2.conf index 2310b90932..1def8e6816 100644 --- a/tests/data/slapd-chain2.conf +++ b/tests/data/slapd-chain2.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf index b5c7ac16d5..b28421fdde 100644 --- a/tests/data/slapd-component.conf +++ b/tests/data/slapd-component.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-deltasync-slave.conf b/tests/data/slapd-deltasync-consumer.conf similarity index 95% rename from tests/data/slapd-deltasync-slave.conf rename to tests/data/slapd-deltasync-consumer.conf index fd4c0165f0..357e4acf0a 100644 --- a/tests/data/slapd-deltasync-slave.conf +++ b/tests/data/slapd-deltasync-consumer.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of Delta SYNC replication +# consumer slapd config -- for testing of Delta SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -44,7 +44,7 @@ argsfile @TESTDIR@/slapd.2.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a diff --git a/tests/data/slapd-deltasync-master.conf b/tests/data/slapd-deltasync-provider.conf similarity index 95% rename from tests/data/slapd-deltasync-master.conf rename to tests/data/slapd-deltasync-provider.conf index f189fbdf65..90cbbad201 100644 --- a/tests/data/slapd-deltasync-master.conf +++ b/tests/data/slapd-deltasync-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing of Delta SYNC replication +# provider slapd config -- for testing of Delta SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -32,7 +32,7 @@ argsfile @TESTDIR@/slapd.1.args #accesslogmod#moduleload accesslog.la ####################################################################### -# master database definitions +# provider database definitions ####################################################################### database @BACKEND@ diff --git a/tests/data/slapd-dirsync1.conf b/tests/data/slapd-dirsync1.conf index 3db5188383..1682b5fef3 100644 --- a/tests/data/slapd-dirsync1.conf +++ b/tests/data/slapd-dirsync1.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of MSAD DIRSYNC replication +# consumer slapd config -- for testing of MSAD DIRSYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-dsee-slave1.conf b/tests/data/slapd-dsee-consumer1.conf similarity index 96% rename from tests/data/slapd-dsee-slave1.conf rename to tests/data/slapd-dsee-consumer1.conf index 9e4132e262..d019ff2710 100644 --- a/tests/data/slapd-dsee-slave1.conf +++ b/tests/data/slapd-dsee-consumer1.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-dsee-slave2.conf b/tests/data/slapd-dsee-consumer2.conf similarity index 96% rename from tests/data/slapd-dsee-slave2.conf rename to tests/data/slapd-dsee-consumer2.conf index 8ed21b10e1..7f09631450 100644 --- a/tests/data/slapd-dsee-slave2.conf +++ b/tests/data/slapd-dsee-consumer2.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-glue-ldap.conf b/tests/data/slapd-glue-ldap.conf index 613307690e..4c17095ebd 100644 --- a/tests/data/slapd-glue-ldap.conf +++ b/tests/data/slapd-glue-ldap.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-idassert.conf b/tests/data/slapd-idassert.conf index 6a329e483f..fd2b50d342 100644 --- a/tests/data/slapd-idassert.conf +++ b/tests/data/slapd-idassert.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-ldapglue.conf b/tests/data/slapd-ldapglue.conf index 7189d8d913..b5fa399fe6 100644 --- a/tests/data/slapd-ldapglue.conf +++ b/tests/data/slapd-ldapglue.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-ldapgluegroups.conf b/tests/data/slapd-ldapgluegroups.conf index 6fa4bfcd4f..3b79351c3d 100644 --- a/tests/data/slapd-ldapgluegroups.conf +++ b/tests/data/slapd-ldapgluegroups.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-ldapgluepeople.conf b/tests/data/slapd-ldapgluepeople.conf index d288f5b6eb..132feba343 100644 --- a/tests/data/slapd-ldapgluepeople.conf +++ b/tests/data/slapd-ldapgluepeople.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-limits.conf b/tests/data/slapd-limits.conf index c3ee111b50..5bc6dce5da 100644 --- a/tests/data/slapd-limits.conf +++ b/tests/data/slapd-limits.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-meta-target2.conf b/tests/data/slapd-meta-target2.conf index 6a4aee4540..25c95528e5 100644 --- a/tests/data/slapd-meta-target2.conf +++ b/tests/data/slapd-meta-target2.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf index 2348dc4456..375728fd28 100644 --- a/tests/data/slapd-meta.conf +++ b/tests/data/slapd-meta.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-provider.conf similarity index 96% rename from tests/data/slapd-nis-master.conf rename to tests/data/slapd-nis-provider.conf index 703305e45b..df550d470c 100644 --- a/tests/data/slapd-nis-master.conf +++ b/tests/data/slapd-nis-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing (needs updating) +# provider slapd config -- for testing (needs updating) # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf index 6f88ba2f36..6ef31cf71a 100644 --- a/tests/data/slapd-passwd.conf +++ b/tests/data/slapd-passwd.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-ppolicy.conf b/tests/data/slapd-ppolicy.conf index f1c83c49de..62746b4a39 100644 --- a/tests/data/slapd-ppolicy.conf +++ b/tests/data/slapd-ppolicy.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-provider.conf similarity index 97% rename from tests/data/slapd-master.conf rename to tests/data/slapd-provider.conf index 0e45f46313..dfdbe0f82f 100644 --- a/tests/data/slapd-master.conf +++ b/tests/data/slapd-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf index 8ffb13d620..dec7f66721 100644 --- a/tests/data/slapd-pw.conf +++ b/tests/data/slapd-pw.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-consumer.conf similarity index 96% rename from tests/data/slapd-ref-slave.conf rename to tests/data/slapd-ref-consumer.conf index 5d8d83f729..0470017972 100644 --- a/tests/data/slapd-ref-slave.conf +++ b/tests/data/slapd-ref-consumer.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for default referral testing +# consumer slapd config -- for default referral testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-relay.conf b/tests/data/slapd-relay.conf index 213eab46b1..c3f10af01a 100644 --- a/tests/data/slapd-relay.conf +++ b/tests/data/slapd-relay.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-repl-slave-remote.conf b/tests/data/slapd-repl-consumer-remote.conf similarity index 96% rename from tests/data/slapd-repl-slave-remote.conf rename to tests/data/slapd-repl-consumer-remote.conf index 9b1957b0e4..b0d3233836 100644 --- a/tests/data/slapd-repl-slave-remote.conf +++ b/tests/data/slapd-repl-consumer-remote.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of replication +# consumer slapd config -- for testing of replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -50,7 +50,7 @@ access to * database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret # HACK: use the RootDN of the monitor database as UpdateDN so ACLs apply # without the need to write the UpdateDN before starting replication diff --git a/tests/data/slapd-sql-syncrepl-master.conf b/tests/data/slapd-sql-syncrepl-provider.conf similarity index 98% rename from tests/data/slapd-sql-syncrepl-master.conf rename to tests/data/slapd-sql-syncrepl-provider.conf index f226fb82e6..8d2dcd9273 100644 --- a/tests/data/slapd-sql-syncrepl-master.conf +++ b/tests/data/slapd-sql-syncrepl-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-sql.conf b/tests/data/slapd-sql.conf index 4e723f95ec..2a16628a75 100644 --- a/tests/data/slapd-sql.conf +++ b/tests/data/slapd-sql.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-syncrepl-slave-persist-ldap.conf b/tests/data/slapd-syncrepl-consumer-persist-ldap.conf similarity index 96% rename from tests/data/slapd-syncrepl-slave-persist-ldap.conf rename to tests/data/slapd-syncrepl-consumer-persist-ldap.conf index 2b162f0d0a..8ec553b93e 100644 --- a/tests/data/slapd-syncrepl-slave-persist-ldap.conf +++ b/tests/data/slapd-syncrepl-consumer-persist-ldap.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication with intermediate proxy +# consumer slapd config -- for testing of SYNC replication with intermediate proxy # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-consumer-persist1.conf similarity index 95% rename from tests/data/slapd-syncrepl-slave-persist1.conf rename to tests/data/slapd-syncrepl-consumer-persist1.conf index a710d0f863..e692a2c0dd 100644 --- a/tests/data/slapd-syncrepl-slave-persist1.conf +++ b/tests/data/slapd-syncrepl-consumer-persist1.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -44,7 +44,7 @@ argsfile @TESTDIR@/slapd.4.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.4.a diff --git a/tests/data/slapd-syncrepl-slave-persist2.conf b/tests/data/slapd-syncrepl-consumer-persist2.conf similarity index 88% rename from tests/data/slapd-syncrepl-slave-persist2.conf rename to tests/data/slapd-syncrepl-consumer-persist2.conf index 16be0020a0..c00fe2f959 100644 --- a/tests/data/slapd-syncrepl-slave-persist2.conf +++ b/tests/data/slapd-syncrepl-consumer-persist2.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ include @SCHEMADIR@/core.schema @@ -21,7 +21,7 @@ argsfile @TESTDIR@/slapd.5.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.5.a #indexdb#index objectClass eq @@ -33,7 +33,7 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=@URI4@ - binddn="cn=Replica,dc=example,dc=com" + binddn="cn=consumer,dc=example,dc=com" bindmethod=simple credentials=secret searchbase="dc=example,dc=com" diff --git a/tests/data/slapd-syncrepl-slave-persist3.conf b/tests/data/slapd-syncrepl-consumer-persist3.conf similarity index 94% rename from tests/data/slapd-syncrepl-slave-persist3.conf rename to tests/data/slapd-syncrepl-consumer-persist3.conf index 9dd4af413e..fc1ffdd694 100644 --- a/tests/data/slapd-syncrepl-slave-persist3.conf +++ b/tests/data/slapd-syncrepl-consumer-persist3.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -33,7 +33,7 @@ argsfile @TESTDIR@/slapd.6.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.6.a #indexdb#index objectClass eq diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-consumer-refresh1.conf similarity index 94% rename from tests/data/slapd-syncrepl-slave-refresh1.conf rename to tests/data/slapd-syncrepl-consumer-refresh1.conf index e7a1e8e6d3..d3ada3ff40 100644 --- a/tests/data/slapd-syncrepl-slave-refresh1.conf +++ b/tests/data/slapd-syncrepl-consumer-refresh1.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -35,7 +35,7 @@ argsfile @TESTDIR@/slapd.2.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #null#bind on #~null~#directory @TESTDIR@/db.2.a diff --git a/tests/data/slapd-syncrepl-slave-refresh2.conf b/tests/data/slapd-syncrepl-consumer-refresh2.conf similarity index 92% rename from tests/data/slapd-syncrepl-slave-refresh2.conf rename to tests/data/slapd-syncrepl-consumer-refresh2.conf index 59d75d49fd..d524cfd55b 100644 --- a/tests/data/slapd-syncrepl-slave-refresh2.conf +++ b/tests/data/slapd-syncrepl-consumer-refresh2.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication +# consumer slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -33,7 +33,7 @@ argsfile @TESTDIR@/slapd.3.args database @BACKEND@ suffix "dc=example,dc=com" -rootdn "cn=Replica,dc=example,dc=com" +rootdn "cn=consumer,dc=example,dc=com" rootpw secret #~null~#directory @TESTDIR@/db.3.a #indexdb#index objectClass eq @@ -45,7 +45,7 @@ rootpw secret # Don't change syncrepl spec yet syncrepl rid=1 provider=@URI2@ - binddn="cn=Replica,dc=example,dc=com" + binddn="cn=consumer,dc=example,dc=com" bindmethod=simple credentials=secret searchbase="dc=example,dc=com" diff --git a/tests/data/slapd-syncrepl-multiproxy.conf b/tests/data/slapd-syncrepl-multiproxy.conf index 86c902616f..4dcf06b38f 100644 --- a/tests/data/slapd-syncrepl-multiproxy.conf +++ b/tests/data/slapd-syncrepl-multiproxy.conf @@ -1,4 +1,4 @@ -# slave slapd config -- for testing of SYNC replication with intermediate proxy +# consumer slapd config -- for testing of SYNC replication with intermediate proxy # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -32,7 +32,7 @@ argsfile @TESTDIR@/slapd.1.args #ldapmod#moduleload back_ldap.la ####################################################################### -# master database definitions +# provider database definitions ####################################################################### database @BACKEND@ diff --git a/tests/data/slapd-syncrepl-master.conf b/tests/data/slapd-syncrepl-provider.conf similarity index 94% rename from tests/data/slapd-syncrepl-master.conf rename to tests/data/slapd-syncrepl-provider.conf index c42d1eb0c8..76f96bb947 100644 --- a/tests/data/slapd-syncrepl-master.conf +++ b/tests/data/slapd-syncrepl-provider.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing of SYNC replication +# provider slapd config -- for testing of SYNC replication # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## @@ -30,7 +30,7 @@ argsfile @TESTDIR@/slapd.1.args #syncprovmod#moduleload syncprov.la ####################################################################### -# master database definitions +# provider database definitions ####################################################################### database @BACKEND@ diff --git a/tests/data/slapd-valregex.conf b/tests/data/slapd-valregex.conf index a565c88ef3..ab6d39d076 100644 --- a/tests/data/slapd-valregex.conf +++ b/tests/data/slapd-valregex.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/data/slapd-whoami.conf b/tests/data/slapd-whoami.conf index b38e59495e..b85109c94e 100644 --- a/tests/data/slapd-whoami.conf +++ b/tests/data/slapd-whoami.conf @@ -1,4 +1,4 @@ -# master slapd config -- for testing +# provider slapd config -- for testing # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh index a6a916bda7..a67f08b4fa 100755 --- a/tests/scripts/defines.sh +++ b/tests/scripts/defines.sh @@ -87,29 +87,29 @@ CLIENTDIR=../clients/tools CONF=$DATADIR/slapd.conf CONFTWO=$DATADIR/slapd2.conf CONF2DB=$DATADIR/slapd-2db.conf -MCONF=$DATADIR/slapd-master.conf +MCONF=$DATADIR/slapd-provider.conf COMPCONF=$DATADIR/slapd-component.conf PWCONF=$DATADIR/slapd-pw.conf WHOAMICONF=$DATADIR/slapd-whoami.conf ACLCONF=$DATADIR/slapd-acl.conf RCONF=$DATADIR/slapd-referrals.conf -SRMASTERCONF=$DATADIR/slapd-syncrepl-master.conf -DSRMASTERCONF=$DATADIR/slapd-deltasync-master.conf -DSRSLAVECONF=$DATADIR/slapd-deltasync-slave.conf +SRPROVIDERCONF=$DATADIR/slapd-syncrepl-provider.conf +DSRPROVIDERCONF=$DATADIR/slapd-deltasync-provider.conf +DSRCONSUMERCONF=$DATADIR/slapd-deltasync-consumer.conf PPOLICYCONF=$DATADIR/slapd-ppolicy.conf PROXYCACHECONF=$DATADIR/slapd-proxycache.conf PROXYAUTHZCONF=$DATADIR/slapd-proxyauthz.conf -CACHEMASTERCONF=$DATADIR/slapd-cache-master.conf -PROXYAUTHZMASTERCONF=$DATADIR/slapd-cache-master-proxyauthz.conf -R1SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-refresh1.conf -R2SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-refresh2.conf -P1SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist1.conf -P2SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist2.conf -P3SRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist3.conf +CACHEPROVIDERCONF=$DATADIR/slapd-cache-provider.conf +PROXYAUTHZPROVIDERCONF=$DATADIR/slapd-cache-provider-proxyauthz.conf +R1SRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-refresh1.conf +R2SRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-refresh2.conf +P1SRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-persist1.conf +P2SRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-persist2.conf +P3SRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-persist3.conf DIRSYNC1CONF=$DATADIR/slapd-dirsync1.conf -DSEESYNC1CONF=$DATADIR/slapd-dsee-slave1.conf -DSEESYNC2CONF=$DATADIR/slapd-dsee-slave2.conf -REFSLAVECONF=$DATADIR/slapd-ref-slave.conf +DSEESYNC1CONF=$DATADIR/slapd-dsee-consumer1.conf +DSEESYNC2CONF=$DATADIR/slapd-dsee-consumer2.conf +REFCONSUMERCONF=$DATADIR/slapd-ref-consumer.conf SCHEMACONF=$DATADIR/slapd-schema.conf TLSCONF=$DATADIR/slapd-tls.conf TLSSASLCONF=$DATADIR/slapd-tls-sasl.conf @@ -130,7 +130,7 @@ CHAINCONF2=$DATADIR/slapd-chain2.conf GLUESYNCCONF1=$DATADIR/slapd-glue-syncrepl1.conf GLUESYNCCONF2=$DATADIR/slapd-glue-syncrepl2.conf SQLCONF=$DATADIR/slapd-sql.conf -SQLSRMASTERCONF=$DATADIR/slapd-sql-syncrepl-master.conf +SQLSRPROVIDERCONF=$DATADIR/slapd-sql-syncrepl-provider.conf TRANSLUCENTLOCALCONF=$DATADIR/slapd-translucent-local.conf TRANSLUCENTREMOTECONF=$DATADIR/slapd-translucent-remote.conf METACONF=$DATADIR/slapd-meta.conf @@ -141,9 +141,9 @@ GLUELDAPCONF=$DATADIR/slapd-glue-ldap.conf ACICONF=$DATADIR/slapd-aci.conf VALSORTCONF=$DATADIR/slapd-valsort.conf DYNLISTCONF=$DATADIR/slapd-dynlist.conf -RSLAVECONF=$DATADIR/slapd-repl-slave-remote.conf -PLSRSLAVECONF=$DATADIR/slapd-syncrepl-slave-persist-ldap.conf -PLSRMASTERCONF=$DATADIR/slapd-syncrepl-multiproxy.conf +RCONSUMERCONF=$DATADIR/slapd-repl-consumer-remote.conf +PLSRCONSUMERCONF=$DATADIR/slapd-syncrepl-consumer-persist-ldap.conf +PLSRPROVIDERCONF=$DATADIR/slapd-syncrepl-multiproxy.conf DDSCONF=$DATADIR/slapd-dds.conf PASSWDCONF=$DATADIR/slapd-passwd.conf UNDOCONF=$DATADIR/slapd-config-undo.conf @@ -298,7 +298,7 @@ MONITOR="" REFDN="c=US" BASEDN="dc=example,dc=com" MANAGERDN="cn=Manager,$BASEDN" -UPDATEDN="cn=Replica,$BASEDN" +UPDATEDN="cn=consumer,$BASEDN" PASSWD=secret BABSDN="cn=Barbara Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN" BJORNSDN="cn=Bjorn Jensen,ou=Information Technology DivisioN,ou=People,$BASEDN" @@ -354,29 +354,29 @@ SERVER5FLT=$TESTDIR/server5.flt SERVER6OUT=$TESTDIR/server6.out SERVER6FLT=$TESTDIR/server6.flt -MASTEROUT=$SERVER1OUT -MASTERFLT=$SERVER1FLT -SLAVEOUT=$SERVER2OUT -SLAVE2OUT=$SERVER3OUT -SLAVEFLT=$SERVER2FLT -SLAVE2FLT=$SERVER3FLT +PROVIDEROUT=$SERVER1OUT +PROVIDERFLT=$SERVER1FLT +CONSUMEROUT=$SERVER2OUT +CONSUMER2OUT=$SERVER3OUT +CONSUMERFLT=$SERVER2FLT +CONSUMER2FLT=$SERVER3FLT MTREADOUT=$TESTDIR/mtread.out # original outputs for cmp PROXYCACHEOUT=$DATADIR/proxycache.out REFERRALOUT=$DATADIR/referrals.out -SEARCHOUTMASTER=$DATADIR/search.out.master +SEARCHOUTPROVIDER=$DATADIR/search.out.provider SEARCHOUTX=$DATADIR/search.out.xsearch COMPSEARCHOUT=$DATADIR/compsearch.out -MODIFYOUTMASTER=$DATADIR/modify.out.master -ADDDELOUTMASTER=$DATADIR/adddel.out.master -MODRDNOUTMASTER0=$DATADIR/modrdn.out.master.0 -MODRDNOUTMASTER1=$DATADIR/modrdn.out.master.1 -MODRDNOUTMASTER2=$DATADIR/modrdn.out.master.2 -MODRDNOUTMASTER3=$DATADIR/modrdn.out.master.3 -ACLOUTMASTER=$DATADIR/acl.out.master -REPLOUTMASTER=$DATADIR/repl.out.master +MODIFYOUTPROVIDER=$DATADIR/modify.out.provider +ADDDELOUTPROVIDER=$DATADIR/adddel.out.provider +MODRDNOUTPROVIDER0=$DATADIR/modrdn.out.provider.0 +MODRDNOUTPROVIDER1=$DATADIR/modrdn.out.provider.1 +MODRDNOUTPROVIDER2=$DATADIR/modrdn.out.provider.2 +MODRDNOUTPROVIDER3=$DATADIR/modrdn.out.provider.3 +ACLOUTPROVIDER=$DATADIR/acl.out.provider +REPLOUTPROVIDER=$DATADIR/repl.out.provider MODSRCHFILTERS=$DATADIR/modify.search.filters CERTIFICATETLS=$DATADIR/certificate.tls CERTIFICATEOUT=$DATADIR/certificate.out diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search index ca50be69c5..bc9be744a7 100755 --- a/tests/scripts/passwd-search +++ b/tests/scripts/passwd-search @@ -122,7 +122,7 @@ test "$KILLSERVERS" != no && kill -HUP $KILLPIDS echo "Assuming everything is fine." #echo "Comparing results" -#$CMP $TESTOUT $SEARCHOUTMASTER +#$CMP $TESTOUT $SEARCHOUTPROVIDER #if test $? != 0 ; then # echo "Comparison failed" # exit 1 diff --git a/tests/scripts/sql-test901-syncrepl b/tests/scripts/sql-test901-syncrepl index d1e008b9b0..66b2adcf8b 100755 --- a/tests/scripts/sql-test901-syncrepl +++ b/tests/scripts/sql-test901-syncrepl @@ -34,7 +34,7 @@ fi mkdir -p $TESTDIR $DBDIR2A echo "Starting slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SQLSRMASTERCONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $SQLSRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -61,17 +61,17 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $R1SRSLAVECONF > $CONF2 +echo "Starting consumer slapd on TCP/IP port $PORT2..." +. $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" -echo "Using ldapsearch to check that slave slapd is running..." +echo "Using ldapsearch to check that consumer slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ 'objectclass=*' > /dev/null 2>&1 @@ -91,8 +91,8 @@ fi cat /dev/null > $SEARCHOUT -echo "Using ldapsearch to retrieve all the entries from the master..." -echo "# Using ldapsearch to retrieve all the entries from the master..." \ +echo "Using ldapsearch to retrieve all the entries from the provider..." +echo "# Using ldapsearch to retrieve all the entries from the provider..." \ >> $SEARCHOUT $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT1 -b "$BASEDN" \ -D "$MANAGERDN" -w $PASSWD \ @@ -107,8 +107,8 @@ fi cat /dev/null > $SEARCHOUT2 -echo "Using ldapsearch to retrieve all the entries from the slave..." -echo "# Using ldapsearch to retrieve all the entries from the slave..." \ +echo "Using ldapsearch to retrieve all the entries from the consumer..." +echo "# Using ldapsearch to retrieve all the entries from the consumer..." \ >> $SEARCHOUT2 $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT2 -b "$BASEDN" \ -D "$UPDATEDN" -w $PASSWD \ @@ -121,9 +121,9 @@ if test $RC != 0 ; then exit $RC fi -echo "Filtering ldapsearch results from master..." +echo "Filtering ldapsearch results from provider..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT -echo "Filtering ldapsearch results from slave..." +echo "Filtering ldapsearch results from consumer..." $LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2 echo "Comparing filter output..." $CMP $SEARCHFLT $SEARCHFLT2 > $CMPOUT @@ -632,13 +632,13 @@ EOMODS exit 1 fi - echo "Waiting 25 seconds for master to send changes..." + echo "Waiting 25 seconds for provider to send changes..." sleep 25 cat /dev/null > $SEARCHOUT - echo "Using ldapsearch to retrieve all the entries from the master..." - echo "# Using ldapsearch to retrieve all the entries from the master..." \ + echo "Using ldapsearch to retrieve all the entries from the provider..." + echo "# Using ldapsearch to retrieve all the entries from the provider..." \ >> $SEARCHOUT $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT1 -b "$BASEDN" \ -D "$MANAGERDN" -w $PASSWD \ @@ -653,8 +653,8 @@ EOMODS cat /dev/null > $SEARCHOUT2 - echo "Using ldapsearch to retrieve all the entries from the slave..." - echo "# Using ldapsearch to retrieve all the entries from the slave..." \ + echo "Using ldapsearch to retrieve all the entries from the consumer..." + echo "# Using ldapsearch to retrieve all the entries from the consumer..." \ >> $SEARCHOUT2 $LDAPSEARCH -S "" -h $LOCALHOST -p $PORT2 -b "$BASEDN" \ -D "$UPDATEDN" -w $PASSWD \ @@ -667,9 +667,9 @@ EOMODS exit $RC fi - echo "Filtering ldapsearch results from master..." + echo "Filtering ldapsearch results from provider..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT - echo "Filtering ldapsearch results from slave..." + echo "Filtering ldapsearch results from consumer..." $LDIFFILTER < $SEARCHOUT2 > $SEARCHFLT2 echo "Comparing filter output..." $CMP $SEARCHFLT $SEARCHFLT2 > $CMPOUT diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh index f939601364..e531b00ebd 100755 --- a/tests/scripts/startup_nis_ldap_server.sh +++ b/tests/scripts/startup_nis_ldap_server.sh @@ -29,9 +29,9 @@ NIS_LDIF=$SRCDIR/data/nis_sample.ldif # Sample configuration file for your LDAP server if test "$BACKEND" = "bdb2" ; then - NIS_CONF=$DATADIR/slapd-bdb2-nis-master.conf + NIS_CONF=$DATADIR/slapd-bdb2-nis-provider.conf else - NIS_CONF=$DATADIR/slapd-nis-master.conf + NIS_CONF=$DATADIR/slapd-nis-provider.conf fi echo "Cleaning up in $DBDIR..." @@ -47,7 +47,7 @@ if [ $RC != 0 ]; then fi echo "Starting slapd on TCP/IP port $PORT..." -$SLAPD -f $NIS_CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 & +$SLAPD -f $NIS_CONF -p $PORT -d $LVL $TIMING > $PROVIDERLOG 2>&1 & PID=$! echo ">>>>> LDAP server with NIS schema is up! PID=$PID" diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search index 8b46804036..9454fd7104 100755 --- a/tests/scripts/test003-search +++ b/tests/scripts/test003-search @@ -134,7 +134,7 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS -LDIF=$SEARCHOUTMASTER +LDIF=$SEARCHOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify index 00a5d71f4b..573ba07044 100755 --- a/tests/scripts/test004-modify +++ b/tests/scripts/test004-modify @@ -101,7 +101,7 @@ if test $RC != 0 ; then exit $RC fi -LDIF=$MODIFYOUTMASTER +LDIF=$MODIFYOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn index f229e2cc88..694fc3b1ff 100755 --- a/tests/scripts/test005-modrdn +++ b/tests/scripts/test005-modrdn @@ -95,7 +95,7 @@ if test $RC != 0 ; then fi -LDIF=$MODRDNOUTMASTER1 +LDIF=$MODRDNOUTPROVIDER1 echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT @@ -122,7 +122,7 @@ if test $RC != 0 ; then fi -LDIF=$MODRDNOUTMASTER2 +LDIF=$MODRDNOUTPROVIDER2 echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT @@ -166,7 +166,7 @@ if test $RC != 0 ; then exit $RC fi -LDIF=$MODRDNOUTMASTER0 +LDIF=$MODRDNOUTPROVIDER0 echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT @@ -206,7 +206,7 @@ if test $RC != 0 ; then exit $RC fi -LDIF=$MODRDNOUTMASTER3 +LDIF=$MODRDNOUTPROVIDER3 echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls index 37b57b3ca2..8fdb6e8d18 100755 --- a/tests/scripts/test006-acls +++ b/tests/scripts/test006-acls @@ -646,7 +646,7 @@ if test $RC != 0 ; then exit $RC fi -LDIF=$ACLOUTMASTER +LDIF=$ACLOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test007-slapmodify b/tests/scripts/test007-slapmodify index 7a640e70e3..a34ca59d2d 100755 --- a/tests/scripts/test007-slapmodify +++ b/tests/scripts/test007-slapmodify @@ -64,7 +64,7 @@ if test $RC != 0 ; then exit $RC fi -LDIF=$MODIFYOUTMASTER +LDIF=$MODIFYOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral index a127ab0e03..7f0de605d1 100755 --- a/tests/scripts/test009-referral +++ b/tests/scripts/test009-referral @@ -31,28 +31,28 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting master slapd on TCP/IP port $PORT1..." -$SLAPD -n master -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & +echo "Starting provider slapd on TCP/IP port $PORT1..." +$SLAPD -n provider -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then echo PID $PID read foo fi -echo "Starting slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $REFSLAVECONF > $CONF2 -$SLAPD -n slave -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +echo "Starting consumer slapd on TCP/IP port $PORT2..." +. $CONFFILTER $BACKEND $MONITORDB < $REFCONSUMERCONF > $CONF2 +$SLAPD -n consumer -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" sleep 1 -echo "Testing for master slapd..." +echo "Testing for provider slapd..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 @@ -60,7 +60,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for master slapd to start..." + echo "Waiting 5 seconds for provider slapd to start..." sleep 5 done @@ -70,7 +70,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Testing for slave slapd..." +echo "Testing for consumer slapd..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ 'objectclass=*' > /dev/null 2>&1 @@ -78,7 +78,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for slave slapd to start..." + echo "Waiting 5 seconds for consumer slapd to start..." sleep 5 done @@ -160,7 +160,7 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS -LDIF=$SEARCHOUTMASTER +LDIF=$SEARCHOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch index f178f67df4..0545761ab4 100755 --- a/tests/scripts/test015-xsearch +++ b/tests/scripts/test015-xsearch @@ -238,7 +238,7 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS -LDIF=$SEARCHOUTMASTER +LDIF=$SEARCHOUTPROVIDER LDIF2=$SEARCHOUTX echo "Filtering ldapsearch results..." diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref index cedee57ae5..6764986059 100755 --- a/tests/scripts/test016-subref +++ b/tests/scripts/test016-subref @@ -177,7 +177,7 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS -LDIF=$SEARCHOUTMASTER +LDIF=$SEARCHOUTPROVIDER echo "Filtering ldapsearch results..." $LDIFFILTER < $SEARCHOUT > $SEARCHFLT echo "Filtering expected LDIF for comparison..." diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh index d9dfa4361c..4416b3e5eb 100755 --- a/tests/scripts/test017-syncreplication-refresh +++ b/tests/scripts/test017-syncreplication-refresh @@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 # echo "Starting provider slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -74,14 +74,14 @@ if test $RC != 0 ; then fi echo "Starting consumer slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $R1SRSLAVECONF > $CONF2 +. $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -314,7 +314,7 @@ OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp" echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -325,7 +325,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -337,12 +337,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index b18dbab434..b422724533 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -36,7 +36,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4 # echo "Starting provider slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -76,14 +76,14 @@ if test $RC != 0 ; then fi echo "Starting consumer slapd on TCP/IP port $PORT4..." -. $CONFFILTER $BACKEND $MONITORDB < $P1SRSLAVECONF > $CONF4 +. $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -120,7 +120,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -131,7 +131,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -141,12 +141,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" @@ -165,7 +165,7 @@ if test $WAIT != 0 ; then echo PID $PID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" sleep 1 @@ -329,7 +329,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -340,7 +340,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -350,12 +350,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" @@ -364,8 +364,8 @@ if test $? != 0 ; then fi echo "Stopping consumer to test recovery..." -kill -HUP $SLAVEPID -wait $SLAVEPID +kill -HUP $CONSUMERPID +wait $CONSUMERPID echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ @@ -414,19 +414,19 @@ fi echo "Restarting consumer..." echo "RESTART" >> $LOG4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -437,7 +437,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -447,12 +447,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" @@ -505,7 +505,7 @@ RC=$? echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -516,7 +516,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -526,12 +526,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade index 0e9fc67f0b..0a0e131f4b 100755 --- a/tests/scripts/test019-syncreplication-cascade +++ b/tests/scripts/test019-syncreplication-cascade @@ -25,15 +25,15 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $DBDIR4 $DBDIR5 $DBDIR6 # # Test replication: -# - start master -# - start slave +# - start provider +# - start consumer # - populate over ldap # - perform some modifies and deleted # - retrieve database over ldap and compare against expected results # -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1 +echo "Starting provider slapd on TCP/IP port $PORT1..." +. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -44,7 +44,7 @@ KILLPIDS="$PID" sleep 1 -echo "Using ldapsearch to check that master slapd (pid=$PID) is running..." +echo "Using ldapsearch to check that provider slapd (pid=$PID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 @@ -62,7 +62,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to create the context prefix entry in the master..." +echo "Using ldapadd to create the context prefix entry in the provider..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDCP > /dev/null 2>&1 RC=$? @@ -72,19 +72,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting R1 slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $R1SRSLAVECONF > $CONF2 +echo "Starting R1 consumer slapd on TCP/IP port $PORT2..." +. $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVE R1 PID $SLAVEPID + echo CONSUMER R1 PID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that R1 slave slapd (pid=$SLAVEPID) is running..." +echo "Using ldapsearch to check that R1 consumer slapd (pid=$CONSUMERPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ 'objectclass=*' > /dev/null 2>&1 @@ -102,19 +102,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting R2 slave slapd on TCP/IP port $PORT3..." -. $CONFFILTER $BACKEND $MONITORDB < $R2SRSLAVECONF > $CONF3 +echo "Starting R2 consumer slapd on TCP/IP port $PORT3..." +. $CONFFILTER $BACKEND $MONITORDB < $R2SRCONSUMERCONF > $CONF3 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVE R2 PID $SLAVEPID + echo CONSUMER R2 PID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that R2 slave slapd (pid=$SLAVEPID) is running..." +echo "Using ldapsearch to check that R2 consumer slapd (pid=$CONSUMERPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \ 'objectclass=*' > /dev/null 2>&1 @@ -122,7 +122,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for R2 slave slapd to start..." + echo "Waiting 5 seconds for R2 consumer slapd to start..." sleep 5 done @@ -132,19 +132,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting P1 slave slapd on TCP/IP port $PORT4..." -. $CONFFILTER $BACKEND $MONITORDB < $P1SRSLAVECONF > $CONF4 +echo "Starting P1 consumer slapd on TCP/IP port $PORT4..." +. $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVE P1 PID $SLAVEPID + echo CONSUMER P1 PID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that P1 slave slapd (pid=$SLAVEPID) is running..." +echo "Using ldapsearch to check that P1 consumer slapd (pid=$CONSUMERPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT4 \ 'objectclass=*' > /dev/null 2>&1 @@ -152,7 +152,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for P1 slave slapd to start..." + echo "Waiting 5 seconds for P1 consumer slapd to start..." sleep 5 done @@ -162,19 +162,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting P2 slave slapd on TCP/IP port $PORT5..." -. $CONFFILTER $BACKEND $MONITORDB < $P2SRSLAVECONF > $CONF5 +echo "Starting P2 consumer slapd on TCP/IP port $PORT5..." +. $CONFFILTER $BACKEND $MONITORDB < $P2SRCONSUMERCONF > $CONF5 $SLAPD -f $CONF5 -h $URI5 -d $LVL $TIMING > $LOG5 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVE P2 PID $SLAVEPID + echo CONSUMER P2 PID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that P2 slave slapd (pid=$SLAVEPID) is running..." +echo "Using ldapsearch to check that P2 consumer slapd (pid=$CONSUMERPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT5 \ 'objectclass=*' > /dev/null 2>&1 @@ -182,7 +182,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for P2 slave slapd to start..." + echo "Waiting 5 seconds for P2 consumer slapd to start..." sleep 5 done @@ -192,19 +192,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting P3 slave slapd on TCP/IP port $PORT6..." -. $CONFFILTER $BACKEND $MONITORDB < $P3SRSLAVECONF > $CONF6 +echo "Starting P3 consumer slapd on TCP/IP port $PORT6..." +. $CONFFILTER $BACKEND $MONITORDB < $P3SRCONSUMERCONF > $CONF6 $SLAPD -f $CONF6 -h $URI6 -d $LVL $TIMING > $LOG6 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVE P3 PID $SLAVEPID + echo CONSUMER P3 PID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that P3 slave slapd (pid=$SLAVEPID) is running..." +echo "Using ldapsearch to check that P3 consumer slapd (pid=$CONSUMERPID) is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT6 \ 'objectclass=*' > /dev/null 2>&1 @@ -212,7 +212,7 @@ for i in 0 1 2 3 4 5; do if test $RC = 0 ; then break fi - echo "Waiting 5 seconds for P3 slave slapd to start..." + echo "Waiting 5 seconds for P3 consumer slapd to start..." sleep 5 done @@ -222,7 +222,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to populate the master directory..." +echo "Using ldapadd to populate the provider directory..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDNOCP > /dev/null 2>&1 RC=$? @@ -235,7 +235,7 @@ fi echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..." sleep $SLEEP2 -echo "Using ldapmodify to modify master directory..." +echo "Using ldapmodify to modify provider directory..." # # Do some modifications @@ -359,124 +359,124 @@ fi echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..." sleep $SLEEP2 -echo "Using ldapsearch to read all the entries from the master..." +echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' '*' entryCSN > $MASTEROUT 2>&1 + '(objectClass=*)' '*' entryCSN > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Using ldapsearch to read all the entries from the R1 slave..." +echo "Using ldapsearch to read all the entries from the R1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ '(objectClass=*)' '*' entryCSN > $SERVER2OUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at R1 slave ($RC)!" + echo "ldapsearch failed at R1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Using ldapsearch to read all the entries from the R2 slave..." +echo "Using ldapsearch to read all the entries from the R2 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \ '(objectClass=*)' '*' entryCSN > $SERVER3OUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at R2 slave ($RC)!" + echo "ldapsearch failed at R2 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Using ldapsearch to read all the entries from the P1 slave..." +echo "Using ldapsearch to read all the entries from the P1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ '(objectClass=*)' '*' entryCSN > $SERVER4OUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at P1 slave ($RC)!" + echo "ldapsearch failed at P1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Using ldapsearch to read all the entries from the P2 slave..." +echo "Using ldapsearch to read all the entries from the P2 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT5 \ '(objectClass=*)' '*' entryCSN > $SERVER5OUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at P2 slave ($RC)!" + echo "ldapsearch failed at P2 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Using ldapsearch to read all the entries from the P3 slave..." +echo "Using ldapsearch to read all the entries from the P3 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT6 \ '(objectClass=*)' '*' entryCSN > $SERVER6OUT 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at P3 slave ($RC)!" + echo "ldapsearch failed at P3 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi test $KILLSERVERS != no && kill -HUP $KILLPIDS -echo "Filtering master ldapsearch results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT -echo "Filtering R1 slave ldapsearch results..." +echo "Filtering provider ldapsearch results..." +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT +echo "Filtering R1 consumer ldapsearch results..." $LDIFFILTER < $SERVER2OUT > $SERVER2FLT -echo "Filtering R2 slave ldapsearch results..." +echo "Filtering R2 consumer ldapsearch results..." $LDIFFILTER < $SERVER3OUT > $SERVER3FLT -echo "Filtering P1 slave ldapsearch results..." +echo "Filtering P1 consumer ldapsearch results..." $LDIFFILTER < $SERVER4OUT > $SERVER4FLT -echo "Filtering P2 slave ldapsearch results..." +echo "Filtering P2 consumer ldapsearch results..." $LDIFFILTER < $SERVER5OUT > $SERVER5FLT -echo "Filtering P3 slave ldapsearch results..." +echo "Filtering P3 consumer ldapsearch results..." $LDIFFILTER < $SERVER6OUT > $SERVER6FLT -echo "Comparing retrieved entries from master and R1 slave..." -$CMP $MASTERFLT $SERVER2FLT > $CMPOUT +echo "Comparing retrieved entries from provider and R1 consumer..." +$CMP $PROVIDERFLT $SERVER2FLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and R1 slave databases differ" + echo "test failed - provider and R1 consumer databases differ" exit 1 fi -echo "Comparing retrieved entries from master and R2 slave..." -$CMP $MASTERFLT $SERVER3FLT > $CMPOUT +echo "Comparing retrieved entries from provider and R2 consumer..." +$CMP $PROVIDERFLT $SERVER3FLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and R2 slave databases differ" + echo "test failed - provider and R2 consumer databases differ" exit 1 fi -echo "Comparing retrieved entries from master and P1 slave..." -$CMP $MASTERFLT $SERVER4FLT > $CMPOUT +echo "Comparing retrieved entries from provider and P1 consumer..." +$CMP $PROVIDERFLT $SERVER4FLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P1 slave databases differ" + echo "test failed - provider and P1 consumer databases differ" exit 1 fi -echo "Comparing retrieved entries from master and P2 slave..." -$CMP $MASTERFLT $SERVER5FLT > $CMPOUT +echo "Comparing retrieved entries from provider and P2 consumer..." +$CMP $PROVIDERFLT $SERVER5FLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P2 slave databases differ" + echo "test failed - provider and P2 consumer databases differ" exit 1 fi -echo "Comparing retrieved entries from master and P3 slave..." -$CMP $MASTERFLT $SERVER6FLT > $CMPOUT +echo "Comparing retrieved entries from provider and P3 consumer..." +$CMP $PROVIDERFLT $SERVER6FLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P3 slave databases differ" + echo "test failed - provider and P3 consumer databases differ" exit 1 fi diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache index 7c9b9b6c11..144cbf299d 100755 --- a/tests/scripts/test020-proxycache +++ b/tests/scripts/test020-proxycache @@ -43,16 +43,16 @@ fi mkdir -p $TESTDIR $DBDIR1 $DBDIR2 # Test proxy caching: -# - start master +# - start provider # - start proxy cache -# - populate master +# - populate provider # - perform first set of searches at the proxy # - verify cacheability # - perform second set of searches at the proxy # - verify answerability -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER < $CACHEMASTERCONF > $CONF1 +echo "Starting provider slapd on TCP/IP port $PORT1..." +. $CONFFILTER < $CACHEPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -63,7 +63,7 @@ KILLPIDS="$PID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 @@ -81,7 +81,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to populate the master directory..." +echo "Using ldapadd to populate the provider directory..." $LDAPADD -x -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDERED > /dev/null 2>&1 RC=$? diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl index 686bf1cf71..2922214100 100755 --- a/tests/scripts/test043-delta-syncrepl +++ b/tests/scripts/test043-delta-syncrepl @@ -45,7 +45,7 @@ SPEC="mdb=a" # echo "Starting provider slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $DSRMASTERCONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $DSRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -85,14 +85,14 @@ if test $RC != 0 ; then fi echo "Starting consumer slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $DSRSLAVECONF > $CONF2 +. $CONFFILTER $BACKEND $MONITORDB < $DSRCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -137,7 +137,7 @@ if test $WAIT != 0 ; then echo PID $PID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" sleep 1 @@ -249,7 +249,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - 'objectclass=*' \* + > $MASTEROUT 2>&1 + 'objectclass=*' \* + > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -260,7 +260,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - 'objectclass=*' \* + > $SLAVEOUT 2>&1 + 'objectclass=*' \* + > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -270,12 +270,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER -b $BACKEND -s $SPEC < $MASTEROUT | grep -iv "^auditcontext:" > $MASTERFLT +$LDIFFILTER -b $BACKEND -s $SPEC < $PROVIDEROUT | grep -iv "^auditcontext:" > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -b $BACKEND -s $SPEC < $SLAVEOUT | grep -iv "^auditcontext:" > $SLAVEFLT +$LDIFFILTER -b $BACKEND -s $SPEC < $CONSUMEROUT | grep -iv "^auditcontext:" > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" @@ -284,7 +284,7 @@ if test $? != 0 ; then fi echo "Stopping consumer to test recovery..." -kill -HUP $SLAVEPID +kill -HUP $CONSUMERPID sleep 10 echo "Modifying more entries on the provider..." @@ -322,12 +322,12 @@ EOMODS echo "Restarting consumer..." echo "RESTART" >> $LOG2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 @@ -357,7 +357,7 @@ fi echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - 'objectclass=*' \* + > $MASTEROUT 2>&1 + 'objectclass=*' \* + > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -368,7 +368,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - 'objectclass=*' \* + > $SLAVEOUT 2>&1 + 'objectclass=*' \* + > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -380,12 +380,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER -b $BACKEND -s $SPEC < $MASTEROUT | grep -iv "^auditcontext:" > $MASTERFLT +$LDIFFILTER -b $BACKEND -s $SPEC < $PROVIDEROUT | grep -iv "^auditcontext:" > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -b $BACKEND -s $SPEC < $SLAVEOUT | grep -iv "^auditcontext:" > $SLAVEFLT +$LDIFFILTER -b $BACKEND -s $SPEC < $CONSUMEROUT | grep -iv "^auditcontext:" > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied index ec7175c6d0..b932fc3dee 100755 --- a/tests/scripts/test045-syncreplication-proxied +++ b/tests/scripts/test045-syncreplication-proxied @@ -42,27 +42,27 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 # # Test replication: -# - start master -# - start slave +# - start provider +# - start consumer # - populate over ldap # - perform some modifies and deleted -# - attempt to modify the slave (referral or chain) +# - attempt to modify the consumer (referral or chain) # - retrieve database over ldap and compare against expected results # -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1 +echo "Starting provider slapd on TCP/IP port $PORT1..." +. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & -MASTERPID=$! +PROVIDERPID=$! if test $WAIT != 0 ; then - echo MASTERPID $MASTERPID + echo PROVIDERPID $PROVIDERPID read foo fi -KILLPIDS="$MASTERPID" +KILLPIDS="$PROVIDERPID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ '(objectClass=*)' > /dev/null 2>&1 @@ -80,7 +80,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to create the context prefix entry in the master..." +echo "Using ldapadd to create the context prefix entry in the provider..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDCP > /dev/null 2>&1 RC=$? @@ -90,19 +90,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF > $CONF2 +echo "Starting consumer slapd on TCP/IP port $PORT2..." +. $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$MASTERPID $SLAVEPID" +KILLPIDS="$PROVIDERPID $CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that slave slapd is running..." +echo "Using ldapsearch to check that consumer slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ '(objectClass=*)' > /dev/null 2>&1 @@ -121,14 +121,14 @@ if test $RC != 0 ; then fi echo "Starting proxy slapd on TCP/IP port $PORT3..." -. $CONFFILTER $BACKEND $MONITORDB < $PLSRSLAVECONF > $CONF3 +. $CONFFILTER $BACKEND $MONITORDB < $PLSRCONSUMERCONF > $CONF3 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & PROXYPID=$! if test $WAIT != 0 ; then echo PROXYPID $PROXYPID read foo fi -KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID" +KILLPIDS="$PROVIDERPID $CONSUMERPID $PROXYPID" sleep 1 @@ -160,7 +160,7 @@ case $RC in esac CHECK=1 -echo "$CHECK > Using ldapadd to populate the master directory..." +echo "$CHECK > Using ldapadd to populate the provider directory..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDNOCP > /dev/null 2>&1 RC=$? @@ -170,30 +170,30 @@ if test $RC != 0 ; then exit $RC fi -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break @@ -203,60 +203,60 @@ for i in 1 2 3; do sleep $SLEEP1 done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` echo "$CHECK > Stopping the provider, sleeping $SLEEP2 seconds and restarting it..." -kill -HUP "$MASTERPID" -wait $MASTERPID +kill -HUP "$PROVIDERPID" +wait $PROVIDERPID sleep $SLEEP2 echo "======================= RESTART =======================" >> $LOG1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & -MASTERPID=$! +PROVIDERPID=$! if test $WAIT != 0 ; then - echo MASTERPID $MASTERPID + echo PROVIDERPID $PROVIDERPID read foo fi -KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID" +KILLPIDS="$PROVIDERPID $CONSUMERPID $PROXYPID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ '(objectClass=*)' > /dev/null 2>&1 @@ -274,7 +274,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapmodify to modify master directory..." +echo "Using ldapmodify to modify provider directory..." # # Do some modifications @@ -361,70 +361,70 @@ if test $RC != 0 ; then exit $RC fi -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN for i in 1 2 3; do echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break fi done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -434,7 +434,7 @@ echo "$CHECK > Stopping proxy to test recovery..." kill -HUP $PROXYPID wait $PROXYPID -echo "Modifying more entries on the master..." +echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ $TESTOUT 2>&1 << EOMODS dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com @@ -466,78 +466,78 @@ if test $WAIT != 0 ; then echo PROXYPID $PROXYPID read foo fi -KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID" +KILLPIDS="$PROVIDERPID $CONSUMERPID $PROXYPID" -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN for i in 1 2 3 4 5; do echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break fi done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` -echo "$CHECK > Try updating the slave slapd..." +echo "$CHECK > Try updating the consumer slapd..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com @@ -555,31 +555,31 @@ if test $RC != 0 ; then exit $RC fi -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break @@ -589,48 +589,48 @@ for i in 1 2 3; do sleep $SLEEP1 done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ -'(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 +'(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` echo "$CHECK > Stopping consumer to test recovery..." -kill -HUP $SLAVEPID -wait $SLAVEPID +kill -HUP $CONSUMERPID +wait $CONSUMERPID -echo "Modifying more entries on the master..." +echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ $TESTOUT 2>&1 << EOMODS dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com @@ -646,85 +646,85 @@ sleep $SLEEP2 echo "Restarting consumer..." echo "======================= RESTART =======================" >> $LOG2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID" +KILLPIDS="$PROVIDERPID $CONSUMERPID $PROXYPID" -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN for i in 1 2 3 4 5; do echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break fi done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then # FIXME: keep the original workaround in place, in case we needed again if test 1 = 1 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi - echo " test failed - master and slave databases differ (ignored by now)" + echo " test failed - provider and consumer databases differ (ignored by now)" echo " Stopping proxy to see if it auto-recovers..." kill -HUP $PROXYPID wait $PROXYPID @@ -737,30 +737,30 @@ if test $? != 0 ; then echo PROXYPID $PROXYPID read foo fi - KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID" + KILLPIDS="$PROVIDERPID $CONSUMERPID $PROXYPID" echo " Waiting $SLEEP2 seconds for syncrepl to receive changes..." sleep $SLEEP2 - #echo "Using ldapsearch to read all the entries from the slave..." + #echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.5.1" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.5.1" 2>&1 RC=$? if test $RC != 0 ; then - echo " ldapsearch failed at slave ($RC)!" + echo " ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - #echo "Filtering slave results..." - $LDIFFILTER < "${SLAVEOUT}.5.1" > $SLAVEFLT + #echo "Filtering consumer results..." + $LDIFFILTER < "${CONSUMEROUT}.5.1" > $CONSUMERFLT - echo " ${CHECK}.1 < Comparing retrieved entries from master and slave..." - $CMP $MASTERFLT $SLAVEFLT > $CMPOUT + echo " ${CHECK}.1 < Comparing retrieved entries from provider and consumer..." + $CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo " test failed - master and slave databases differ" + echo " test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -793,30 +793,30 @@ if test $RC != 0 ; then exit $RC fi -# get master contextCSN +# get provider contextCSN $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - -s base '(objectClass=*)' contextCSN > "${MASTEROUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -# check slave contextCSN +# check consumer contextCSN sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - -s base '(objectClass=*)' contextCSN > "${SLAVEOUT}.$CHECK" 2>&1 + -s base '(objectClass=*)' contextCSN > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - $CMP ${MASTEROUT}.$CHECK ${SLAVEOUT}.$CHECK > $CMPOUT + $CMP ${PROVIDEROUT}.$CHECK ${CONSUMEROUT}.$CHECK > $CMPOUT if test $? = 0 ; then break @@ -826,39 +826,39 @@ for i in 1 2 3; do sleep $SLEEP1 done -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the slave..." +#echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.$CHECK" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.$CHECK" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.$CHECK" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.$CHECK" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.$CHECK" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.$CHECK" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ (ignored by now)" - #echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ (ignored by now)" + #echo "test failed - provider and consumer databases differ" #test $KILLSERVERS != no && kill -HUP $KILLPIDS #exit 1 fi diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy index 317d3d2f85..61378e1df2 100755 --- a/tests/scripts/test048-syncrepl-multiproxy +++ b/tests/scripts/test048-syncrepl-multiproxy @@ -35,27 +35,27 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 # # Test replication: -# - start master -# - start slave +# - start provider +# - start consumer # - populate over ldap # - perform some modifies and deleted -# - attempt to modify the slave (referral or chain) +# - attempt to modify the consumer (referral or chain) # - retrieve database over ldap and compare against expected results # -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $PLSRMASTERCONF > $CONF1 +echo "Starting provider slapd on TCP/IP port $PORT1..." +. $CONFFILTER $BACKEND $MONITORDB < $PLSRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & -MASTERPID=$! +PROVIDERPID=$! if test $WAIT != 0 ; then - echo MASTERPID $MASTERPID + echo PROVIDERPID $PROVIDERPID read foo fi -KILLPIDS="$MASTERPID" +KILLPIDS="$PROVIDERPID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ '(objectClass=*)' > /dev/null 2>&1 @@ -73,7 +73,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to create the context prefix entry in the master..." +echo "Using ldapadd to create the context prefix entry in the provider..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDCP > /dev/null 2>&1 RC=$? @@ -83,19 +83,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting P1 slave slapd on TCP/IP port $PORT2..." -. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF > $CONF2 +echo "Starting P1 consumer slapd on TCP/IP port $PORT2..." +. $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -P1SLAVEPID=$! +P1CONSUMERPID=$! if test $WAIT != 0 ; then - echo P1SLAVEPID $P1SLAVEPID + echo P1CONSUMERPID $P1CONSUMERPID read foo fi -KILLPIDS="$MASTERPID $P1SLAVEPID" +KILLPIDS="$PROVIDERPID $P1CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that P1 slave slapd is running..." +echo "Using ldapsearch to check that P1 consumer slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \ '(objectClass=*)' > /dev/null 2>&1 @@ -113,19 +113,19 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting R1 slave slapd on TCP/IP port $PORT3..." -. $CONFFILTER $BACKEND $MONITORDB < $RSLAVECONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3 +echo "Starting R1 consumer slapd on TCP/IP port $PORT3..." +. $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & -R1SLAVEPID=$! +R1CONSUMERPID=$! if test $WAIT != 0 ; then - echo R1SLAVEPID $R1SLAVEPID + echo R1CONSUMERPID $R1CONSUMERPID read foo fi -KILLPIDS="$MASTERPID $P1SLAVEPID $R1SLAVEPID" +KILLPIDS="$PROVIDERPID $P1CONSUMERPID $R1CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that R1 slave slapd is running..." +echo "Using ldapsearch to check that R1 consumer slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \ '(objectClass=*)' > /dev/null 2>&1 @@ -144,7 +144,7 @@ if test $RC != 0 ; then fi CHECK=1 -echo "$CHECK > Using ldapadd to populate the master directory..." +echo "$CHECK > Using ldapadd to populate the provider directory..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDNOCP > /dev/null 2>&1 RC=$? @@ -157,83 +157,83 @@ fi echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.1" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.1" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the P1 slave..." +#echo "Using ldapsearch to read all the entries from the P1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.1" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.1" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at P1 slave ($RC)!" + echo "ldapsearch failed at P1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.1" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.1" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.1" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and P1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P1 slave databases differ" + echo "test failed - provider and P1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi -#echo "Using ldapsearch to read all the entries from the R1 slave..." +#echo "Using ldapsearch to read all the entries from the R1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \ - '(objectClass=*)' > "${SLAVEOUT}.1" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.1" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at R1 slave ($RC)!" + echo "ldapsearch failed at R1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.1" > $SLAVEFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.1" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and R1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and R1 slave databases differ" + echo "test failed - provider and R1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` echo "$CHECK > Stopping the provider, sleeping $SLEEP2 seconds and restarting it..." -kill -HUP "$MASTERPID" -wait $MASTERPID +kill -HUP "$PROVIDERPID" +wait $PROVIDERPID sleep $SLEEP2 echo "======================= RESTART =======================" >> $LOG1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & -MASTERPID=$! +PROVIDERPID=$! if test $WAIT != 0 ; then - echo MASTERPID $MASTERPID + echo PROVIDERPID $PROVIDERPID read foo fi -KILLPIDS="$MASTERPID $P1SLAVEPID $R1SLAVEPID" +KILLPIDS="$PROVIDERPID $P1CONSUMERPID $R1CONSUMERPID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ '(objectClass=*)' > /dev/null 2>&1 @@ -251,7 +251,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapmodify to modify master directory..." +echo "Using ldapmodify to modify provider directory..." # # Do some modifications @@ -341,78 +341,78 @@ fi echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.2" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.2" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the P1 slave..." +#echo "Using ldapsearch to read all the entries from the P1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.2" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.2" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at P1 slave ($RC)!" + echo "ldapsearch failed at P1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.2" > $MASTERFLT -#echo "Filtering P1 slave results..." -$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.2" > $PROVIDERFLT +#echo "Filtering P1 consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.2" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and P1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P1 slave databases differ" + echo "test failed - provider and P1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi -#echo "Using ldapsearch to read all the entries from the R1 slave..." +#echo "Using ldapsearch to read all the entries from the R1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \ - '(objectClass=*)' > "${SLAVEOUT}.2" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.2" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at R1 slave ($RC)!" + echo "ldapsearch failed at R1 consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.2" > $SLAVEFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.2" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and R1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and R1 slave databases differ" + echo "test failed - provider and R1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` -echo "$CHECK > Stopping slaves to test recovery..." -kill -HUP $P1SLAVEPID $R1SLAVEPID -wait $P1SLAVEPID -wait $R1SLAVEPID +echo "$CHECK > Stopping consumer to test recovery..." +kill -HUP $P1CONSUMERPID $R1CONSUMERPID +wait $P1CONSUMERPID +wait $R1CONSUMERPID -echo "Modifying more entries on the master..." +echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ $TESTOUT 2>&1 << EOMODS dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, dc=example,dc=com changetype: modify add: description -description: r1 slave is down... +description: r1 consumer is down... dn: cn=James T. Kirk, ou=Retired, ou=People, dc=example,dc=com changetype: add @@ -430,89 +430,89 @@ cn: Tiberius J. Hooker EOMODS -echo "Restarting P1 slave..." +echo "Restarting P1 consumer..." echo "======================= RESTART =======================" >> $LOG3 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & -P1SLAVEPID=$! +P1CONSUMERPID=$! if test $WAIT != 0 ; then - echo P1SLAVEPID $P1SLAVEPID + echo P1CONSUMERPID $P1CONSUMERPID read foo fi -echo "Restarting R1 slave..." +echo "Restarting R1 consumer..." echo "======================= RESTART =======================" >> $LOG3 $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 & -R1SLAVEPID=$! +R1CONSUMERPID=$! if test $WAIT != 0 ; then - echo R1SLAVEPID $R1SLAVEPID + echo R1CONSUMERPID $R1CONSUMERPID read foo fi -KILLPIDS="$MASTERPID $P1SLAVEPID $R1SLAVEPID" +KILLPIDS="$PROVIDERPID $P1CONSUMERPID $R1CONSUMERPID" echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..." sleep $SLEEP2 -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.3" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.3" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the P1 slave..." +#echo "Using ldapsearch to read all the entries from the P1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectClass=*)' > "${SLAVEOUT}.3" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.3" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.3" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.3" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.3" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and P1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi -#echo "Using ldapsearch to read all the entries from the R1 slave..." +#echo "Using ldapsearch to read all the entries from the R1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \ - '(objectClass=*)' > "${SLAVEOUT}.3" 2>&1 + '(objectClass=*)' > "${CONSUMEROUT}.3" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.3" > $SLAVEFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.3" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and R1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and slave databases differ" + echo "test failed - provider and consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi CHECK=`expr $CHECK + 1` -echo "$CHECK > Try updating the P1 slave slapd..." +echo "$CHECK > Try updating the P1 consumer slapd..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \ $TESTOUT 2>&1 << EOMODS dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com @@ -533,61 +533,61 @@ fi echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -#echo "Using ldapsearch to read all the entries from the master..." +#echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectClass=*)' > "${MASTEROUT}.4" 2>&1 + '(objectClass=*)' > "${PROVIDEROUT}.4" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at master ($RC)!" + echo "ldapsearch failed at provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Using ldapsearch to read all the entries from the P1 slave..." +#echo "Using ldapsearch to read all the entries from the P1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ -'(objectClass=*)' > "${SLAVEOUT}.4" 2>&1 +'(objectClass=*)' > "${CONSUMEROUT}.4" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering master results..." -$LDIFFILTER < "${MASTEROUT}.4" > $MASTERFLT -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT +#echo "Filtering provider results..." +$LDIFFILTER < "${PROVIDEROUT}.4" > $PROVIDERFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.4" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and P1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and P1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and P1 slave databases differ" + echo "test failed - provider and P1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi -#echo "Using ldapsearch to read all the entries from the R1 slave..." +#echo "Using ldapsearch to read all the entries from the R1 consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT3 \ -'(objectClass=*)' > "${SLAVEOUT}.4" 2>&1 +'(objectClass=*)' > "${CONSUMEROUT}.4" 2>&1 RC=$? if test $RC != 0 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -#echo "Filtering slave results..." -$LDIFFILTER < "${SLAVEOUT}.4" > $SLAVEFLT +#echo "Filtering consumer results..." +$LDIFFILTER < "${CONSUMEROUT}.4" > $CONSUMERFLT -echo "$CHECK < Comparing retrieved entries from master and R1 slave..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +echo "$CHECK < Comparing retrieved entries from provider and R1 consumer..." +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then - echo "test failed - master and R1 slave databases differ" + echo "test failed - provider and R1 consumer databases differ" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config index b88f9987bd..440f2c3e13 100755 --- a/tests/scripts/test049-sync-config +++ b/tests/scripts/test049-sync-config @@ -136,12 +136,12 @@ echo "Starting consumer slapd on TCP/IP port $PORT2..." $SLAPADD -F $CFCON -n 0 -l $CONFLDIF cd $CONDIR $SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" cd $TESTWD sleep 1 @@ -328,7 +328,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read config from the provider..." $LDAPSEARCH -b cn=config -D cn=config -H $URI1 -y $CONFIGPWF \ - 'objectclass=*' > $MASTEROUT 2>&1 + 'objectclass=*' > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -339,7 +339,7 @@ fi echo "Using ldapsearch to read config from the consumer..." $LDAPSEARCH -b cn=config -D cn=config -H $URI2 -y $CONFIGPWF \ - 'objectclass=*' > $SLAVEOUT 2>&1 + 'objectclass=*' > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -349,12 +349,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved configs from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer configs differ" @@ -364,7 +364,7 @@ fi echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - 'objectclass=*' > $MASTEROUT 2>&1 + 'objectclass=*' > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -375,7 +375,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI2 -w $PASSWD \ - 'objectclass=*' > $SLAVEOUT 2>&1 + 'objectclass=*' > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -387,12 +387,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multiprovider similarity index 94% rename from tests/scripts/test050-syncrepl-multimaster rename to tests/scripts/test050-syncrepl-multiprovider index b88611a138..aed53723ef 100755 --- a/tests/scripts/test050-syncrepl-multimaster +++ b/tests/scripts/test050-syncrepl-multiprovider @@ -21,10 +21,10 @@ if test $SYNCPROV = syncprovno; then exit 0 fi -MMR=${MMR-4} +MPR=${MPR-4} -if [ $MMR -gt 9 ]; then -MMR=9 +if [ $MPR -gt 9 ]; then +MPR=9 fi XDIR=$TESTDIR/srv @@ -61,7 +61,7 @@ esac echo "Initializing server configurations..." n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do DBDIR=${XDIR}$n/db CFDIR=${XDIR}$n/slapd.d @@ -139,7 +139,7 @@ echo "dn: cn=config" >> $TMP echo "changetype: modify" >> $TMP echo "replace: olcServerID" >> $TMP n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" echo "olcServerID: $n $URI" >> $TMP @@ -160,7 +160,7 @@ add: olcSyncRepl EOF n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" echo "olcSyncRepl: rid=00$n provider=$URI binddn=\"cn=config\" bindmethod=simple" >> $TMP @@ -180,19 +180,19 @@ if test $RC != 0 ; then fi n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" LOG=$TESTDIR/slapd.$n.log echo "Starting server $n on TCP/IP port $PORT..." cd ${XDIR}$n $SLAPD -F ./slapd.d -h $URI -d $LVL $TIMING > $LOG 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" cd $TESTWD sleep 1 @@ -222,7 +222,7 @@ changetype: modify add: olcSyncRepl EOF j=1 -while [ $j -le $MMR ]; do +while [ $j -le $MPR ]; do P2=`expr $BASEPORT + $j` U2="ldap://${LOCALHOST}:$P2/" echo "olcSyncRepl: rid=00$j provider=$U2 binddn=\"cn=config\" bindmethod=simple" >> $TMP @@ -285,7 +285,7 @@ olcRootPW: $PASSWD EOF n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -341,7 +341,7 @@ echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..." sleep $SLEEP2 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -362,9 +362,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved configs from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n configs differ" @@ -375,7 +375,7 @@ n=`expr $n + 1` done n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -394,9 +394,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -420,7 +420,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -439,9 +439,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -470,7 +470,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -489,9 +489,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -533,7 +533,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -552,9 +552,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -597,7 +597,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -616,9 +616,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -672,7 +672,7 @@ if test $RC != 0 ; then fi n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" LOG=$TESTDIR/slapd.$n.log @@ -691,7 +691,7 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" echo "Using ldapsearch to check that server $n is running..." @@ -749,7 +749,7 @@ echo "Waiting $SLEEP1 seconds for servers to resync..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -768,9 +768,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load index 681df4b8a7..6188cab735 100755 --- a/tests/scripts/test054-syncreplication-parallel-load +++ b/tests/scripts/test054-syncreplication-parallel-load @@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4 # echo "Starting provider slapd on TCP/IP port $PORT1..." -. $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1 +. $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -74,14 +74,14 @@ if test $RC != 0 ; then fi echo "Starting consumer slapd on TCP/IP port $PORT4..." -. $CONFFILTER $BACKEND $MONITORDB < $P1SRSLAVECONF > $CONF4 +. $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -134,7 +134,7 @@ if test $WAIT != 0 ; then echo PID $PID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" sleep 1 @@ -260,8 +260,8 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 echo "Stopping consumer to test recovery..." -kill -HUP $SLAVEPID -wait $SLAVEPID +kill -HUP $CONSUMERPID +wait $CONSUMERPID echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ @@ -286,12 +286,12 @@ EOMODS echo "Restarting consumer..." echo "RESTART" >> $LOG4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 @@ -335,7 +335,7 @@ OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp" echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -346,7 +346,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -358,12 +358,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric index 6f6a1c1402..5af83d1f07 100755 --- a/tests/scripts/test058-syncrepl-asymmetric +++ b/tests/scripts/test058-syncrepl-asymmetric @@ -20,7 +20,7 @@ # # Search for "TEST:" to find each major test this script performs. -# The configuration here consist of 3 "sites", each with a "master" and +# The configuration here consist of 3 "sites", each with a "provider" and # a "search" server. One of the sites is the "central", the other two # are called "site1" and "site2". @@ -28,26 +28,26 @@ # these servers, the first number defines the $URL# and $PORT# variable # that server uses: # -# 1: SMC_* Site Master Central -# 2: SM1_* Site Master 1 -# 3: SM2_* Site Master 2 +# 1: SMC_* Site Provider Central +# 2: SM1_* Site Provider 1 +# 3: SM2_* Site Provider 2 # 4: SSC_* Search Site Central # 5: SS1_* Search Site 1 # 6: SS2_* Search Site 2 -# The master servers all have a set of subordinate databases glued below -# the same suffix database. Each of the masters are the master for at +# The provider servers all have a set of subordinate databases glued below +# the same suffix database. Each of the providers are the provider for at # least one of these subordinate databases, but there are never more -# than one master for any single database. I.e, this is neither a -# traditional single-master configuration, nor what most people think -# of as multi-master, but more what can be called multiple masters. +# than one provider for any single database. I.e, this is neither a +# traditional single-provider configuration, nor what most people think +# of as multi-provider, but more what can be called multiple providers. -# The central master replicates to the two other masters, and receives -# updates from them of the backends they are the master for. There is -# no direct connection between the other two master servers. All of the -# masters have the syncprov overlay configured on the glue database. +# The central provider replicates to the two other providers, and receives +# updates from them of the backends they are the provider for. There is +# no direct connection between the other two provider servers. All of the +# providers have the syncprov overlay configured on the glue database. -# The search servers replicates from the master server at their site. +# The search servers replicates from the provider server at their site. # They all have a single database with the glue suffix, but their # database configuration doesn't matter much in this test. (This # database layout was originally created before gluing was introduced @@ -56,14 +56,14 @@ # The primary objective for gluing the backend databases is not to make # them look like one huge database but to create a common search suffix # for the clients. Searching is mostly done on the search servers, only -# updates are done on the masters. +# updates are done on the providers. # It varies which backends that are replicated to which server (hence # the name asymmetric in this test). Access control rules on the -# masters are used to control what their consumers receives. The table +# providers are used to control what their consumers receives. The table # below gives an overview of which backend (the columns) that are -# replicated to which server (the rows). A "M" defines the master for -# the backend, a "S" is a slave, and "-" means it is not replicated +# replicated to which server (the rows). A "M" defines the provider for +# the backend, a "S" is a replica, and "-" means it is not replicated # there. Oh, the table probably looks wrong without the 4-position # tab-stops OpenLDAP uses... @@ -75,26 +75,26 @@ # ss1 S S - S S - - # ss2 S S S - - S S -# On the central master syncrepl is configured on the subordinate +# On the central provider syncrepl is configured on the subordinate # databases, as it varies which backends that exists on its providers. # Had it been used on the glue database then syncrepl would have removed # the backends replicated from site1 but not present on site2 when it # synchronizes with site2 (and vice versa). # # All the other servers uses syncrepl on the glue database, since -# replicating more than one subordinate database from the same master +# replicating more than one subordinate database from the same provider # creates (as of the writing of this test script) race conditions that # causes the replication to fail, as the race tests at the end shows. # The databases controlled by syncrepl all have $UPDATEDN as their -# RootDN, while the master servers has other RootDN values for the +# RootDN, while the provider servers has other RootDN values for the # backends they are the backend for them self. This violates the current # guidelines for gluing databases, which states that the same rootdn # should be used on all of them. Unfortunately, this cannot be done on -# site masters 1 and 2. The backends they manage locally are either not -# present on the central master, or when so they are not replicated back +# site providers 1 and 2. The backends they manage locally are either not +# present on the central provider, or when so they are not replicated back # to their source, which causes syncrepl to try to remove the content of -# these backends when it synchronizes with the central master. The +# these backends when it synchronizes with the central provider. The # differing rootdn values used on the backends controlled by syncrepl # and those managed locally prevents it from succeeding in this. As # noted above, moving syncrepl to the subordinate databases is currently @@ -161,7 +161,7 @@ else RETRY="1 10" fi -echo "Initializing master configurations..." +echo "Initializing provider configurations..." for dir in $SMC_DIR $SM1_DIR $SM2_DIR; do $SLAPADD -F $dir/slapd.d -n 0 < $LOG1 2>&1 & SMC_PID=$! @@ -204,7 +204,7 @@ fi KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD sleep 1 -echo "Using ldapsearch to check that central master slapd is running..." +echo "Using ldapsearch to check that central provider slapd is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI1 \ 'objectclass=*' > /dev/null 2>&1 @@ -219,7 +219,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting site1 master slapd on TCP/IP port $PORT2..." +echo "Starting site1 provider slapd on TCP/IP port $PORT2..." cd $SM1_DIR $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & SM1_PID=$! @@ -230,7 +230,7 @@ fi KILLPIDS="$KILLPIDS $SM1_PID" cd $TESTWD sleep 1 -echo "Using ldapsearch to check that site1 master is running..." +echo "Using ldapsearch to check that site1 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -245,7 +245,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting site2 master slapd on TCP/IP port $PORT3..." +echo "Starting site2 provider slapd on TCP/IP port $PORT3..." cd $SM2_DIR $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 & SM2_PID=$! @@ -256,7 +256,7 @@ fi KILLPIDS="$KILLPIDS $SM2_PID" cd $TESTWD sleep 1 -echo "Using ldapsearch to check that site2 master is running..." +echo "Using ldapsearch to check that site2 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI3 \ 'objectclass=*' > /dev/null 2>&1 @@ -389,7 +389,7 @@ EOF fi done -echo "Adding database config on central master..." +echo "Adding database config on central provider..." if [ "$SYNCPROV" = syncprovmod ]; then $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: cn=module,cn=config @@ -478,12 +478,12 @@ olcRootDN: $UPDATEDN EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed for central master database config ($RC)!" + echo "ldapadd failed for central provider database config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding database config on site1 master..." +echo "Adding database config on site1 provider..." if [ "$SYNCPROV" = syncprovmod ]; then $LDAPADD -D cn=config -H $URI2 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: cn=module,cn=config @@ -551,12 +551,12 @@ EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed for site1 master database config ($RC)!" + echo "ldapadd failed for site1 provider database config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding database config on site2 master..." +echo "Adding database config on site2 provider..." if [ "$SYNCPROV" = syncprovmod ]; then $LDAPADD -D cn=config -H $URI3 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: cn=module,cn=config @@ -634,12 +634,12 @@ EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed for site2 master database config ($RC)!" + echo "ldapadd failed for site2 provider database config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding access rules on central master..." +echo "Adding access rules on central provider..." $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={-1}frontend,cn=config changetype: modify @@ -673,12 +673,12 @@ olcAccess: to * by * read EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed for central master access config ($RC)!" + echo "ldapmodify failed for central provider access config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding access rules on site1 master..." +echo "Adding access rules on site1 provider..." $LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={-1}frontend,cn=config changetype: modify @@ -690,12 +690,12 @@ olcAccess: to * by * read EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed for site1 master access config ($RC)!" + echo "ldapmodify failed for site1 provider access config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding access rules on site2 master..." +echo "Adding access rules on site2 provider..." $LDAPMODIFY -D cn=config -H $URI3 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={-1}frontend,cn=config changetype: modify @@ -718,7 +718,7 @@ olcAccess: to * by * read EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed for site2 master access config ($RC)!" + echo "ldapmodify failed for site2 provider access config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -777,7 +777,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Populating central master..." +echo "Populating central provider..." $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD <> $TESTOUT 2>&1 dn: dc=example,dc=com objectClass: top @@ -802,12 +802,12 @@ userPassword: $PASSWD EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed to populate central master entry ($RC)!" + echo "ldapadd failed to populate central provider entry ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding syncrepl on site1 master..." +echo "Adding syncrepl on site1 provider..." $LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={4}$BACKEND,cn=config changetype: modify @@ -819,12 +819,12 @@ olcSyncRepl: rid=1 provider=$URI1 searchbase="$BASEDN" EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed to add syncrepl on site1 master ($RC)!" + echo "ldapmodify failed to add syncrepl on site1 provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi -echo "Adding syncrepl on site2 master..." +echo "Adding syncrepl on site2 provider..." $LDAPMODIFY -D cn=config -H $URI3 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={5}$BACKEND,cn=config changetype: modify @@ -836,13 +836,13 @@ olcSyncRepl: rid=1 provider=$URI1 searchbase="$BASEDN" EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed to add syncrepl on site2 master ($RC)!" + echo "ldapmodify failed to add syncrepl on site2 provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi sleep 1 -echo "Using ldapsearch to check that site1 master received changes..." +echo "Using ldapsearch to check that site1 provider received changes..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI2 \ @@ -861,7 +861,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check that site2 master received changes..." +echo "Using ldapsearch to check that site2 provider received changes..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI3 \ @@ -882,7 +882,7 @@ fi sleep 1 -echo "Populating site1 master..." +echo "Populating site1 provider..." $LDAPADD -D "ou=sm1ou1,$BASEDN" -H $URI2 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm1ou1,dc=example,dc=com objectClass: top @@ -897,14 +897,14 @@ ou: sm1ou2 EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed to populate site1 master ($RC)!" + echo "ldapadd failed to populate site1 provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi sleep 1 -echo "Populating site2 master..." +echo "Populating site2 provider..." $LDAPADD -D "ou=sm2ou1,$BASEDN" -H $URI3 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm2ou1,dc=example,dc=com objectClass: top @@ -919,7 +919,7 @@ ou: sm2ou2 EOF RC=$? if test $RC != 0 ; then - echo "ldapadd failed to populate site2 master ($RC)!" + echo "ldapadd failed to populate site2 provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -927,18 +927,18 @@ fi ERRORS=0 # TEST: -# Stop site1 master when adding syncrepl to the central master. When -# site1 master is started again both it and the central master will have -# the same number of contextCSN values, but the ones on central master -# will be the newest. The central master will not update its contextCSN +# Stop site1 provider when adding syncrepl to the central provider. When +# site1 provider is started again both it and the central provider will have +# the same number of contextCSN values, but the ones on central provider +# will be the newest. The central provider will not update its contextCSN # values unless the bug in ITS#5597 have been fixed. -echo "Stopping site1 master..." +echo "Stopping site1 provider..." kill -HUP "$SM1_PID" wait "$SM1_PID" KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SM1_PID / /"`; SM1_PID= -echo "Adding syncrepl on central master..." +echo "Adding syncrepl on central provider..." $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={3}$BACKEND,cn=config changetype: modify @@ -957,12 +957,12 @@ olcSyncRepl: rid=5 provider=$URI3 searchbase="ou=sm2ou1,$BASEDN" EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed to add syncrepl on central master ($RC)!" + echo "ldapmodify failed to add syncrepl on central provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi sleep 1 -echo "Using ldapsearch to check that central master received site2 entries..." +echo "Using ldapsearch to check that central provider received site2 entries..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ @@ -981,15 +981,15 @@ if test $RC != 0 ; then exit $RC fi -# Test for ITS#6716, modify on central master to ensure that the CSN -# order is "sid2 < sid3 < sid1". When site1 master starts it is likely -# to sync with central master before it syncs with site1 master. When -# central master syncs with site1 master they will share the sid1 and -# sid3 CSNs, the additional sid2 CSN hold by site1 master will be the -# oldest. Central master will not receive the changes made on site1 -# master unless it completely ignores the CSNs presented by central -# master. -echo "Using ldapmodify to modify central master..." +# Test for ITS#6716, modify on central provider to ensure that the CSN +# order is "sid2 < sid3 < sid1". When site1 provider starts it is likely +# to sync with central provider before it syncs with site1 provider. When +# central provider syncs with site1 provider they will share the sid1 and +# sid3 CSNs, the additional sid2 CSN hold by site1 provider will be the +# oldest. Central provider will not receive the changes made on site1 +# provider unless it completely ignores the CSNs presented by central +# provider. +echo "Using ldapmodify to modify central provider..." $LDAPMODIFY -D "$MANAGERDN" -H $URI1 -w $PASSWD <> $TESTOUT 2>&1 dn: dc=example,dc=com changetype: modify @@ -1005,7 +1005,7 @@ if test $RC != 0 ; then fi if test -z "$SM1_PID" ; then - echo "Restarting site1 master slapd on TCP/IP port $PORT2..." + echo "Restarting site1 provider slapd on TCP/IP port $PORT2..." cd $SM1_DIR $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & SM1_PID=$! @@ -1018,7 +1018,7 @@ if test -z "$SM1_PID" ; then sleep 1 fi sleep 1 -echo "Using ldapsearch to check that site1 master is running..." +echo "Using ldapsearch to check that site1 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -1033,7 +1033,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check that central master received site1 entries..." +echo "Using ldapsearch to check that central provider received site1 entries..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ @@ -1052,7 +1052,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check that site1 master received central master update..." +echo "Using ldapsearch to check that site1 provider received central provider update..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI2 \ @@ -1071,7 +1071,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check that site2 master received central master update..." +echo "Using ldapsearch to check that site2 provider received central provider update..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI3 \ @@ -1216,62 +1216,62 @@ CSN5=`$LDAPSEARCH -H $URI5 -b $BASEDN -s base contextCSN | grep contextCSN | sor CSN6=`$LDAPSEARCH -H $URI6 -b $BASEDN -s base contextCSN | grep contextCSN | sort` if test -z "$CSN1" ; then - echo "ERROR: contextCSN empty on central master" + echo "ERROR: contextCSN empty on central provider" CSN_ERRORS=`expr $CSN_ERRORS + 1` fi nCSN=`echo "$CSN1" | wc -l` if test "$nCSN" -ne 3 ; then - echo "ERROR: Wrong contextCSN count on central master, should be 3" + echo "ERROR: Wrong contextCSN count on central provider, should be 3" CSN_ERRORS=`expr $CSN_ERRORS + 1` if test -n "$CSN_VERBOSE"; then echo "$CSN1" fi fi if test -z "$CSN2" -o "$CSN1" != "$CSN2" ; then - echo "ERROR: contextCSN mismatch between central master and site1 master" + echo "ERROR: contextCSN mismatch between central provider and site1 provider" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" - echo "contextCSN on site1 master:" + echo "contextCSN on site1 provider:" echo "$CSN2" fi fi if test -z "$CSN3" -o "$CSN1" != "$CSN3" ; then - echo "ERROR: contextCSN mismatch between central master and site2 master" + echo "ERROR: contextCSN mismatch between central provider and site2 provider" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" - echo "contextCSN on site2 master:" + echo "contextCSN on site2 provider:" echo "$CSN3" fi fi if test -z "$CSN4" -o "$CSN1" != "$CSN4" ; then - echo "ERROR: contextCSN mismatch between central master and central search" + echo "ERROR: contextCSN mismatch between central provider and central search" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" echo "contextCSN on central search:" echo "$CSN4" fi fi if test -z "$CSN5" -o "$CSN2" != "$CSN5" ; then - echo "ERROR: contextCSN mismatch between site1 master and site1 search" + echo "ERROR: contextCSN mismatch between site1 provider and site1 search" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on site1 master:" + echo "contextCSN on site1 provider:" echo "$CSN2" echo "contextCSN on site1 search:" echo "$CSN5" fi fi if test -z "$CSN6" -o "$CSN3" != "$CSN6" ; then - echo "ERROR: contextCSN mismatch between site2 master and site2 search:" + echo "ERROR: contextCSN mismatch between site2 provider and site2 search:" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on site2 master:" + echo "contextCSN on site2 provider:" echo "$CSN3" echo "contextCSN on site2 search:" echo "$CSN6" @@ -1284,7 +1284,7 @@ if test $CSN_ERRORS != 0 ; then for pid in $KILLPIDS ; do wait $pid ; done KILLPIDS= - echo "Restarting site1 master slapd on TCP/IP port $PORT2..." + echo "Restarting site1 provider slapd on TCP/IP port $PORT2..." cd $SM1_DIR $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & SM1_PID=$! @@ -1295,7 +1295,7 @@ if test $CSN_ERRORS != 0 ; then KILLPIDS="$KILLPIDS $SM1_PID" cd $TESTWD sleep 1 - echo "Using ldapsearch to check that site1 master is running..." + echo "Using ldapsearch to check that site1 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -1310,7 +1310,7 @@ if test $CSN_ERRORS != 0 ; then exit $RC fi - echo "Restarting site2 master slapd on TCP/IP port $PORT3..." + echo "Restarting site2 provider slapd on TCP/IP port $PORT3..." cd $SM2_DIR $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 & SM2_PID=$! @@ -1321,7 +1321,7 @@ if test $CSN_ERRORS != 0 ; then KILLPIDS="$KILLPIDS $SM2_PID " cd $TESTWD sleep 1 - echo "Using ldapsearch to check that site2 master is running..." + echo "Using ldapsearch to check that site2 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI3 \ 'objectclass=*' > /dev/null 2>&1 @@ -1336,7 +1336,7 @@ if test $CSN_ERRORS != 0 ; then exit $RC fi - echo "Restarting central master slapd on TCP/IP port $PORT1..." + echo "Restarting central provider slapd on TCP/IP port $PORT1..." cd $SMC_DIR $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & SMC_PID=$! @@ -1347,7 +1347,7 @@ if test $CSN_ERRORS != 0 ; then KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD sleep 1 - echo "Using ldapsearch to check that central master slapd is running..." + echo "Using ldapsearch to check that central provider slapd is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI1 \ 'objectclass=*' > /dev/null 2>&1 @@ -1365,12 +1365,12 @@ if test $CSN_ERRORS != 0 ; then echo "Sleeping 5 seconds to allow contextCSN to synchronize..." sleep 5 - echo "Stopping site1 and site2 master..." + echo "Stopping site1 and site2 provider..." kill -HUP $SM1_PID $SM2_PID for pid in $SM1_PID $SM2_PID ; do wait $pid ; done KILLPIDS=" $SMC_PID" - echo "Restarting site1 master slapd on TCP/IP port $PORT2..." + echo "Restarting site1 provider slapd on TCP/IP port $PORT2..." cd $SM1_DIR $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 & SM1_PID=$! @@ -1381,7 +1381,7 @@ if test $CSN_ERRORS != 0 ; then KILLPIDS="$KILLPIDS $SM1_PID" cd $TESTWD sleep 1 - echo "Using ldapsearch to check that site1 master is running..." + echo "Using ldapsearch to check that site1 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI2 \ 'objectclass=*' > /dev/null 2>&1 @@ -1396,7 +1396,7 @@ if test $CSN_ERRORS != 0 ; then exit $RC fi - echo "Restarting site2 master slapd on TCP/IP port $PORT3..." + echo "Restarting site2 provider slapd on TCP/IP port $PORT3..." cd $SM2_DIR $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 & SM2_PID=$! @@ -1407,7 +1407,7 @@ if test $CSN_ERRORS != 0 ; then KILLPIDS="$KILLPIDS $SM2_PID" cd $TESTWD sleep 1 - echo "Using ldapsearch to check that site2 master is running..." + echo "Using ldapsearch to check that site2 provider is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI3 \ 'objectclass=*' > /dev/null 2>&1 @@ -1514,55 +1514,55 @@ if test $CSN_ERRORS != 0 ; then CSN5=`$LDAPSEARCH -H $URI5 -b $BASEDN -s base contextCSN | grep contextCSN | sort` CSN6=`$LDAPSEARCH -H $URI6 -b $BASEDN -s base contextCSN | grep contextCSN | sort` if test -z "$CSN1" ; then - echo "ERROR: contextCSN empty on central master" + echo "ERROR: contextCSN empty on central provider" CSN_ERRORS=`expr $CSN_ERRORS + 1` fi if test -z "$CSN2" -o "$CSN1" != "$CSN2" ; then - echo "ERROR: contextCSN mismatch between central master and site1 master" + echo "ERROR: contextCSN mismatch between central provider and site1 provider" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" - echo "contextCSN on site1 master:" + echo "contextCSN on site1 provider:" echo "$CSN2" fi fi if test -z "$CSN3" -o "$CSN1" != "$CSN3" ; then - echo "ERROR: contextCSN mismatch between central master and site2 master" + echo "ERROR: contextCSN mismatch between central provider and site2 provider" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" - echo "contextCSN on site2 master:" + echo "contextCSN on site2 provider:" echo "$CSN3" fi fi if test -z "$CSN4" -o "$CSN1" != "$CSN4" ; then - echo "ERROR: contextCSN mismatch between central master and central search" + echo "ERROR: contextCSN mismatch between central provider and central search" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on central master:" + echo "contextCSN on central provider:" echo "$CSN1" echo "contextCSN on central search:" echo "$CSN4" fi fi if test -z "$CSN5" -o "$CSN2" != "$CSN5" ; then - echo "ERROR: contextCSN mismatch between site1 master and site1 search" + echo "ERROR: contextCSN mismatch between site1 provider and site1 search" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on site1 master:" + echo "contextCSN on site1 provider:" echo "$CSN2" echo "contextCSN on site1 search:" echo "$CSN5" fi fi if test -z "$CSN6" -o "$CSN3" != "$CSN6" ; then - echo "ERROR: contextCSN mismatch between site2 master and site2 search:" + echo "ERROR: contextCSN mismatch between site2 provider and site2 search:" CSN_ERRORS=`expr $CSN_ERRORS + 1`; if test -n "$CSN_VERBOSE"; then - echo "contextCSN on site2 master:" + echo "contextCSN on site2 provider:" echo "$CSN3" echo "contextCSN on site2 search:" echo "$CSN6" @@ -1583,10 +1583,10 @@ echo "Checking contextCSN after initial replication..." . $TESTDIR/checkcsn.sh # TEST: -# Test that updates to the first backend on central master, which should +# Test that updates to the first backend on central provider, which should # be replicated to all servers actually is so, and that the contextCSN is # updated everywhere: -echo "Using ldapmodify to modify first backend on central master..." +echo "Using ldapmodify to modify first backend on central provider..." $LDAPMODIFY -D "$MANAGERDN" -H $URI1 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=ou1,dc=example,dc=com changetype: modify @@ -1659,15 +1659,15 @@ if test $RC != 0 ; then exit $RC fi -echo "Checking contextCSN after modify of first backend on central master..." +echo "Checking contextCSN after modify of first backend on central provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test that updates to the second backend on central master is only +# Test that updates to the second backend on central provider is only # replicated to those search servers that should receive that backend. # The contextCSN should still be updated everywhere: MNUM=`expr $MNUM + 1` -echo "Using ldapmodify to modify second backend on central master..." +echo "Using ldapmodify to modify second backend on central provider..." $LDAPMODIFY -D "$MANAGERDN" -H $URI1 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=ou2,dc=example,dc=com changetype: modify @@ -1702,7 +1702,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check no replication to site1 master..." +echo "Using ldapsearch to check no replication to site1 provider..." for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI2 \ -s base -b "ou=ou2,$BASEDN" \ @@ -1728,15 +1728,15 @@ for i in 1 2 3 4 5; do sleep 1 done -echo "Checking contextCSN after modify of second backend on central master..." +echo "Checking contextCSN after modify of second backend on central provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test that updates to the first backend on site1 master, which should be +# Test that updates to the first backend on site1 provider, which should be # replicated everywhere except to central and site2 search. The contextCSN # should be updated on all servers: MNUM=`expr $MNUM + 1` -echo "Using ldapmodify to modify first backend on site1 master..." +echo "Using ldapmodify to modify first backend on site1 provider..." $LDAPMODIFY -D "ou=sm1ou1,$BASEDN" -H $URI2 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm1ou1,dc=example,dc=com changetype: modify @@ -1771,7 +1771,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check replication to site2 master..." +echo "Using ldapsearch to check replication to site2 provider..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI3 \ @@ -1816,15 +1816,15 @@ for i in 1 2 3 4 5; do sleep 1 done -echo "Checking contextCSN after modify of first backend on site1 master..." +echo "Checking contextCSN after modify of first backend on site1 provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test updates to the second backend on site1 master, which should only be +# Test updates to the second backend on site1 provider, which should only be # replicated to site1 search. The contextCSN should be updated everywhere. MNUM=`expr $MNUM + 1` -echo "Using ldapmodify to modify second backend on site1 master..." +echo "Using ldapmodify to modify second backend on site1 provider..." $LDAPMODIFY -D "ou=sm1ou1,$BASEDN" -H $URI2 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm1ou2,dc=example,dc=com changetype: modify @@ -1860,7 +1860,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check no replication to central master..." +echo "Using ldapsearch to check no replication to central provider..." for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ -s base -b "ou=sm1ou2,$BASEDN" \ @@ -1873,16 +1873,16 @@ for i in 1 2 3 4 5; do sleep 1 done -echo "Checking contextCSN after modify of second backend on site1 master..." +echo "Checking contextCSN after modify of second backend on site1 provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test updates to first backend on site2 master, which should be +# Test updates to first backend on site2 provider, which should be # replicated to the central servers, but not site1. The contextCSN # should be updated everywhere: MNUM=`expr $MNUM + 1` -echo "Using ldapmodify to modify first backend on site2 master..." +echo "Using ldapmodify to modify first backend on site2 provider..." $LDAPMODIFY -D "ou=sm2ou1,$BASEDN" -H $URI3 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm2ou1,dc=example,dc=com changetype: modify @@ -1898,7 +1898,7 @@ if test $RC != 0 ; then fi sleep 1 -echo "Using ldapsearch to check replication to central master..." +echo "Using ldapsearch to check replication to central provider..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ @@ -1936,7 +1936,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check no replication to site1 master..." +echo "Using ldapsearch to check no replication to site1 provider..." for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI2 \ -s base -b "ou=sm2ou1,$BASEDN" \ @@ -1962,16 +1962,16 @@ for i in 1 2 3 4 5; do sleep 1 done -echo "Checking contextCSN after modify of first backend on site2 master..." +echo "Checking contextCSN after modify of first backend on site2 provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test updates to the second backend on site2 master, which should only be +# Test updates to the second backend on site2 provider, which should only be # replicated to site2 search. As always, contextCSN should be updated # everywhere: MNUM=`expr $MNUM + 1` -echo "Using ldapmodify to modify second backend on site2 master..." +echo "Using ldapmodify to modify second backend on site2 provider..." $LDAPMODIFY -D "ou=sm2ou1,$BASEDN" -H $URI3 -w $PASSWD <> $TESTOUT 2>&1 dn: ou=sm2ou2,dc=example,dc=com changetype: modify @@ -2006,7 +2006,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check no replication to central master..." +echo "Using ldapsearch to check no replication to central provider..." for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI4 \ -s base -b "ou=sm2ou2,$BASEDN" \ @@ -2019,15 +2019,15 @@ for i in 1 2 3 4 5; do sleep 1 done -echo "Checking contextCSN after modify of second backend on site2 master..." +echo "Checking contextCSN after modify of second backend on site2 provider..." . $TESTDIR/checkcsn.sh # TEST: -# Test that all contextCSN values are updated on the slaves when they -# starts with an empty database. Start site2 master first, then site2 -# search and finally central master so that the site2 search's syncrepl -# connection has been set up when site2 master receives the database: -echo "Stopping central master and site2 servers to test start with empty db..." +# Test that all contextCSN values are updated on the replicas when they +# starts with an empty database. Start site2 provider first, then site2 +# search and finally central provider so that the site2 search's syncrepl +# connection has been set up when site2 provider receives the database: +echo "Stopping central provider and site2 servers to test start with empty db..." kill -HUP $SMC_PID $SM2_PID $SS2_PID for pid in $SMC_PID $SM2_PID $SS2_PID; do wait $pid ; done KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`; @@ -2039,7 +2039,7 @@ SS2_PID= rm -rf $SM2_DIR/db/* rm -rf $SS2_DIR/db/* -echo "Starting site2 master slapd on TCP/IP port $PORT3..." +echo "Starting site2 provider slapd on TCP/IP port $PORT3..." cd $SM2_DIR $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 & SM2_PID=$! @@ -2050,7 +2050,7 @@ fi KILLPIDS="$KILLPIDS $SM2_PID" cd $TESTWD sleep 1 -echo "Using ldapsearch to check that site2 master slapd is running..." +echo "Using ldapsearch to check that site2 provider slapd is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI3 \ 'objectclass=*' > /dev/null 2>&1 @@ -2091,7 +2091,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Starting central master slapd on TCP/IP port $PORT1..." +echo "Starting central provider slapd on TCP/IP port $PORT1..." cd $SMC_DIR $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & SMC_PID=$! @@ -2102,7 +2102,7 @@ fi KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD sleep 1 -echo "Using ldapsearch to check that central master slapd is running..." +echo "Using ldapsearch to check that central provider slapd is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI1 \ 'objectclass=*' > /dev/null 2>&1 @@ -2117,7 +2117,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapsearch to check that site2 master received base..." +echo "Using ldapsearch to check that site2 provider received base..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI3 \ @@ -2167,11 +2167,11 @@ if test $ERRORS -ne 0; then fi # TEST: -# Adding syncrepl of the second site1 master backend on central master +# Adding syncrepl of the second site1 provider backend on central provider # will not initialize the database unless the contextCSN attribute is # stored in the suffix of the database and not the suffix of the glue # database: -echo "Adding syncrepl of second site1 master backend on central master..." +echo "Adding syncrepl of second site1 provider backend on central provider..." $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: olcDatabase={4}$BACKEND,cn=config changetype: modify @@ -2182,13 +2182,13 @@ olcSyncRepl: rid=4 provider=$URI2 searchbase="ou=sm1ou2,$BASEDN" EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed to add syncrepl on central master ($RC)!" + echo "ldapmodify failed to add syncrepl on central provider ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi sleep 1 -echo "Using ldapsearch to check that central master received second site1 backend..." +echo "Using ldapsearch to check that central provider received second site1 backend..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ @@ -2202,10 +2202,10 @@ for i in 1 2 3 4 5; do sleep $i done if test $RC != 0 ; then - echo "ERROR: Second site1 backend not replicated to central master" + echo "ERROR: Second site1 backend not replicated to central provider" ERRORS=`expr $ERRORS + 1` - echo "Restarting central master slapd on TCP/IP port $PORT1..." + echo "Restarting central provider slapd on TCP/IP port $PORT1..." kill -HUP $SMC_PID wait $SMC_PID KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`; @@ -2219,7 +2219,7 @@ if test $RC != 0 ; then fi KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD - echo "Using ldapsearch to check that central master slapd is running..." + echo "Using ldapsearch to check that central provider slapd is running..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "" -H $URI1 \ 'objectclass=*' > /dev/null 2>&1 @@ -2234,7 +2234,7 @@ if test $RC != 0 ; then exit $RC fi - echo "Using ldapsearch to check that central master received second site1 backend..." + echo "Using ldapsearch to check that central provider received second site1 backend..." RC=32 for i in 1 2 3 4 5; do RESULT=`$LDAPSEARCH -H $URI1 \ @@ -2341,13 +2341,13 @@ while test $RACE_ERROR -eq 0 -a $RACE_NUM -lt $RACE_TESTS ; do RACE_NUM=`expr $RACE_NUM + 1` echo "Running $RACE_NUM of $RACE_TESTS syncrepl race tests..." - echo "Stopping central master..." + echo "Stopping central provider..." kill -HUP $SMC_PID wait $SMC_PID KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`; MNUM=`expr $MNUM + 1` - echo "Using ldapadd to add entry on site1 master..." + echo "Using ldapadd to add entry on site1 provider..." $LDAPADD -D "ou=sm1ou1,$BASEDN" -H $URI2 -w $PASSWD <> $TESTOUT 2>&1 dn: $SUB_DN objectClass: top @@ -2362,13 +2362,13 @@ EOF exit $RC fi - echo "Starting central master again..." + echo "Starting central provider again..." cd $SMC_DIR $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & SMC_PID=$! KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD - echo "Using ldapsearch to check that central master received entry..." + echo "Using ldapsearch to check that central provider received entry..." for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "$SUB_DN" -H $URI1 > /dev/null 2>&1 RC=$? @@ -2376,7 +2376,7 @@ EOF sleep $i done if test $RC != 0 ; then - echo "ERROR: entry not replicated to central master!" + echo "ERROR: entry not replicated to central provider!" RACE_ERROR=1 break fi @@ -2389,17 +2389,17 @@ EOF sleep $i done if test $RC != 0 ; then - echo "ERROR: entry not replicated to central master!" + echo "ERROR: entry not replicated to central provider!" RACE_ERROR=1 break fi - echo "Stopping central master..." + echo "Stopping central provider..." kill -HUP $SMC_PID wait $SMC_PID KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`; - echo "Using ldapdelete to delete entry on site1 master..." + echo "Using ldapdelete to delete entry on site1 provider..." $LDAPDELETE -D "ou=sm1ou1,$BASEDN" -H $URI2 -w $PASSWD "$SUB_DN" RC=$? if test $RC != 0 ; then @@ -2408,14 +2408,14 @@ EOF exit $RC fi - echo "Starting central master again..." + echo "Starting central provider again..." cd $SMC_DIR $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 & SMC_PID=$! KILLPIDS="$KILLPIDS $SMC_PID" cd $TESTWD - echo "Using ldapsearch to check that entry was deleted on central master..." + echo "Using ldapsearch to check that entry was deleted on central provider..." RC=0 for i in 1 2 3 4 5; do $LDAPSEARCH -s base -b "$SUB_DN" -H $URI1 > /dev/null 2>&1 @@ -2430,7 +2430,7 @@ EOF test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi - echo "ERROR: Entry not removed on central master!" + echo "ERROR: Entry not removed on central provider!" RACE_ERROR=1 break fi diff --git a/tests/scripts/test059-slave-config b/tests/scripts/test059-consumer-config similarity index 90% rename from tests/scripts/test059-slave-config rename to tests/scripts/test059-consumer-config index 2c0f168ece..f2d1255f24 100755 --- a/tests/scripts/test059-slave-config +++ b/tests/scripts/test059-consumer-config @@ -45,7 +45,7 @@ case "$SYNCMODE" in esac # -# Test replication of dynamic config with alternate slave config: +# Test replication of dynamic config with alternate consumer config: # - start provider # - start consumer # - configure over ldap @@ -116,13 +116,13 @@ if test $RC != 0 ; then exit $RC fi -# Slaves will not replicate the master's actual cn=config. +# Consumers will not replicate the provider's actual cn=config. # Instead, they will use an alternate DB so that they may be -# configured differently from the master. This alternate DB +# configured differently from the provider. This alternate DB # will also be a consumer for the real cn=schema,cn=config tree. # It has MirrorMode enabled so that it can be written directly -# while being a slave of the main schema. -echo "Configuring slave config DB on provider..." +# while being a consumer of the main schema. +echo "Configuring consumer config DB on provider..." $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <> $TESTOUT 2>&1 dn: cn=config changetype: modify @@ -135,8 +135,8 @@ objectClass: olcDatabaseConfig objectClass: olcLdifConfig olcDatabase: {1}ldif olcDbDirectory: $DBDIR1A -olcSuffix: cn=config,cn=slave -olcRootDN: cn=config,cn=slave +olcSuffix: cn=config,cn=consumer +olcRootDN: cn=config,cn=consumer olcRootPW: repsecret olcAccess: to * by dn.base="cn=config" write @@ -146,23 +146,23 @@ objectClass: olcOverlayConfig objectClass: olcSyncProvConfig olcOverlay: syncprov -dn: cn=config,cn=slave +dn: cn=config,cn=consumer changetype: add objectClass: olcGlobal -cn: slaveconfig +cn: consumerconfig -dn: cn=schema,cn=config,cn=slave +dn: cn=schema,cn=config,cn=consumer changetype: add objectClass: olcSchemaConfig cn: schema -dn: olcDatabase={0}config,cn=config,cn=slave +dn: olcDatabase={0}config,cn=config,cn=consumer changetype: add objectClass: olcDatabaseConfig olcDatabase: {0}config olcRootPW: topsecret -olcSyncrepl: {0}rid=001 provider=$URI1 binddn="cn=config,cn=slave" - bindmethod=simple credentials=repsecret searchbase="cn=config,cn=slave" +olcSyncrepl: {0}rid=001 provider=$URI1 binddn="cn=config,cn=consumer" + bindmethod=simple credentials=repsecret searchbase="cn=config,cn=consumer" $SYNCTYPE retry="3 5 300 5" timeout=3 suffixmassage="cn=config" olcUpdateRef: $URI1 @@ -172,7 +172,7 @@ add: olcSyncrepl olcSyncrepl: {0}rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple credentials=$CONFIGPW searchbase="cn=schema,cn=config" $SYNCTYPE retry="3 5 300 5" timeout=3 - suffixmassage="cn=schema,cn=config,cn=slave" + suffixmassage="cn=schema,cn=config,cn=consumer" - add: olcMirrorMode olcMirrorMode: TRUE @@ -180,7 +180,7 @@ olcMirrorMode: TRUE EOF RC=$? if test $RC != 0 ; then - echo "ldapmodify failed for slave DB config ($RC)!" + echo "ldapmodify failed for consumer DB config ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -188,12 +188,12 @@ fi echo "Starting consumer slapd on TCP/IP port $PORT2..." $SLAPADD -F $CFCON -n 0 -l $CONFLDIF $SLAPD -F $CFCON -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -220,8 +220,8 @@ $LDAPMODIFY -D cn=config -H $URI2 -y $CONFIGPWF <>$TESTOUT 2>&1 dn: olcDatabase={0}config,cn=config changetype: modify add: olcSyncRepl -olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config,cn=slave" - bindmethod=simple credentials=repsecret searchbase="cn=config,cn=slave" +olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config,cn=consumer" + bindmethod=simple credentials=repsecret searchbase="cn=config,cn=consumer" $SYNCTYPE retry="3 5 300 5" timeout=3 suffixmassage="cn=config" - @@ -296,7 +296,7 @@ cn: module olcModulePath: ../servers/slapd/back-$BACKEND olcModuleLoad: back_$BACKEND.la -dn: cn=module,cn=config,cn=slave +dn: cn=module,cn=config,cn=consumer objectClass: olcModuleList cn: module olcModulePath: ../servers/slapd/back-$BACKEND @@ -330,7 +330,7 @@ objectClass: olcOverlayConfig objectClass: olcSyncProvConfig olcOverlay: syncprov -dn: olcDatabase={1}$BACKEND,cn=config,cn=slave +dn: olcDatabase={1}$BACKEND,cn=config,cn=consumer objectClass: olcDatabaseConfig ${nullExclude}objectClass: olc${BACKEND}Config olcDatabase: {1}$BACKEND @@ -402,7 +402,7 @@ fi echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI1 -w $PASSWD \ - 'objectclass=*' > $MASTEROUT 2>&1 + 'objectclass=*' > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -413,7 +413,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI2 -w $PASSWD \ - 'objectclass=*' > $SLAVEOUT 2>&1 + 'objectclass=*' > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -425,12 +425,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER < $MASTEROUT > $MASTERFLT +$LDIFFILTER < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test063-delta-multimaster b/tests/scripts/test063-delta-multiprovider similarity index 95% rename from tests/scripts/test063-delta-multimaster rename to tests/scripts/test063-delta-multiprovider index c8e1d2c01a..b7f80c0eb1 100755 --- a/tests/scripts/test063-delta-multimaster +++ b/tests/scripts/test063-delta-multiprovider @@ -25,7 +25,7 @@ if test $ACCESSLOG = accesslogno; then exit 0 fi -MMR=2 +MPR=2 XDIR=$TESTDIR/srv TMP=$TESTDIR/tmp @@ -51,7 +51,7 @@ case "$SYNCMODE" in esac # -# Test delta-sync mmr +# Test delta-sync mpr # - start servers # - configure over ldap # - populate over ldap @@ -69,7 +69,7 @@ KILLPIDS= echo "Initializing server configurations..." n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do DBDIR=${XDIR}$n/db CFDIR=${XDIR}$n/slapd.d @@ -247,7 +247,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -266,9 +266,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -292,7 +292,7 @@ THEDN="cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com" sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$THEDN" -H $URI1 \ - -s base '(objectClass=*)' entryCSN > "${MASTEROUT}.$i" 2>&1 + -s base '(objectClass=*)' entryCSN > "${PROVIDEROUT}.$i" 2>&1 RC=$? if test $RC = 0 ; then @@ -300,7 +300,7 @@ for i in 1 2 3; do fi if test $RC != 32 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at consumer ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -310,7 +310,7 @@ for i in 1 2 3; do done n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -329,9 +329,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -343,7 +343,7 @@ done echo "Breaking replication between server 1 and 2..." n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do o=`expr 3 - $n` MYURI=`eval echo '$URI'$n` PROVIDERURI=`eval echo '$URI'$o` @@ -492,7 +492,7 @@ fi echo "Restoring replication between server 1 and 2..." n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do o=`expr 3 - $n` MYURI=`eval echo '$URI'$n` PROVIDERURI=`eval echo '$URI'$o` @@ -523,7 +523,7 @@ echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 n=1 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do PORT=`expr $BASEPORT + $n` URI="ldap://${LOCALHOST}:$PORT/" @@ -542,9 +542,9 @@ n=`expr $n + 1` done n=2 -while [ $n -le $MMR ]; do +while [ $n -le $MPR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" diff --git a/tests/scripts/test065-proxyauthz b/tests/scripts/test065-proxyauthz index 4449b8a948..334d421438 100755 --- a/tests/scripts/test065-proxyauthz +++ b/tests/scripts/test065-proxyauthz @@ -45,9 +45,9 @@ fi mkdir -p $TESTDIR $DBDIR1 $DBDIR2 # Test proxy caching: -# - start master +# - start provider # - start proxy cache -# - populate master +# - populate provider # - perform a first search # - verify cacheability # - perform a second search with the same filter and same user @@ -55,8 +55,8 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 # - perform a third search with the same user but a different filter # - verify cacheability of the bind and the non-answerability of the result -echo "Starting master slapd on TCP/IP port $PORT1..." -. $CONFFILTER < $PROXYAUTHZMASTERCONF > $CONF1 +echo "Starting provider slapd on TCP/IP port $PORT1..." +. $CONFFILTER < $PROXYAUTHZPROVIDERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then @@ -67,7 +67,7 @@ KILLPIDS="$PID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +echo "Using ldapsearch to check that provider slapd is running..." for i in 0 1 2 3 4 5; do $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \ -D "cn=Manager,dc=example,dc=com" -w secret 'objectclass=*' > /dev/null 2>&1 @@ -85,7 +85,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to populate the master directory..." +echo "Using ldapadd to populate the provider directory..." $LDAPADD -x -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDERED > /dev/null 2>&1 RC=$? diff --git a/tests/scripts/test069-delta-multimaster-starttls b/tests/scripts/test069-delta-multimaster-starttls index 508c4d992d..14d1bbf5ec 100755 --- a/tests/scripts/test069-delta-multimaster-starttls +++ b/tests/scripts/test069-delta-multimaster-starttls @@ -277,7 +277,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -301,7 +301,7 @@ THEDN="cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com" sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$THEDN" -H $URI1 \ - -s base '(objectClass=*)' entryCSN > "${MASTEROUT}.$i" 2>&1 + -s base '(objectClass=*)' entryCSN > "${PROVIDEROUT}.$i" 2>&1 RC=$? if test $RC = 0 ; then @@ -309,7 +309,7 @@ for i in 1 2 3; do fi if test $RC != 32 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at replica ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -340,7 +340,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -555,7 +555,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" diff --git a/tests/scripts/test070-delta-multimaster-ldaps b/tests/scripts/test070-delta-multimaster-ldaps index 5d2ed6e1bc..4f5420b7ad 100755 --- a/tests/scripts/test070-delta-multimaster-ldaps +++ b/tests/scripts/test070-delta-multimaster-ldaps @@ -276,7 +276,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -300,7 +300,7 @@ THEDN="cn=James A Jones 2,ou=Alumni Association,ou=People,dc=example,dc=com" sleep 1 for i in 1 2 3; do $LDAPSEARCH -S "" -b "$THEDN" -o tls_cacert=$TESTDIR/tls/ca/certs/testsuiteCA.crt -H $SURIP1 \ - -s base '(objectClass=*)' entryCSN > "${MASTEROUT}.$i" 2>&1 + -s base '(objectClass=*)' entryCSN > "${PROVIDEROUT}.$i" 2>&1 RC=$? if test $RC = 0 ; then @@ -308,7 +308,7 @@ for i in 1 2 3; do fi if test $RC != 32 ; then - echo "ldapsearch failed at slave ($RC)!" + echo "ldapsearch failed at replica ($RC)!" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit $RC fi @@ -339,7 +339,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" @@ -552,7 +552,7 @@ done n=2 while [ $n -le $MMR ]; do echo "Comparing retrieved entries from server 1 and server $n..." -$CMP $MASTERFLT $TESTDIR/server$n.flt > $CMPOUT +$CMP $PROVIDERFLT $TESTDIR/server$n.flt > $CMPOUT if test $? != 0 ; then echo "test failed - server 1 and server $n databases differ" diff --git a/tests/scripts/test071-dirsync b/tests/scripts/test071-dirsync index 892e616904..d73b1957d1 100755 --- a/tests/scripts/test071-dirsync +++ b/tests/scripts/test071-dirsync @@ -89,12 +89,12 @@ o: OpenLDAP Testing EOMODS $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -328,7 +328,7 @@ OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp" echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -D $MSAD_ADMINDN -w $MSAD_ADMINPW -S "" -H $MSAD_URI -b "$MSAD_SUFFIX" -E \!dirsync=0/0 -o ldif_wrap=120 \ - '(associatedDomain=test.openldap.org)' > $MASTEROUT 2>&1 + '(associatedDomain=test.openldap.org)' > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -339,7 +339,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 -o ldif_wrap=120 \ - '(objectclass=*)' > $SLAVEOUT 2>&1 + '(objectclass=*)' > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -351,12 +351,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER -s a < $MASTEROUT | sed -e 's/CN=/cn=/g' -e 's/OU=/ou=/g' -e 's/DC=/dc=/g' > $MASTERFLT +$LDIFFILTER -s a < $PROVIDEROUT | sed -e 's/CN=/cn=/g' -e 's/OU=/ou=/g' -e 's/DC=/dc=/g' > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -s a < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test072-dsee-sync b/tests/scripts/test072-dsee-sync index 80da336d82..9fe844b250 100755 --- a/tests/scripts/test072-dsee-sync +++ b/tests/scripts/test072-dsee-sync @@ -71,12 +71,12 @@ fi echo "Starting consumer slapd on TCP/IP port $PORT2..." . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC1CONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -288,7 +288,7 @@ OPATTRS="creatorsName createTimestamp modifiersName modifyTimestamp" echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ -D "$DSEEDN" -w $DSEEPW \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -299,7 +299,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -311,12 +311,12 @@ fi test $KILLSERVERS != no && kill -HUP $KILLPIDS echo "Filtering provider results..." -$LDIFFILTER -s a < $MASTEROUT > $MASTERFLT +$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -s a < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" diff --git a/tests/scripts/test075-dsee-persist b/tests/scripts/test075-dsee-persist index 4f3ec8ab16..3b4d44392f 100755 --- a/tests/scripts/test075-dsee-persist +++ b/tests/scripts/test075-dsee-persist @@ -74,12 +74,12 @@ fi echo "Starting consumer slapd on TCP/IP port $PORT4..." . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC2CONF > $CONF4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$KILLPIDS $SLAVEPID" +KILLPIDS="$KILLPIDS $CONSUMERPID" sleep 1 @@ -118,7 +118,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ -D "$DSEEDN" -w "$DSEEPW" \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -129,7 +129,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -139,12 +139,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER -s a < $MASTEROUT > $MASTERFLT +$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -s a < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ" @@ -163,7 +163,7 @@ if test $WAIT != 0 ; then echo PID $PID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" sleep 1 @@ -314,8 +314,8 @@ fi ## ldappasswd test removed, not supported on DSEE echo "Stopping consumer to test recovery..." -kill -HUP $SLAVEPID -wait $SLAVEPID +kill -HUP $CONSUMERPID +wait $CONSUMERPID echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$DSEEDN" -h $LOCALHOST -p $PORT1 -w $DSEEPW >> \ @@ -364,12 +364,12 @@ fi echo "Restarting consumer..." echo "RESTART" >> $LOG4 $SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 & -SLAVEPID=$! +CONSUMERPID=$! if test $WAIT != 0 ; then - echo SLAVEPID $SLAVEPID + echo CONSUMERPID $CONSUMERPID read foo fi -KILLPIDS="$PID $SLAVEPID" +KILLPIDS="$PID $CONSUMERPID" echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 @@ -377,7 +377,7 @@ sleep $SLEEP1 echo "Using ldapsearch to read all the entries from the provider..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ -D "$DSEEDN" -w "$DSEEPW" \ - '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $PROVIDEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -388,7 +388,7 @@ fi echo "Using ldapsearch to read all the entries from the consumer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT4 \ - '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1 + '(objectclass=*)' '*' $OPATTRS > $CONSUMEROUT 2>&1 RC=$? if test $RC != 0 ; then @@ -398,12 +398,12 @@ if test $RC != 0 ; then fi echo "Filtering provider results..." -$LDIFFILTER -s a < $MASTEROUT > $MASTERFLT +$LDIFFILTER -s a < $PROVIDEROUT > $PROVIDERFLT echo "Filtering consumer results..." -$LDIFFILTER -s a < $SLAVEOUT > $SLAVEFLT +$LDIFFILTER -s a < $CONSUMEROUT > $CONSUMERFLT echo "Comparing retrieved entries from provider and consumer..." -$CMP $MASTERFLT $SLAVEFLT > $CMPOUT +$CMP $PROVIDERFLT $CONSUMERFLT > $CMPOUT if test $? != 0 ; then echo "test failed - provider and consumer databases differ"