Rework monitor startup

Takes care of dealing with monitor not present/not configured and fix a
monitor startup issue.

diff --git a/servers/lloadd/daemon.c b/servers/lloadd/daemon.c
index d6dcb343440271e2e85452138aa541754df4a843..c20c5720bf4bdd03fa8e97cbfe97531fef8bc4c0 100644 (file)
--- a/servers/lloadd/daemon.c
+++ b/servers/lloadd/daemon.c
@@ -92,7 +92,7 @@ struct event *lload_timeout_event;
  * global lload statistics. Not mutex protected to preserve performance -
  * increment is atomic, at most we risk a bit of inconsistency
  */
-lload_global_stats_t lload_stats;
+lload_global_stats_t lload_stats = {};
 
 #ifndef SLAPD_LISTEN_BACKLOG
 #define SLAPD_LISTEN_BACKLOG 1024
@@ -1426,10 +1426,3 @@ lload_resume_listeners( void )
         evconnlistener_enable( lload_listeners[i]->listener );
     }
 }
-
-/* we need this in a file that compiles for both module and server */
-void
-lload_counters_init()
-{
-    memset( &lload_stats, 0, sizeof(lload_global_stats_t) );
-}

diff --git a/servers/lloadd/init.c b/servers/lloadd/init.c
index 189d6cdcb58fed67cc850ef7ddb97be1e2d7722d..a2f95d0d1b5a6640eaf7824ee9525124acb0ef85 100644 (file)
--- a/servers/lloadd/init.c
+++ b/servers/lloadd/init.c
@@ -97,8 +97,6 @@ lload_init( int mode, const char *name )
             ldap_pvt_thread_pool_init_q( &connection_pool, connection_pool_max,
                     0, connection_pool_queues );
 
-            lload_counters_init();
-
             ldap_pvt_thread_mutex_init( &slapd_rq.rq_mutex );
             LDAP_STAILQ_INIT( &slapd_rq.task_list );
             LDAP_STAILQ_INIT( &slapd_rq.run_list );

diff --git a/servers/lloadd/module_init.c b/servers/lloadd/module_init.c
index 5ff03a86906139f67db8fbcda17f7f19b0e6d9f3..a39cc7288910bc1f659169acd861719e6fb8cf9c 100644 (file)
--- a/servers/lloadd/module_init.c
+++ b/servers/lloadd/module_init.c
@@ -73,81 +73,6 @@ lload_conn_pool_init()
     return rc;
 }
 
-static int
-lload_module_incoming_count( LloadConnection *conn, void *argv )
-{
-    lload_global_stats_t *tmp_stats = argv;
-    tmp_stats->global_incoming++;
-    return 0;
-}
-
-/* update all global statistics other than rejected and received,
- * these are updated in real time */
-void *
-lload_module_update_global_stats( void *ctx, void *arg )
-{
-    struct re_s *rtask = arg;
-    lload_global_stats_t tmp_stats = {};
-    LloadBackend *b;
-    int i;
-
-    Debug( LDAP_DEBUG_TRACE, "lload_module_update_global_stats: "
-            "updating stats\n" );
-    /* count incoming connections */
-    clients_walk( lload_module_incoming_count, &tmp_stats );
-
-    LDAP_CIRCLEQ_FOREACH ( b, &backend, b_next ) {
-        LloadConnection *c;
-
-        ldap_pvt_thread_mutex_lock( &b->b_mutex );
-        tmp_stats.global_outgoing += b->b_active + b->b_bindavail;
-
-        /* merge completed and failed stats */
-        for ( i = 0; i < LLOAD_STATS_OPS_LAST; i++ ) {
-            tmp_stats.counters[i].lc_ops_completed +=
-                    b->b_counters[i].lc_ops_completed;
-            tmp_stats.counters[i].lc_ops_failed +=
-                    b->b_counters[i].lc_ops_failed;
-        }
-        ldap_pvt_thread_mutex_unlock( &b->b_mutex );
-    }
-
-    /* update lload_stats */
-    lload_stats.global_outgoing = tmp_stats.global_outgoing;
-    lload_stats.global_incoming = tmp_stats.global_incoming;
-    for ( i = 0; i < LLOAD_STATS_OPS_LAST; i++ ) {
-        lload_stats.counters[i].lc_ops_completed =
-                tmp_stats.counters[i].lc_ops_completed;
-        lload_stats.counters[i].lc_ops_failed =
-                tmp_stats.counters[i].lc_ops_failed;
-    }
-
-    /* reschedule */
-    ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-    ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
-    ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-    return NULL;
-}
-
-void *
-lload_module_start_daemon( void *ctx, void *arg )
-{
-    lload_counters_init();
-    lload_monitor_mss_init();
-
-    if ( ldap_pvt_thread_create(
-                 &lloadd_main_thread, 0, lload_start_daemon, NULL ) ) {
-        return NULL;
-    }
-
-    ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-    ldap_pvt_runqueue_insert( &slapd_rq, 1, lload_module_update_global_stats,
-            NULL, "lload_module_update_global_stats", "lloadd" );
-    ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-
-    return NULL;
-}
-
 int
 lload_back_open( BackendInfo *bi )
 {
@@ -169,14 +94,12 @@ lload_back_open( BackendInfo *bi )
     }
     lload_conn_pool_init();
 
