ITS#3178 add "fasttool" option to disable transaction logging in tool mode

diff --git a/doc/man/man5/slapd-bdb.5 b/doc/man/man5/slapd-bdb.5
index 861728f225ac541bea53b0966ea889d5dad0512a..05941827df451136de3c0c8e06962057ed14bc7d 100644 (file)
--- a/doc/man/man5/slapd-bdb.5
+++ b/doc/man/man5/slapd-bdb.5
@@ -71,6 +71,12 @@ results if the data comes from a transaction that is later aborted.
 In this case, the modified data is discarded and a subsequent search
 will return a different result.
 .TP
+.B fasttool
+Disables transaction logging when using the slapadd/slapindex tools,
+using the DB_TXN_NOT_DURABLE flag. Does not affect normal slapd operation,
+but will improve the performance of slapadd/slapindex.
+See the Berkeley DB reference guide for more details.
+.TP
 .B idlcachesize <integer>
 Specify the size of the in-memory index cache, in index slots. The
 default is zero. A larger value will speed up frequent searches of

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 4d2dbbbaba7a456457e8247faf781793cf39438d..d7eeba5e74bc6b3bdfbe22ba76a222f283d2b348 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -64,6 +64,11 @@ bdb_db_config(
        } else if ( strcasecmp( argv[0], "dbnosync" ) == 0 ) {
                bdb->bi_dbenv_xflags |= DB_TXN_NOSYNC;
 
+       /* slapadd/slapindex logging configuration */
+       } else if ( strcasecmp( argv[0], "fasttool" ) == 0 &&
+               slapMode & SLAP_TOOL_MODE ) {
+               bdb->bi_dbenv_xflags |= DB_TXN_NOT_DURABLE;
+
        /* transaction checkpoint configuration */
        } else if ( strcasecmp( argv[0], "checkpoint" ) == 0 ) {
                if ( argc < 3 ) {