allow per-replogfile pid/args file & replication interval (ITS#3523)

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 8c13563ca51f10cb3e915475ca1e9d90f460fa96..f127993d35c24e2fd079e5dce76d4c72dbb08eb1 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -69,12 +69,6 @@ typedef struct {
        int             cb_use_ldif;
 } CfBackInfo;
 
-/* These do nothing in slapd, they're kept only to make them
- * editable here.
- */
-static char *replica_pidFile, *replica_argsFile;
-static int replicationInterval;
-
 static char    *passwd_salt;
 static char    *logfileName;
 #ifdef SLAP_AUTH_REWRITE
@@ -149,6 +143,9 @@ enum {
        CFG_DIT,
        CFG_ATTR,
        CFG_ATOPT,
+       CFG_REPLICA_ARGSFILE,
+       CFG_REPLICA_PIDFILE,
+       CFG_REPLICATIONINTERVAL,
        CFG_REPLOG,
        CFG_ROOTDSE,
        CFG_LOGFILE,
@@ -411,14 +408,14 @@ static ConfigTable config_back_cf_table[] = {
        { "replica", "host or uri", 2, 0, 0, ARG_DB|ARG_MAGIC,
                &config_replica, "( OLcfgDbAt:0.7 NAME 'olcReplica' "
                        "SUP labeledURI X-ORDERED 'VALUES' )", NULL, NULL },
-       { "replica-argsfile", NULL, 0, 0, 0, ARG_STRING,
-               &replica_argsFile, "( OLcfgGlAt:43 NAME 'olcReplicaArgsFile' "
+       { "replica-argsfile", NULL, 0, 0, 0, ARG_MAY_DB|ARG_MAGIC|ARG_STRING|CFG_REPLICA_ARGSFILE,
+               &config_generic, "( OLcfgGlAt:43 NAME 'olcReplicaArgsFile' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
-       { "replica-pidfile", NULL, 0, 0, 0, ARG_STRING,
-               &replica_pidFile, "( OLcfgGlAt:44 NAME 'olcReplicaPidFile' "
+       { "replica-pidfile", NULL, 0, 0, 0, ARG_MAY_DB|ARG_MAGIC|ARG_STRING|CFG_REPLICA_PIDFILE,
+               &config_generic, "( OLcfgGlAt:44 NAME 'olcReplicaPidFile' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
-       { "replicationInterval", NULL, 0, 0, 0, ARG_INT,
-               &replicationInterval, "( OLcfgGlAt:45 NAME 'olcReplicationInterval' "
+       { "replicationInterval", NULL, 0, 0, 0, ARG_MAY_DB|ARG_MAGIC|ARG_INT|CFG_REPLICATIONINTERVAL,
+               &config_generic, "( OLcfgGlAt:45 NAME 'olcReplicationInterval' "
                        "SYNTAX OMsInteger SINGLE-VALUE )", NULL, NULL },
        { "replogfile", "filename", 2, 2, 0, ARG_MAY_DB|ARG_MAGIC|ARG_STRING|CFG_REPLOG,
                &config_generic, "( OLcfgGlAt:46 NAME 'olcReplogFile' "
@@ -637,7 +634,6 @@ static ConfigOCs cf_ocs[] = {
                 "olcLogLevel $ "
                 "olcPasswordCryptSaltFormat $ olcPasswordHash $ olcPidFile $ "
                 "olcPluginLogFile $ olcReadOnly $ olcReferral $ "
-                "olcReplicaPidFile $ olcReplicaArgsFile $ olcReplicationInterval $ "
                 "olcReplogFile $ olcRequires $ olcRestrict $ olcReverseLookup $ "
                 "olcRootDSE $ "
                 "olcSaslHost $ olcSaslRealm $ olcSaslSecProps $ "
@@ -669,6 +665,7 @@ static ConfigOCs cf_ocs[] = {
                "MUST olcDatabase "
                "MAY ( olcSuffix $ olcSubordinate $ olcAccess $ olcLastMod $ olcLimits $ "
                 "olcMaxDerefDepth $ olcPlugin $ olcReadOnly $ olcReplica $ "
+                "olcReplicaArgsFile $ olcReplicaPidFile $ olcReplicationInterval $ "
                 "olcReplogFile $ olcRequires $ olcRestrict $ olcRootDN $ olcRootPW $ "
                 "olcSchemaDN $ olcSecurity $ olcSizeLimit $ olcSyncrepl $ "
                 "olcTimeLimit $ olcUpdateDN $ olcUpdateRef ) )",
@@ -854,6 +851,21 @@ config_generic(ConfigArgs *c) {
                        rc = (!i);
                        break;
                }
+               case CFG_REPLICA_ARGSFILE:
+                       if ( c->be->be_replica_argsfile )
+                               c->value_string = ch_strdup( c->be->be_replica_argsfile );
+                       break;
+               case CFG_REPLICA_PIDFILE:
+                       if ( c->be->be_replica_pidfile )
+                               c->value_string = ch_strdup( c->be->be_replica_pidfile );
+                       break;
+               case CFG_REPLICATIONINTERVAL:
+                       if ( c->be->be_replicationinterval > 0 ) {
+                               c->value_int = c->be->be_replicationinterval;
+                       } else {
+                               rc = 1;
+                       }
+                       break;
                case CFG_REPLOG:
                        if ( c->be->be_replogfile )
                                c->value_string = ch_strdup( c->be->be_replogfile );
@@ -980,6 +992,20 @@ config_generic(ConfigArgs *c) {
                        passwd_salt = NULL;
                        break;
 
+               case CFG_REPLICA_ARGSFILE:
+                       ch_free( c->be->be_replica_argsfile );
+                       c->be->be_replica_argsfile = NULL;
+                       break;
+
+               case CFG_REPLICA_PIDFILE:
+                       ch_free( c->be->be_replica_pidfile );
+                       c->be->be_replica_pidfile = NULL;
+                       break;
+
+               case CFG_REPLICATIONINTERVAL:
+                       c->be->be_replicationinterval = 0;
+                       break;
+
                case CFG_REPLOG:
                        ch_free( c->be->be_replogfile );
                        c->be->be_replogfile = NULL;
@@ -1188,13 +1214,80 @@ config_generic(ConfigArgs *c) {
                        }
                        break;
 
+               case CFG_REPLICA_ARGSFILE:
+                       if(SLAP_MONITOR(c->be)) {
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replica-argsfile\" should not be used "
+                                       "inside monitor database\n",
+                                       c->log, 0, 0);
+                               /* FIXME: should this be an error? */
+                               return(0);
+                       }
+
+                       if ( c->be->be_replica_argsfile != NULL ) {
+                               /* FIXME: error? */
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replica-argsfile\" already provided; "
+                                       "replacing \"%s\" with \"%s\".\n",
+                                       c->log, c->be->be_replica_argsfile, c->value_string );
+                               ch_free( c->be->be_replica_argsfile );
+                       }
+
+                       c->be->be_replica_argsfile = c->value_string;
+                       break;
+
+               case CFG_REPLICA_PIDFILE:
+                       if(SLAP_MONITOR(c->be)) {
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replica-pidfile\" should not be used "
+                                       "inside monitor database\n",
+                                       c->log, 0, 0);
+                               /* FIXME: should this be an error? */
+                               return(0);
+                       }
+
+                       if ( c->be->be_replica_pidfile != NULL ) {
+                               /* FIXME: error? */
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replica-pidfile\" already provided; "
+                                       "replacing \"%s\" with \"%s\".\n",
+                                       c->log, c->be->be_replica_pidfile, c->value_string );
+                               ch_free( c->be->be_replica_pidfile );
+                       }
+
+                       c->be->be_replica_pidfile = c->value_string;
+                       break;
+
+               case CFG_REPLICATIONINTERVAL:
+                       if(SLAP_MONITOR(c->be)) {
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replicationinterval\" should not be used "
+                                       "inside monitor database\n",
+                                       c->log, 0, 0);
+                               /* FIXME: should this be an error? */
+                               return(0);
+                       }
+
+                       c->be->be_replicationinterval = c->value_int;
+                       break;
+
                case CFG_REPLOG:
                        if(SLAP_MONITOR(c->be)) {
                                Debug(LDAP_DEBUG_ANY, "%s: "
                                        "\"replogfile\" should not be used "
                                        "inside monitor database\n",
                                        c->log, 0, 0);
-                               return(0);      /* FIXME: should this be an error? */
+                               /* FIXME: should this be an error? */
+                               return(0);
+                       }
+
+                       if ( c->be->be_replogfile != NULL ) {
+                               /* FIXME: error? */
+                               Debug(LDAP_DEBUG_ANY, "%s: "
+                                       "\"replogfile\" already provided; "
+                                       "replacing \"%s\" with \"%s\".\n",
+                                       c->log, c->be->be_replogfile, c->value_string );
+                               ch_free( c->be->be_replogfile );
                        }
 
                        c->be->be_replogfile = c->value_string;

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 753f99ca7b17c190a2d821d6700ecfa87b63afb2..1e310b067fd53a9ad838dd972df7d0b0e70359a5 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1826,6 +1826,9 @@ struct slap_backend_db {
        /* Replica Information */
        struct slap_replica_info **be_replica;  /* replicas of this backend (in master) */
        char    *be_replogfile; /* replication log file (in master)        */
+       char    *be_replica_argsfile; /* per-replog replica args file */
+       char    *be_replica_pidfile; /* per-replog replica pid file */
+       int     be_replicationinterval; /* per-replog replicationinterval */
        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/slurpd/config.c b/servers/slurpd/config.c
index 41d3edcb9467aa7b685b40a7c29f2c0b1c5d2295..4ab518f5e6e8d1e7ea00794efec7a90ffa1dedbf 100644 (file)
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -89,8 +89,10 @@ slurpd_read_config(
 #define        GOT_REPLOG_MASK         (0xF)
 #define        GOT_REPLOG(i)           ((i) & GOT_REPLOG_MASK)
 #define        GOT_REPLOG_SET(i,v)     ((i) = ((i) & ~GOT_REPLOG_MASK) | ((v) & GOT_REPLOG_MASK))
+
 #define GOT_REPLOG_PID         (0x10)
 #define GOT_REPLOG_ARGS                (0x20)
+#define GOT_REPLOG_INTERVAL    (0x40)
        int     got_replog =    GOT_REPLOG_NO;
 
        /*
@@ -271,7 +273,22 @@ slurpd_read_config(
                                return( 1 );
                        }
 
-                       sglob->no_work_interval = c;
+                       switch ( GOT_REPLOG(got_replog) ) {
+                       case GOT_REPLOG_YES:
+                               Debug( LDAP_DEBUG_CONFIG, "%s: line %d: "
+                                       "got replog specific replicationinterval \"%s\".\n",
+                                       fname, lineno, cargv[1] );
+                       case GOT_REPLOG_NO:
+                               sglob->no_work_interval = c;
+                               got_replog |= GOT_REPLOG_INTERVAL;
+                               break;
+
+                       default:
+                               Debug( LDAP_DEBUG_CONFIG, "%s: line %d: "
+                                       "replicationinterval \"%s\" not mine.\n",
+                                       fname, lineno, cargv[1] );
+                               break;
+                       }
                }
        }