Commit 1ab9e3b7 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

AFAICT, this is a Win32 platform-specific defect, as there is 

no corresponding config.m4, and therefore no unix module named 
mod_lbmethod_rr.

This module was apparently abandoned prior to API changes that
preceeded 2.4.1 and therefore never belonged in the 2.4.x GA.

Remove the last references from branches/2.4.x, and we can deal
later with whether or not this subsists on trunk/...

Reviewed by: wrowe, trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1736269 13f79535-47bb-0310-9956-ffa450edef68
parent 37dbfc00

Apache-apr2.dsw

+0 −27
Original line number Diff line number Diff line
@@ -68,9 +68,6 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name mod_example_ipc

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_lbmethod_rr

    End Project Dependency

}}}



###############################################################################
@@ -1987,30 +1984,6 @@ Package=<4> 


###############################################################################



Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy_balancer

    End Project Dependency

}}}



###############################################################################



Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>



Package=<5>

Apache.dsw

+0 −30
Original line number Diff line number Diff line
@@ -71,9 +71,6 @@ Package=<4> 
    Begin Project Dependency

    Project_Dep_Name mod_example_ipc

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_lbmethod_rr

    End Project Dependency

}}}



###############################################################################
@@ -2344,33 +2341,6 @@ Package=<4> 


###############################################################################



Project: "mod_lbmethod_rr"=.\modules\proxy\examples\mod_lbmethod_rr.dsp - Package Owner=<4>



Package=<5>

{{{

}}}



Package=<4>

{{{

    Begin Project Dependency

    Project_Dep_Name libapr

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libaprutil

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name libhttpd

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy

    End Project Dependency

    Begin Project Dependency

    Project_Dep_Name mod_proxy_balancer

    End Project Dependency

}}}



###############################################################################



Project: "mod_ldap"=.\modules\ldap\mod_ldap.dsp - Package Owner=<4>



Package=<5>

Makefile.win

+0 −8
Original line number Diff line number Diff line
@@ -564,11 +564,6 @@ _build: 
	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_bytraffic.mak  CFG="mod_lbmethod_bytraffic - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_heartbeat.mak  CFG="mod_lbmethod_heartbeat - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..\..

!IFDEF ALL

	cd modules\proxy\examples

	 $(MAKE) $(MAKEOPT) -f mod_lbmethod_rr.mak CFG="mod_lbmethod_rr - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	cd ..\..\..

!ENDIF

	cd modules\session

	 $(MAKE) $(MAKEOPT) -f mod_session.mak        CFG="mod_session - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -836,9 +831,6 @@ _copybin: 
	copy modules\proxy\balancers\$(LONG)\mod_lbmethod_byrequests.$(src_so) "$(inst_so)" <.y

	copy modules\proxy\balancers\$(LONG)\mod_lbmethod_bytraffic.$(src_so)  "$(inst_so)" <.y

	copy modules\proxy\balancers\$(LONG)\mod_lbmethod_heartbeat.$(src_so)  "$(inst_so)" <.y

!IFDEF ALL

	copy modules\proxy\examples\$(LONG)\mod_lbmethod_rr.$(src_so) "$(inst_so)" <.y

!ENDIF

	copy modules\session\$(LONG)\mod_session.$(src_so)        "$(inst_so)" <.y

	copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y

	copy modules\session\$(LONG)\mod_session_dbd.$(src_so)    "$(inst_so)" <.y

README.cmake

+1 −2
Original line number Diff line number Diff line
@@ -309,8 +309,7 @@ Known Bugs and Limitations 
  of httpd and support libraries in a manner suitable for typical users

* no logic to find support libraries or otherwise build these modules:

  + mod_socache_dc (requires distcache), mod_serf (requires serf)

  + additionally, mod_lbmethod_rr and mod_firehose don't compile on Windows

    anyway

  + additionally, mod_firehose doesn't compile on Windows anyway

