Commit 27b6feec authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Move useful and shared balancer stuff to the shm slot... 

Provide hooks for post-config/runtime addition of
balancers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1206286 13f79535-47bb-0310-9956-ffa450edef68
parent d1b17854

modules/proxy/balancers/mod_lbmethod_bybusyness.c

+1 −1
Changes for modules/proxy/balancers/mod_lbmethod_bybusyness.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static proxy_worker *find_best_bybusyness(proxy_balancer *balancer, 


    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering bybusyness for BALANCER (%s)",

                 balancer->name);

                 balancer->s->name);



    /* First try to see if we have available candidate */

    do {

modules/proxy/balancers/mod_lbmethod_byrequests.c

+1 −1
Changes for modules/proxy/balancers/mod_lbmethod_byrequests.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer, 


    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering byrequests for BALANCER (%s)",

                 balancer->name);

                 balancer->s->name);



    /* First try to see if we have available candidate */

    do {

modules/proxy/balancers/mod_lbmethod_bytraffic.c

+1 −1
Changes for modules/proxy/balancers/mod_lbmethod_bytraffic.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer, 


    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering bytraffic for BALANCER (%s)",

                 balancer->name);

                 balancer->s->name);



    /* First try to see if we have available candidate */

    do {

modules/proxy/mod_proxy.c

+7 −7
Changes for modules/proxy/mod_proxy.c: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ static const char * 
    if (ap_proxy_valid_balancer_name(r, 9)) {

        proxy_balancer *balancer = ap_proxy_get_balancer(cmd->pool, conf, r);

        if (!balancer) {

            const char *err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, r, 0);

            const char *err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, r, f, 0);

            if (err)

                return apr_pstrcat(cmd->temp_pool, "ProxyPass ", err, NULL);

        }
@@ -1903,7 +1903,7 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg) 
    /* Try to find the balancer */

    balancer = ap_proxy_get_balancer(cmd->temp_pool, conf, path);

    if (!balancer) {

        err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, path, 0);

        err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, path, "/", 0);

        if (err)

            return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);

    }