-    if ( lload_monitor_initialize() != 0 ) {
+    if ( lload_monitor_open() != 0 ) {
         return -1;
     }
 
-    return ldap_pvt_thread_pool_submit(
-            &connection_pool, lload_module_start_daemon, NULL );
-
-    return 0;
+    return ldap_pvt_thread_create(
+            &lloadd_main_thread, 0, lload_start_daemon, NULL );
 }
 
 int
@@ -211,8 +134,7 @@ lload_back_initialize( BackendInfo *bi )
     bi->bi_connection_init = 0;
     bi->bi_connection_destroy = 0;
 
-    lload_back_init_cf( bi );
-    return 0;
+    return lload_back_init_cf( bi );
 }
 
 SLAP_BACKEND_INIT_MODULE( lload )

diff --git a/servers/lloadd/monitor.c b/servers/lloadd/monitor.c
index b448a5dcd87055e3835575e530d15edd70bb9f5c..3d7014270e4b58ece63f9d5d772c12f11b5f5b4b 100644 (file)
--- a/servers/lloadd/monitor.c
+++ b/servers/lloadd/monitor.c
@@ -263,82 +263,6 @@ static struct {
     { NULL }
 };
 
-int
-lload_monitor_initialize( void )
-{
-    int i, code;
-    static int lload_monitor_initialized = 0;
-    ConfigArgs c;
-    char *argv[3];
-    /* set to 0 when successfully initialized; otherwise, remember failure */
-    static int lload_monitor_initialized_failure = 1;
-
-    /* register schema here; if compiled as dynamic object,
-     * must be loaded __after__ back_monitor.la */
-
-    if ( lload_monitor_initialized++ ) {
-        return lload_monitor_initialized_failure;
-    }
-
-    if ( backend_info( "monitor" ) == NULL ) {
-        return -1;
-    }
-
-    argv[0] = "lload monitor";
-    c.argv = argv;
-    c.argc = 3;
-    c.fname = argv[0];
-    for ( i = 0; s_oid[i].name; i++ ) {
-        argv[1] = s_oid[i].name;
-        argv[2] = s_oid[i].oid;
-
-        if ( parse_oidm( &c, 0, NULL ) != 0 ) {
-            Debug( LDAP_DEBUG_ANY, "lload_monitor_initialize: "
-                    "unable to add objectIdentifier \"%s=%s\"\n",
-                    s_oid[i].name, s_oid[i].oid );
-            return 2;
-        }
-    }
-
-    for ( i = 0; s_at[i].desc != NULL; i++ ) {
-        code = register_at( s_at[i].desc, s_at[i].ad, 1 );
-        if ( code != LDAP_SUCCESS ) {
-            Debug( LDAP_DEBUG_ANY, "lload_monitor_initialize: "
-                    "register_at failed for attributeType (%s)\n",
-                    s_at[i].desc );
-            return 3;
-
-        } else {
-            (*s_at[i].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
-        }
-    }
-
-    for ( i = 0; s_oc[i].desc != NULL; i++ ) {
-        code = register_oc( s_oc[i].desc, s_oc[i].oc, 1 );
-        if ( code != LDAP_SUCCESS ) {
-            Debug( LDAP_DEBUG_ANY, "lload_monitor_initialize: "
-                    "register_oc failed for objectClass (%s)\n",
-                    s_oc[i].desc );
-            return 4;
-
-        } else {
-            (*s_oc[i].oc)->soc_flags |= SLAP_OC_HIDE;
-        }
-    }
-
-    for ( i = 0; s_moc[i].name != NULL; i++ ) {
-        *s_moc[i].oc = oc_find( s_moc[i].name );
-        if ( !*s_moc[i].oc ) {
-            Debug( LDAP_DEBUG_ANY, "lload_monitor_initialize: "
-                    "failed to find objectClass (%s)\n",
-                    s_moc[i].name );
-            return 5;
-        }
-    }
-
-    return (lload_monitor_initialized_failure = LDAP_SUCCESS);
-}
-
 static int
 lload_monitor_subsystem_destroy( BackendDB *be, monitor_subsys_t *ms )
 {
@@ -933,6 +857,62 @@ done:
     return rc;
 }
 
+static int
+lload_monitor_incoming_count( LloadConnection *conn, void *argv )
+{
+    lload_global_stats_t *tmp_stats = argv;
+    tmp_stats->global_incoming++;
+    return 0;
+}
+
+/*
+ * Update all global statistics other than rejected and received,
+ * which are updated in real time
+ */
+void *
+lload_monitor_update_global_stats( void *ctx, void *arg )
+{
+    struct re_s *rtask = arg;
+    lload_global_stats_t tmp_stats = {};
+    LloadBackend *b;
+    int i;
+
+    Debug( LDAP_DEBUG_TRACE, "lload_monitor_update_global_stats: "
+            "updating stats\n" );
+    /* count incoming connections */
+    clients_walk( lload_monitor_incoming_count, &tmp_stats );
+
+    LDAP_CIRCLEQ_FOREACH ( b, &backend, b_next ) {
+        ldap_pvt_thread_mutex_lock( &b->b_mutex );
+        tmp_stats.global_outgoing += b->b_active + b->b_bindavail;
+
+        /* merge completed and failed stats */
+        for ( i = 0; i < LLOAD_STATS_OPS_LAST; i++ ) {
+            tmp_stats.counters[i].lc_ops_completed +=
+                    b->b_counters[i].lc_ops_completed;
+            tmp_stats.counters[i].lc_ops_failed +=
+                    b->b_counters[i].lc_ops_failed;
+        }
+        ldap_pvt_thread_mutex_unlock( &b->b_mutex );
+    }
+
+    /* update lload_stats */
+    lload_stats.global_outgoing = tmp_stats.global_outgoing;
+    lload_stats.global_incoming = tmp_stats.global_incoming;
+    for ( i = 0; i < LLOAD_STATS_OPS_LAST; i++ ) {
+        lload_stats.counters[i].lc_ops_completed =
+                tmp_stats.counters[i].lc_ops_completed;
+        lload_stats.counters[i].lc_ops_failed =
+                tmp_stats.counters[i].lc_ops_failed;
+    }
+
+    /* reschedule */
+    ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+    ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
+    ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+    return NULL;
+}
+
 static char *lload_subsys_rdn[] = {
     LLOAD_MONITOR_BALANCER_RDN,
     LLOAD_MONITOR_INCOMING_RDN,
@@ -1002,32 +982,111 @@ static struct monitor_subsys_t balancer_subsys[] = {
 };
 
 int
-lload_monitor_mss_init()
+lload_monitor_open( void )
 {
+    static int lload_monitor_initialized_failure = 1;
+    static int lload_monitor_initialized = 0;
     BackendInfo *mi;
     monitor_extra_t *mbe;
     monitor_subsys_t *mss;
-    char **rdn;
-    int rc = 0;
+    ConfigArgs c;
+    char *argv[3], **rdn;
+    int i, rc;
 
+    /* check if monitor is configured and usable */
     mi = backend_info( "monitor" );
-    if ( !mi ) {
-        Debug( LDAP_DEBUG_CONFIG, "lload_monitor_mss_init: "
-                "not registering, monitor backend unavailable\n" );
+    if ( !mi || !mi->bi_extra ) {
+        Debug( LDAP_DEBUG_CONFIG, "lload_monitor_open: "
+                "monitor backend not available, monitoring disabled\n" );
         return 0;
     }
     mbe = mi->bi_extra;
 
+    /* don't bother if monitor is not configured */
+    if ( !mbe->is_configured() ) {
+        static int warning = 0;
+
+        if ( warning++ == 0 ) {
+            Debug( LDAP_DEBUG_CONFIG, "lload_monitor_open: "
+                    "monitoring disabled; "
+                    "configure monitor database to enable\n" );
+        }
+
+        return 0;
+    }
+
+    if ( lload_monitor_initialized++ ) {
+        return lload_monitor_initialized_failure;
+    }
+
+    argv[0] = "lload monitor";
+    c.argv = argv;
+    c.argc = 3;
+    c.fname = argv[0];
+    for ( i = 0; s_oid[i].name; i++ ) {
+        argv[1] = s_oid[i].name;
+        argv[2] = s_oid[i].oid;
+
+        if ( parse_oidm( &c, 0, NULL ) != 0 ) {
+            Debug( LDAP_DEBUG_ANY, "lload_monitor_open: "
+                    "unable to add objectIdentifier \"%s=%s\"\n",
+                    s_oid[i].name, s_oid[i].oid );
+            return 2;
+        }
+    }
+
+    for ( i = 0; s_at[i].desc != NULL; i++ ) {
+        rc = register_at( s_at[i].desc, s_at[i].ad, 1 );
+        if ( rc != LDAP_SUCCESS ) {
+            Debug( LDAP_DEBUG_ANY, "lload_monitor_open: "
+                    "register_at failed for attributeType (%s)\n",
+                    s_at[i].desc );
+            return 3;
+
+        } else {
+            (*s_at[i].ad)->ad_type->sat_flags |= SLAP_AT_HIDE;
+        }
+    }
+
+    for ( i = 0; s_oc[i].desc != NULL; i++ ) {
+        rc = register_oc( s_oc[i].desc, s_oc[i].oc, 1 );
+        if ( rc != LDAP_SUCCESS ) {
+            Debug( LDAP_DEBUG_ANY, "lload_monitor_open: "
+                    "register_oc failed for objectClass (%s)\n",
+                    s_oc[i].desc );
+            return 4;
+
+        } else {
+            (*s_oc[i].oc)->soc_flags |= SLAP_OC_HIDE;
+        }
+    }
+
+    for ( i = 0; s_moc[i].name != NULL; i++ ) {
+        *s_moc[i].oc = oc_find( s_moc[i].name );
+        if ( !*s_moc[i].oc ) {
+            Debug( LDAP_DEBUG_ANY, "lload_monitor_open: "
+                    "failed to find objectClass (%s)\n",
+                    s_moc[i].name );
+            return 5;
+        }
+    }
+
     /* register the subsystems - Servers are registered in backends_init */
     for ( mss = balancer_subsys, rdn = lload_subsys_rdn; mss->mss_name;
             mss++, rdn++ ) {
         ber_str2bv( *rdn, 0, 1, &mss->mss_rdn );
-        if ( mbe->register_subsys( mss ) ) {
-            Debug( LDAP_DEBUG_ANY, "lload_monitor_mss_init: "
-                    "failed to register %s subsystem",
+        if ( mbe->register_subsys_late( mss ) ) {
+            Debug( LDAP_DEBUG_ANY, "lload_monitor_open: "
+                    "failed to register %s subsystem\n",
                     mss->mss_name );
             return -1;
         }
     }
-    return rc;
+
+    ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+    ldap_pvt_runqueue_insert( &slapd_rq, 1, lload_monitor_update_global_stats,
+            NULL, "lload_monitor_update_global_stats", "lloadd" );
+    ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+
+    return (lload_monitor_initialized_failure = LDAP_SUCCESS);
 }

diff --git a/servers/lloadd/proto-lload.h b/servers/lloadd/proto-lload.h
index d686cc95024ff98ed95f04b127dfc00b51903f4c..ed7cee0cbab80ee3b1b5afad67021a44ec3a5992 100644 (file)
--- a/servers/lloadd/proto-lload.h
+++ b/servers/lloadd/proto-lload.h
@@ -140,7 +140,7 @@ LDAP_SLAPD_F (void) lload_libevent_destroy( void );
 /*
  * monitor.c
  */
-LDAP_SLAPD_F (int) lload_monitor_initialize( void );
+LDAP_SLAPD_F (int) lload_monitor_open( void );
 #endif /* BALANCER_MODULE */
 
 /*