* buildmark.c isn't necessarily rebuilt when httpd.exe is regenerated

* ApacheMonitor has a build error and is disabled

* CGI examples aren't installed

modules/proxy/examples/mod_lbmethod_rr.c

deleted100644 → 0
+0 −134
Original line number Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



/* Round Robin lbmethod EXAMPLE module for Apache proxy */



/* NOTE: This is designed simply to provide some info on how to create

         extra lbmethods via sub-modules... This code is ugly

         and needs work to actually do round-robin "right"

         but that is left as an exercise for the reader */



#include "mod_proxy.h"

#include "scoreboard.h"

#include "ap_mpm.h"

#include "apr_version.h"

#include "ap_hooks.h"



#if APR_HAVE_UNISTD_H

#include <unistd.h> /* for getpid() */

#endif



module AP_MODULE_DECLARE_DATA proxy_balancer_rr_module;



typedef struct {

    int index;

} rr_data ;



/*

 */

static proxy_worker *find_best_roundrobin(proxy_balancer *balancer,

                                         request_rec *r)

{

    int i;

    proxy_worker **worker;

    proxy_worker *mycandidate = NULL;

    int checking_standby;

    int checked_standby;

    rr_data *ctx;



    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01116)

                 "proxy: Entering roundrobin for BALANCER %s (%d)",

                 balancer->name, (int)getpid());



    /* The index of the candidate last chosen is stored in ctx->index */

    if (!balancer->context) {

        /* UGLY */

        ctx = apr_pcalloc(r->server->process->pconf, sizeof(rr_data));

        balancer->context = (void *)ctx;

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01117)

                 "proxy: Creating roundrobin ctx for BALANCER %s (%d)",

                 balancer->name, (int)getpid());

    } else {

        ctx = (rr_data *)balancer->context;

    }

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, APLOGNO(01118)

                 "proxy: roundrobin index: %d (%d)",

                 ctx->index, (int)getpid());



    checking_standby = checked_standby = 0;

    while (!mycandidate && !checked_standby) {

        worker = (proxy_worker **)balancer->workers->elts;



        for (i = 0; i < balancer->workers->nelts; i++, worker++) {

            if (i < ctx->index)

                continue;

            if (

                (checking_standby ? !PROXY_WORKER_IS_STANDBY(*worker) : PROXY_WORKER_IS_STANDBY(*worker)) ||

                (PROXY_WORKER_IS_DRAINING(*worker))

                ) {

                continue;

            }

            if (!PROXY_WORKER_IS_USABLE(*worker))

                ap_proxy_retry_worker("BALANCER", *worker, r->server);

            if (PROXY_WORKER_IS_USABLE(*worker)) {

                mycandidate = *worker;

                break;

            }

        }

        checked_standby = checking_standby++;

    }





    ctx->index += 1;

    if (ctx->index >= balancer->workers->nelts) {

        ctx->index = 0;

    }

    return mycandidate;

}



static apr_status_t reset(proxy_balancer *balancer, server_rec *s)

{

    return APR_SUCCESS;

}



static apr_status_t age(proxy_balancer *balancer, server_rec *s)

{

    return APR_SUCCESS;

}



static const proxy_balancer_method roundrobin =

{

    "roundrobin",

    &find_best_roundrobin,

    NULL,

    &reset,

    &age

};



static void ap_proxy_rr_register_hook(apr_pool_t *p)

{

    ap_register_provider(p, PROXY_LBMETHOD, "roundrobin", "0", &roundrobin);

}



AP_DECLARE_MODULE(proxy_balancer_rr) = {

    STANDARD20_MODULE_STUFF,

    NULL,       /* create per-directory config structure */

    NULL,       /* merge per-directory config structures */

    NULL,       /* create per-server config structure */

    NULL,       /* merge per-server config structures */

    NULL,       /* command apr_table_t */

    ap_proxy_rr_register_hook /* register hooks */

};