@@ -1913,12 +1913,12 @@ static const char *add_member(cmd_parms *cmd, void *dummy, const char *arg) 
    if (!worker) {

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,

                     "Defining worker '%s' for balancer '%s'",

                     name, balancer->name);

                     name, balancer->s->name);

        if ((err = ap_proxy_define_worker(cmd->pool, &worker, balancer, conf, name, 0)) != NULL)

            return apr_pstrcat(cmd->temp_pool, "BalancerMember ", err, NULL);

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, cmd->server,

                     "Defined worker '%s' for balancer '%s'",

                     worker->s->name, balancer->name);

                     worker->s->name, balancer->s->name);

        PROXY_COPY_CONF_PARAMS(worker, conf);

    } else {

        reuse = 1;
@@ -1984,7 +1984,7 @@ static const char * 
        balancer = ap_proxy_get_balancer(cmd->pool, conf, name);

        if (!balancer) {

            if (in_proxy_section) {

                err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, name, 0);

                err = ap_proxy_define_balancer(cmd->pool, &balancer, conf, name, "/", 0);

                if (err)

                    return apr_pstrcat(cmd->temp_pool, "ProxySet ",

                                       err, NULL);
@@ -2133,7 +2133,7 @@ static const char *proxysection(cmd_parms *cmd, void *mconfig, const char *arg) 
            balancer = ap_proxy_get_balancer(cmd->pool, sconf, conf->p);

            if (!balancer) {

                err = ap_proxy_define_balancer(cmd->pool, &balancer,

                                               sconf, conf->p, 0);

                                               sconf, conf->p, "/", 0);

                if (err)

                    return apr_pstrcat(cmd->temp_pool, thiscmd->name,

                                       " ", err, NULL);
@@ -2327,7 +2327,7 @@ static int proxy_status_hook(request_rec *r, int flags) 
    balancer = (proxy_balancer *)conf->balancers->elts;

    for (i = 0; i < conf->balancers->nelts; i++) {

        ap_rputs("<hr />\n<h1>Proxy LoadBalancer Status for ", r);

        ap_rvputs(r, balancer->name, "</h1>\n\n", NULL);

        ap_rvputs(r, balancer->s->name, "</h1>\n\n", NULL);

        ap_rputs("\n\n<table border=\"0\"><tr>"

                 "<th>SSes</th><th>Timeout</th><th>Method</th>"

                 "</tr>\n<tr>", r);

modules/proxy/mod_proxy.h

+11 −2
Changes for modules/proxy/mod_proxy.h: 11 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -304,9 +304,11 @@ PROXY_WORKER_DISABLED | PROXY_WORKER_STOPPED | PROXY_WORKER_IN_ERROR ) 
#endif

#ifndef PROXY_WORKER_MAX_NAME_SIZE

#define PROXY_WORKER_MAX_NAME_SIZE      96

#define PROXY_BALANCER_MAX_NAME_SIZE PROXY_WORKER_MAX_NAME_SIZE

#endif

#ifndef PROXY_WORKER_MAX_HOSTNAME_SIZE

#define PROXY_WORKER_MAX_HOSTNAME_SIZE  64

#define PROXY_BALANCER_MAX_HOSTNAME_SIZE PROXY_WORKER_MAX_HOSTNAME_SIZE

#endif

#ifndef PROXY_BALANCER_MAX_STICKY_SIZE

#define PROXY_BALANCER_MAX_STICKY_SIZE  64
@@ -409,15 +411,20 @@ typedef struct { 
    char      sticky[PROXY_BALANCER_MAX_STICKY_SIZE];          /* sticky session identifier */

    char      lbpname[PROXY_MAX_PROVIDER_NAME_SIZE];  /* lbmethod provider name */

    char      nonce[APR_UUID_FORMATTED_LENGTH + 1];

    char      name[PROXY_BALANCER_MAX_NAME_SIZE];

    char      sname[PROXY_BALANCER_MAX_NAME_SIZE];

    char      alias[PROXY_BALANCER_MAX_NAME_SIZE];

    apr_interval_time_t timeout;  /* Timeout for waiting on free connection */

    apr_time_t      wupdated;     /* timestamp of last change to workers list */

    int             max_attempts;     /* Number of attempts before failing */

    int             index;      /* shm array index */

    int hash;

    unsigned int    sticky_force:1;   /* Disable failover for sticky sessions */

    unsigned int    scolonsep:1;      /* true if ';' seps sticky session paths */

    unsigned int    max_attempts_set:1;

    unsigned int    was_malloced:1;

    unsigned int    need_reset:1;

    unsigned int    vhosted:1;

} proxy_balancer_shared;



#define ALIGNED_PROXY_BALANCER_SHARED_SIZE (APR_ALIGN_DEFAULT(sizeof(proxy_balancer_shared)))
@@ -429,12 +436,12 @@ struct proxy_balancer { 
    ap_slotmem_provider_t *storage;

    int growth;                   /* number of post-config workers can added */

    int max_workers;              /* maximum number of allowed workers */

    const char *name;             /* name of the load balancer */

    const char *sname;            /* filesystem safe balancer name */

    int hash;

    apr_time_t      wupdated;    /* timestamp of last change to workers list */

    proxy_balancer_method *lbmethod;

    apr_global_mutex_t  *gmutex; /* global lock for updating list of workers */

    apr_thread_mutex_t  *tmutex; /* Thread lock for updating shm */

    proxy_server_conf *sconf;

    void            *context;    /* general purpose storage */

    proxy_balancer_shared *s;    /* Shared data */

};
@@ -652,6 +659,7 @@ PROXY_DECLARE(proxy_balancer *) ap_proxy_get_balancer(apr_pool_t *p, 
 * @param balancer the new balancer

 * @param conf   current proxy server configuration

 * @param url    url containing balancer name

 * @param alias  alias/fake-path to this balancer

 * @param do_malloc true if shared struct should be malloced

 * @return       error message or NULL if successfull

 */
@@ -659,6 +667,7 @@ PROXY_DECLARE(char *) ap_proxy_define_balancer(apr_pool_t *p, 
                                               proxy_balancer **balancer,

                                               proxy_server_conf *conf,

                                               const char *url,

                                               const char *alias,

                                               int do_malloc);



/**