JBoss Native SVN: r1615 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-26 05:44:33 -0400 (Mon, 26 May 2008)
New Revision: 1615
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Also log the result of the command.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-26 09:36:44 UTC (rev 1614)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-26 09:44:33 UTC (rev 1615)
@@ -845,9 +845,14 @@
break;
}
apr_table_setn(r->err_headers_out, "Mess", errstring);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "manager_handler %s error: %s", r->method, errstring);
return 500;
}
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "manager_handler %s OK", r->method);
+
return (OK);
}
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1614 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-26 05:36:44 -0400 (Mon, 26 May 2008)
New Revision: 1614
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Add a debug with the message we received.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-22 14:52:58 UTC (rev 1613)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-26 09:36:44 UTC (rev 1614)
@@ -803,6 +803,10 @@
ap_get_brigade(r->input_filters, input_brigade, AP_MODE_READBYTES, APR_BLOCK_READ, sizeof(buff));
apr_brigade_flatten(input_brigade, buff, &bufsiz);
buff[bufsiz] = '\0';
+
+ /* XXX: Size limit it? */
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "manager_handler %s processing: %s", r->method, buff);
decodeenc(buff);
if (strcasecmp(r->method, "CONFIG") == 0)
errstring = process_config(r, buff, &errtype);
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1613 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-22 10:52:58 -0400 (Thu, 22 May 2008)
New Revision: 1613
Modified:
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
The sub pool is needed to create the socket.
Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-05-22 13:26:46 UTC (rev 1612)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-05-22 14:52:58 UTC (rev 1613)
@@ -198,6 +198,7 @@
apr_pool_t *pool)
{
apr_pool_t *ctx;
+ apr_pool_t *scpool;
proxy_conn_rec *conn;
proxy_worker *worker = (proxy_worker *)params;
@@ -209,7 +210,18 @@
apr_pool_create(&ctx, pool);
conn = apr_pcalloc(pool, sizeof(proxy_conn_rec));
+ /*
+ * Create another subpool that manages the data for the
+ * socket and the connection member of the proxy_conn_rec struct as we
+ * destroy this data more frequently than other data in the proxy_conn_rec
+ * struct like hostname and addr (at least in the case where we have
+ * keepalive connections that timed out).
+ */
+ apr_pool_create(&scpool, ctx);
+ apr_pool_tag(scpool, "proxy_conn_scpool");
+
conn->pool = ctx;
+ conn->scpool = scpool;
conn->worker = worker;
#if APR_HAS_THREADS
conn->inreslist = 1;
@@ -629,6 +641,7 @@
proxy_conn_rec *conn;
/* get the proxy_conn_rec: from ap_proxy_acquire_connection */
#if APR_HAS_THREADS
+ /* prefork() is not "safe" as we have now 2 threads... */
if (worker->hmax && worker->cp->res) {
rv = apr_reslist_acquire(worker->cp->res, (void **)&conn);
}
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1612 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-22 09:26:46 -0400 (Thu, 22 May 2008)
New Revision: 1612
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Add headers for the errors.
Add default values for node and balancer.
Add insert/update the balancer.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-22 11:25:43 UTC (rev 1611)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-22 13:26:46 UTC (rev 1612)
@@ -51,6 +51,7 @@
#define DEFMAXHOST 20
/* Error messages */
+#define TYPESYNTAX 1
#define SMESPAR "SYNTAX: Can't parse message"
#define SBALBIG "SYNTAX: Balancer field too big"
#define SROUBIG "SYNTAX: JVMRoute field too big"
@@ -63,10 +64,15 @@
#define SBADFLD "SYNTAX: Invalid field name in message"
#define SCMDUNS "SYNTAX: Command is not supported"
+#define TYPEMEM 2
#define MNODEUI "MEM: Can't update or insert node"
+#define MBALAUI "MEM: Can't update or insert balancer"
#define MNODERD "MEM: Can't read node"
#define MHOSTRD "MEM: Can't read host alias"
+/* Protocol version supported */
+#define VERSION_PROTOCOL "0.0.0"
+
/* shared memory */
mem_t *contextstatsmem = NULL;
mem_t *nodestatsmem = NULL;
@@ -254,17 +260,17 @@
char *s = buff;
char **ptr = NULL;
for (; *s != '\0'; s++) {
- if (*s == '&') {
+ if (*s == '&' || *s == '=') {
i++;
}
}
- ptr = apr_palloc(r->pool, sizeof(char *) * ((2 *i) +1));
+ ptr = apr_palloc(r->pool, sizeof(char *) * (i + 1));
if (ptr == NULL)
return NULL;
s = buff;
ptr[0] = s;
- ptr[2*i] = NULL;
+ ptr[i] = NULL;
i = 1;
for (; *s != '\0'; s++) {
if (*s == '&' || *s == '=') {
@@ -358,10 +364,11 @@
* Context corresponding to the applications.
* Context: <context list>
*/
-static char * process_config(request_rec *r, char *buff)
+static char * process_config(request_rec *r, char *buff, int *errtype)
{
- /* Process the node description */
+ /* Process the node/balancer description */
nodeinfo_t nodeinfo;
+ balancerinfo_t balancerinfo;
char *JVMRoute;
char *Domain;
char *Host;
@@ -373,8 +380,10 @@
struct cluster_host *phost;
char **ptr = process_buff(r, buff);
- if (ptr == NULL)
+ if (ptr == NULL) {
+ *errtype = TYPESYNTAX;
return SMESPAR;
+ }
vhost = apr_palloc(r->pool, sizeof(struct cluster_host));
/* Map nothing by default */
@@ -383,37 +392,67 @@
vhost->next = NULL;
phost = vhost;
+ /* Fill default nodes values */
+ memset(&nodeinfo.mess, '\0', sizeof(nodeinfo.mess));
+ strcpy(nodeinfo.mess.balancer, "mycluster");
+ strcpy(nodeinfo.mess.Host, "localhost");
+ strcpy(nodeinfo.mess.Port, "8009");
+ strcpy(nodeinfo.mess.Type, "ajp");
nodeinfo.mess.reversed = 0;
+
+ /* Fill default balancer values */
+ memset(&balancerinfo, '\0', sizeof(balancerinfo));
+ strcpy(balancerinfo.balancer, "mycluster");
+ balancerinfo.StickySession = 1;
+ strcpy(balancerinfo.StickySessionCookie, "JSESSIONID");
+ strcpy(balancerinfo.StickySessionPath, "jsessionid");
+ balancerinfo.Maxattempts = 1;
+
int i = 0;
while (ptr[i]) {
+ /* XXX: balancer part */
if (strcasecmp(ptr[i], "Balancer") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.balancer))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.balancer)) {
+ *errtype = TYPESYNTAX;
return SBALBIG;
+ }
strcpy(nodeinfo.mess.balancer, ptr[i+1]);
+ strcpy(balancerinfo.balancer, ptr[i+1]);
}
+ /* XXX: Node part */
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute)) {
+ *errtype = TYPESYNTAX;
return SROUBIG;
+ }
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Domain") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Domain))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Domain)) {
+ *errtype = TYPESYNTAX;
return SDOMBIG;
+ }
strcpy(nodeinfo.mess.Domain, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Host") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Host))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Host)) {
+ *errtype = TYPESYNTAX;
return SHOSBIG;
+ }
strcpy(nodeinfo.mess.Host, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Port") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Port))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Port)) {
+ *errtype = TYPESYNTAX;
return SPORBIG;
+ }
strcpy(nodeinfo.mess.Port, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Type") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Type))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Type)) {
+ *errtype = TYPESYNTAX;
return STYPBIG;
+ }
strcpy(nodeinfo.mess.Type, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Reversed") == 0) {
@@ -423,6 +462,7 @@
}
if (strcasecmp(ptr[i], "Alias") == 0) {
if (phost->host && !phost->context) {
+ *errtype = TYPESYNTAX;
return SALIBAD;
}
if (phost->host) {
@@ -437,6 +477,7 @@
}
if (strcasecmp(ptr[i], "Context") == 0) {
if (phost->context) {
+ *errtype = TYPESYNTAX;
return SCONBAD;
}
phost->context = ptr[i+1];
@@ -444,12 +485,18 @@
i++;
i++;
}
- /* XXX: Read the default balancer name is balancer empty */
+ /* Insert or update balancer description */
+ if (insert_update_balancer(balancerstatsmem, &balancerinfo) != APR_SUCCESS) {
+ *errtype = TYPEMEM;
+ return MBALAUI;
+ }
/* Insert or update node description */
int id;
- if (insert_update_node(nodestatsmem, &nodeinfo, &id) != APR_SUCCESS)
+ if (insert_update_node(nodestatsmem, &nodeinfo, &id) != APR_SUCCESS) {
+ *errtype = TYPEMEM;
return MNODEUI;
+ }
/* Insert the Alias and corresponding Context */
phost = vhost;
@@ -465,7 +512,7 @@
/*
* Process a DUMP command.
*/
-static char * process_dump(request_rec *r, char *buff)
+static char * process_dump(request_rec *r, char *buff, int *errtype)
{
int size, i;
int *id;
@@ -507,7 +554,7 @@
}
/* Process an enable/disable/stop application message */
-static char * process_appl_cmd(request_rec *r, char *buff, int status)
+static char * process_appl_cmd(request_rec *r, char *buff, int status, int *errtype)
{
char *JVMRoute;
nodeinfo_t nodeinfo;
@@ -516,8 +563,10 @@
struct cluster_host *phost;
char **ptr = process_buff(r, buff);
- if (ptr == NULL)
+ if (ptr == NULL) {
+ *errtype = TYPESYNTAX;
return SMESPAR;
+ }
/* Map nothing by default */
vhost->host = NULL;
@@ -529,13 +578,16 @@
int i = 0;
while (ptr[i]) {
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute)) {
+ *errtype = TYPESYNTAX;
return SROUBIG;
+ }
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
nodeinfo.mess.id = 0;
}
if (strcasecmp(ptr[i], "Alias") == 0) {
if (phost->host && !phost->context) {
+ *errtype = TYPESYNTAX;
return SALIBAD;
}
if (phost->host) {
@@ -550,6 +602,7 @@
}
if (strcasecmp(ptr[i], "Context") == 0) {
if (phost->context) {
+ *errtype = TYPESYNTAX;
return SCONBAD;
}
phost->context = ptr[i+1];
@@ -560,8 +613,10 @@
/* Read the node */
node = read_node(nodestatsmem, &nodeinfo);
- if (node == NULL)
+ if (node == NULL) {
+ *errtype = TYPEMEM;
return MNODERD;
+ }
/* Read the ID of the virtual corresponding to the first Alias */
hostinfo_t hostinfo;
@@ -576,6 +631,7 @@
hostinfo.id = 0;
host = read_host(hoststatsmem, &hostinfo);
if (host == NULL) {
+ *errtype = TYPEMEM;
return MHOSTRD;
}
@@ -583,21 +639,21 @@
insert_update_contexts(contextstatsmem, phost->context, node->mess.id, host->vhost, status);
return NULL;
}
-static char * process_enable(request_rec *r, char *buff)
+static char * process_enable(request_rec *r, char *buff, int *errtype)
{
- return process_appl_cmd(r, buff, ENABLED);
+ return process_appl_cmd(r, buff, ENABLED, errtype);
}
-static char * process_disable(request_rec *r, char *buff)
+static char * process_disable(request_rec *r, char *buff, int *errtype)
{
- return process_appl_cmd(r, buff, DISABLED);
+ return process_appl_cmd(r, buff, DISABLED, errtype);
}
-static char * process_stop(request_rec *r, char *buff)
+static char * process_stop(request_rec *r, char *buff, int *errtype)
{
- return process_appl_cmd(r, buff, STOPPED);
+ return process_appl_cmd(r, buff, STOPPED, errtype);
}
-static char * process_remove(request_rec *r, char *buff)
+static char * process_remove(request_rec *r, char *buff, int *errtype)
{
- return process_appl_cmd(r, buff, REMOVE);
+ return process_appl_cmd(r, buff, REMOVE, errtype);
}
/*
@@ -617,36 +673,44 @@
* Load 0 : Standby.
* Load 1-100 : Load factor.
*/
-static char * process_status(request_rec *r, char *buff)
+static char * process_status(request_rec *r, char *buff, int *errtype)
{
int Load;
nodeinfo_t nodeinfo;
nodeinfo_t *node;
char **ptr = process_buff(r, buff);
- if (ptr == NULL)
+ if (ptr == NULL) {
+ *errtype = TYPESYNTAX;
return SMESPAR;
+ }
int i = 0;
while (ptr[i]) {
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
- if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
+ if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute)) {
+ *errtype = TYPESYNTAX;
return SROUBIG;
+ }
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
nodeinfo.mess.id = 0;
}
else if (strcasecmp(ptr[i], "Load") == 0) {
Load = atoi(ptr[i+1]);
}
- else
+ else {
+ *errtype = TYPESYNTAX;
return SBADFLD;
+ }
i++;
i++;
}
/* Read the node */
node = read_node(nodestatsmem, &nodeinfo);
- if (node == NULL)
+ if (node == NULL) {
+ *errtype = TYPEMEM;
return MNODERD;
+ }
/*
* If the node is usualable do a ping/pong to prevent Split-Brain Syndrome
@@ -729,6 +793,7 @@
{
apr_bucket_brigade *input_brigade;
char *errstring = NULL;
+ int errtype = 0;
char buff[4096];
int bufsiz=sizeof(buff);
@@ -740,29 +805,43 @@
buff[bufsiz] = '\0';
decodeenc(buff);
if (strcasecmp(r->method, "CONFIG") == 0)
- errstring = process_config(r, buff);
+ errstring = process_config(r, buff, &errtype);
/* Application handling */
else if (strcasecmp(r->method, "ENABLE-APP") == 0)
- errstring = process_enable(r, buff);
+ errstring = process_enable(r, buff, &errtype);
else if (strcasecmp(r->method, "DISABLE-APP") == 0)
- errstring = process_disable(r, buff);
+ errstring = process_disable(r, buff, &errtype);
else if (strcasecmp(r->method, "STOP-APP") == 0)
- errstring = process_stop(r, buff);
+ errstring = process_stop(r, buff, &errtype);
else if (strcasecmp(r->method, "REMOVE-APP") == 0)
- errstring = process_remove(r, buff);
+ errstring = process_remove(r, buff, &errtype);
/* Status handling */
else if (strcasecmp(r->method, "STATUS") == 0)
- errstring = process_status(r, buff);
+ errstring = process_status(r, buff, &errtype);
else if (strcasecmp(r->method, "DUMP") == 0)
- errstring = process_dump(r, buff);
+ errstring = process_dump(r, buff, &errtype);
else {
errstring = SCMDUNS;
+ errtype = TYPESYNTAX;
}
/* Check error string and build the error message */
if (errstring) {
- r->status_line = apr_psprintf(r->pool, "%3.3u %d.%d.%d \"%s\"", 500, 0, 0, 0, errstring);
- return 500;
+ r->status_line = apr_psprintf(r->pool, "ERROR");
+ apr_table_setn(r->err_headers_out, "Version", VERSION_PROTOCOL);
+ switch (errtype) {
+ case TYPESYNTAX:
+ apr_table_setn(r->err_headers_out, "Type", "SYNTAX");
+ break;
+ case TYPEMEM:
+ apr_table_setn(r->err_headers_out, "Type", "MEM");
+ break;
+ default:
+ apr_table_setn(r->err_headers_out, "Type", "GENERAL");
+ break;
+ }
+ apr_table_setn(r->err_headers_out, "Mess", errstring);
+ return 500;
}
return (OK);
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1611 - trunk/mod_cluster/test/java.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-22 07:25:43 -0400 (Thu, 22 May 2008)
New Revision: 1611
Added:
trunk/mod_cluster/test/java/CauseErrorMethod.java
trunk/mod_cluster/test/java/ConfigMethod.java
trunk/mod_cluster/test/java/DisableMethod.java
trunk/mod_cluster/test/java/DumpMethod.java
trunk/mod_cluster/test/java/EnableMethod.java
trunk/mod_cluster/test/java/InfoMethod.java
trunk/mod_cluster/test/java/RemoveMethod.java
trunk/mod_cluster/test/java/StatusMethod.java
trunk/mod_cluster/test/java/StopMethod.java
trunk/mod_cluster/test/java/TestHttpClient.java
trunk/mod_cluster/test/java/TestHttpClient.sh
Log:
Java tools using httpclient to test.
Added: trunk/mod_cluster/test/java/CauseErrorMethod.java
===================================================================
--- trunk/mod_cluster/test/java/CauseErrorMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/CauseErrorMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class CauseErrorMethod extends PostMethod {
+ public String getName() {
+ return "ERROR";
+ }
+ public CauseErrorMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/ConfigMethod.java
===================================================================
--- trunk/mod_cluster/test/java/ConfigMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/ConfigMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class ConfigMethod extends PostMethod {
+ public String getName() {
+ return "CONFIG";
+ }
+ public ConfigMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/DisableMethod.java
===================================================================
--- trunk/mod_cluster/test/java/DisableMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/DisableMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class DisableMethod extends PostMethod {
+ public String getName() {
+ return "DISABLE-APP";
+ }
+ public DisableMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/DumpMethod.java
===================================================================
--- trunk/mod_cluster/test/java/DumpMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/DumpMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class DumpMethod extends PostMethod {
+ public String getName() {
+ return "DUMP";
+ }
+ public DumpMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/EnableMethod.java
===================================================================
--- trunk/mod_cluster/test/java/EnableMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/EnableMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class EnableMethod extends PostMethod {
+ public String getName() {
+ return "ENABLE-APP";
+ }
+ public EnableMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/InfoMethod.java
===================================================================
--- trunk/mod_cluster/test/java/InfoMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/InfoMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class InfoMethod extends PostMethod {
+ public String getName() {
+ return "INFO";
+ }
+ public InfoMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/RemoveMethod.java
===================================================================
--- trunk/mod_cluster/test/java/RemoveMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/RemoveMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class RemoveMethod extends PostMethod {
+ public String getName() {
+ return "REMOVE-APP";
+ }
+ public RemoveMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/StatusMethod.java
===================================================================
--- trunk/mod_cluster/test/java/StatusMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/StatusMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class StatusMethod extends PostMethod {
+ public String getName() {
+ return "STATUS";
+ }
+ public StatusMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/StopMethod.java
===================================================================
--- trunk/mod_cluster/test/java/StopMethod.java (rev 0)
+++ trunk/mod_cluster/test/java/StopMethod.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,9 @@
+import org.apache.commons.httpclient.methods.PostMethod;
+public class StopMethod extends PostMethod {
+ public String getName() {
+ return "STOP-APP";
+ }
+ public StopMethod(String uri) {
+ super(uri);
+ }
+}
Added: trunk/mod_cluster/test/java/TestHttpClient.java
===================================================================
--- trunk/mod_cluster/test/java/TestHttpClient.java (rev 0)
+++ trunk/mod_cluster/test/java/TestHttpClient.java 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,103 @@
+import org.apache.commons.httpclient.*;
+import org.apache.commons.httpclient.methods.*;
+
+public class TestHttpClient
+{
+
+ public static String JVMRoute = System.getProperty("JVMRoute", "node1");
+ public static String Host = System.getProperty("Host", "localhost");
+ /**
+ *
+ * Usage:
+ * java TestHttpClient http://mywebserver:80/ test
+ *
+ * @param args command line arguments
+ * Argument 0 is a URL to a web server
+ * Argument 1 is the command to execute.
+ *
+ */
+ public static void main(String[] args) throws Exception
+ {
+ if (args.length != 2)
+ {
+ System.err.println("missing command line arguments");
+ System.exit(1);
+ }
+ runit(args[0], args[1]);
+ }
+ public static int runit(String URL, String command) throws Exception
+ {
+
+ HttpClient httpClient = new HttpClient();
+ PostMethod pm = null;
+ if (command.compareToIgnoreCase("ENABLE")==0) {
+ pm = (PostMethod) new EnableMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("context", "/myapp");
+ System.out.println("ENABLE");
+ }
+ else if (command.compareToIgnoreCase("DISABLE")==0) {
+ pm = (PostMethod) new DisableMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("context", "/myapp");
+ }
+ else if (command.compareToIgnoreCase("STOP")==0) {
+ pm = (PostMethod) new StopMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("context", "/myapp");
+ }
+ else if (command.compareToIgnoreCase("REMOVE")==0) {
+ pm = (PostMethod) new RemoveMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("context", "/hisapp");
+ }
+ else if (command.compareToIgnoreCase("CONFIG")==0) {
+ pm = (PostMethod) new ConfigMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("Domain", "domain1");
+ pm.addParameter("Host", Host);
+ pm.addParameter("Port", "8009");
+ pm.addParameter("Type", "ajp");
+ // pm.addParameter("Reversed", "yes");
+ pm.addParameter("Context", "/hisapp,/ourapp");
+ }
+ else if (command.compareToIgnoreCase("DUMP")==0) {
+ pm = (PostMethod) new DumpMethod(URL);
+ }
+ else if (command.compareToIgnoreCase("STATUS")==0) {
+ pm = (PostMethod) new StatusMethod(URL);
+ pm.addParameter("JVMRoute", JVMRoute);
+ pm.addParameter("Load", "50");
+ }
+ else if (command.compareToIgnoreCase("ERROR")==0) {
+ pm = (PostMethod) new CauseErrorMethod(URL);
+ }
+ else
+ pm = (PostMethod) new InfoMethod(URL);
+
+ System.out.println("Connecting to " + URL);
+
+ Integer connectionTimeout = 40000;
+ pm.getParams().setParameter("http.socket.timeout", connectionTimeout);
+ pm.getParams().setParameter("http.connection.timeout", connectionTimeout);
+ httpClient.getParams().setParameter("http.socket.timeout", connectionTimeout);
+ httpClient.getParams().setParameter("http.connection.timeout", connectionTimeout);
+
+ int httpResponseCode = 0;
+ try {
+ httpResponseCode = httpClient.executeMethod(pm);
+ System.out.println("response: " + httpResponseCode);
+ System.out.println("response: " + pm.getStatusLine());
+ if (httpResponseCode == 500) {
+ System.out.println(pm.getResponseHeader("Version"));
+ System.out.println(pm.getResponseHeader("Type"));
+ System.out.println(pm.getResponseHeader("Mess"));
+ }
+ int len = (int) pm.getResponseContentLength();
+ System.out.println("response:\n" + pm.getResponseBodyAsString(len));
+ } catch(HttpException e) {
+ e.printStackTrace();
+ }
+ return httpResponseCode;
+ }
+}
Added: trunk/mod_cluster/test/java/TestHttpClient.sh
===================================================================
--- trunk/mod_cluster/test/java/TestHttpClient.sh (rev 0)
+++ trunk/mod_cluster/test/java/TestHttpClient.sh 2008-05-22 11:25:43 UTC (rev 1611)
@@ -0,0 +1,43 @@
+#
+# Copyright 2008 Red Hat Middleware, LLC.
+# Licensed 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,i
+# 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.
+#
+CLASSES=$HOME/java/commons-httpclient-3.1/commons-httpclient-3.1.jar
+javac -classpath $CLASSES *Method.java
+javac -classpath $CLASSES:. TestHttpClient.java
+CLASSES=$CLASSES:$HOME/java/commons-logging-1.0.4/commons-logging.jar:$HOME/java/commons-codec-1.3/commons-codec-1.3.jar:.
+
+HTTPD=localhost
+JVMROUTE=node1
+HOST=localhost
+SCHEME=http
+SECURITY="-Djavax.net.ssl.trustStore=$HOME/.keystore -Djavax.net.ssl.keyStore=$HOME/CERTS/demoCA/test.p12 -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.keyStoreType=\"PKCS12\""
+
+
+# Send a CONFIG command.
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ CONFIG
+
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ DUMP
+
+# Send a ENABLE for /myapp
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ ENABLE
+
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ DUMP
+
+# Send a REMOVE for /hisapp
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ REMOVE
+
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ DUMP
+
+java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ STATUS
+
+#java ${SECURITY} -classpath $CLASSES -DJVMRoute=${JVMROUTE} -DHost=${HOST} TestHttpClient ${SCHEME}://${HTTPD}:6666/test_bla/ INFO
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1610 - trunk/mod_cluster/native/include.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-22 04:56:38 -0400 (Thu, 22 May 2008)
New Revision: 1610
Added:
trunk/mod_cluster/native/include/mod_clustersize.h
Modified:
trunk/mod_cluster/native/include/balancer.h
trunk/mod_cluster/native/include/context.h
trunk/mod_cluster/native/include/host.h
trunk/mod_cluster/native/include/node.h
Log:
Use defines for size.
Modified: trunk/mod_cluster/native/include/balancer.h
===================================================================
--- trunk/mod_cluster/native/include/balancer.h 2008-05-16 14:42:22 UTC (rev 1609)
+++ trunk/mod_cluster/native/include/balancer.h 2008-05-22 08:56:38 UTC (rev 1610)
@@ -44,12 +44,14 @@
#define MEM_T
#endif
+#include "mod_clustersize.h"
+
/* status of the balancer as read/store in httpd. */
struct balancerinfo {
- char balancer[40]; /* Name of the balancer */
+ char balancer[BALANCERSZ]; /* Name of the balancer */
int StickySession; /* 0 : Don't use, 1: Use it */
- char StickySessionCookie[30];
- char StickySessionPath[30];
+ char StickySessionCookie[COOKNAMESZ];
+ char StickySessionPath[PATHNAMESZ];
int StickySessionRemove; /* 0 : Don't remove, 1: Remove it */
int StickySessionForce; /* 0: Don't force, 1: return error */
int Timeout;
Modified: trunk/mod_cluster/native/include/context.h
===================================================================
--- trunk/mod_cluster/native/include/context.h 2008-05-16 14:42:22 UTC (rev 1609)
+++ trunk/mod_cluster/native/include/context.h 2008-05-22 08:56:38 UTC (rev 1610)
@@ -50,9 +50,11 @@
#define STOPPED 3
#define REMOVE 4 /* That status not stored but used by the logic to remove the entry */
+#include "mod_clustersize.h"
+
/* status of the context as read/store in httpd. */
struct contextinfo {
- char context[40]; /* Context where the application is mapped. */
+ char context[CONTEXTSZ]; /* Context where the application is mapped. */
int vhost; /* id of the correspond virtual host in hosts table */
int node; /* id of the correspond node in nodes table */
int status; /* status: ENABLED/DISABLED/STOPPED */
Modified: trunk/mod_cluster/native/include/host.h
===================================================================
--- trunk/mod_cluster/native/include/host.h 2008-05-16 14:42:22 UTC (rev 1609)
+++ trunk/mod_cluster/native/include/host.h 2008-05-22 08:56:38 UTC (rev 1610)
@@ -44,11 +44,13 @@
#define MEM_T
#endif
+#include "mod_clustersize.h"
+
/* status of the host as read/store in httpd. */
struct hostinfo {
- char host[40]; /* Alias element of the virtual host */
- int vhost; /* id of the correspond virtual host */
- int node; /* id of the node containing the virtual host */
+ char host[HOSTALIASZ]; /* Alias element of the virtual host */
+ int vhost; /* id of the correspond virtual host */
+ int node; /* id of the node containing the virtual host */
unsigned long updatetime; /* time of last received message */
int id; /* id in table */
Added: trunk/mod_cluster/native/include/mod_clustersize.h
===================================================================
--- trunk/mod_cluster/native/include/mod_clustersize.h (rev 0)
+++ trunk/mod_cluster/native/include/mod_clustersize.h 2008-05-22 08:56:38 UTC (rev 1610)
@@ -0,0 +1,48 @@
+/*
+ * mod_cluster
+ *
+ * Copyright(c) 2008 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision$
+ */
+#ifndef MOD_CLUSTERSIZE_H
+#define MOD_CLUSTERSIZE_H
+
+/* For host.h */
+#define HOSTALIASZ 40
+
+/* For context.h */
+#define CONTEXTSZ 40
+
+/* For node.h */
+#define BALANCERSZ 40
+#define JVMROUTESZ 80
+#define DOMAINNDSZ 20
+#define HOSTNODESZ 64
+#define PORTNODESZ 7
+#define SCHEMENDSZ 6
+
+/* For balancer.h */
+#define COOKNAMESZ 30
+#define PATHNAMESZ 30
+
+#endif /* MOD_CLUSTERSIZE_H */
Modified: trunk/mod_cluster/native/include/node.h
===================================================================
--- trunk/mod_cluster/native/include/node.h 2008-05-16 14:42:22 UTC (rev 1609)
+++ trunk/mod_cluster/native/include/node.h 2008-05-22 08:56:38 UTC (rev 1610)
@@ -44,14 +44,16 @@
#define MEM_T
#endif
+#include "mod_clustersize.h"
+
/* configuration of the node received from jboss cluster. */
struct nodemess {
- char balancer[40]; /* name of the balancer */
- char JVMRoute[20];
- char Domain[20];
- char Host[64];
- char Port[7];
- char Type[6];
+ char balancer[BALANCERSZ]; /* name of the balancer */
+ char JVMRoute[JVMROUTESZ];
+ char Domain[DOMAINNDSZ];
+ char Host[HOSTNODESZ];
+ char Port[PORTNODESZ];
+ char Type[SCHEMENDSZ];
int reversed; /* 1 : reversed... 0 : normal */
/* node conf part */
@@ -61,8 +63,6 @@
int smax;
int ttl;
- char strtime[8]; /* date when send by the node */
-
/* part updated in httpd */
int id; /* id in table and worker id */
};
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1609 - sandbox/httpd/src.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-16 10:42:22 -0400 (Fri, 16 May 2008)
New Revision: 1609
Added:
sandbox/httpd/src/patch.reversed.txt.r657083
Log:
Patch to get the reversed logic to work.
Added: sandbox/httpd/src/patch.reversed.txt.r657083
===================================================================
--- sandbox/httpd/src/patch.reversed.txt.r657083 (rev 0)
+++ sandbox/httpd/src/patch.reversed.txt.r657083 2008-05-16 14:42:22 UTC (rev 1609)
@@ -0,0 +1,212 @@
+Index: modules/proxy/mod_proxy_ajp.c
+===================================================================
+--- modules/proxy/mod_proxy_ajp.c (revision 657083)
++++ modules/proxy/mod_proxy_ajp.c (working copy)
+@@ -495,6 +495,7 @@
+ apr_port_t proxyport)
+ {
+ int status;
++ apr_status_t rv;
+ char server_portstr[32];
+ conn_rec *origin = NULL;
+ proxy_conn_rec *backend = NULL;
+@@ -554,7 +555,12 @@
+ goto cleanup;
+
+ /* Step Two: Make the Connection */
+- if (ap_proxy_connect_backend(scheme, backend, worker, r->server)) {
++ if (worker->opaque) {
++ rv = ap_proxy_accept_backend(scheme, backend, worker, r->server);
++ } else {
++ rv = ap_proxy_connect_backend(scheme, backend, worker, r->server);
++ }
++ if (rv) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ "proxy: AJP: failed to make connection to backend: %s",
+ backend->hostname);
+Index: modules/proxy/proxy_util.c
+===================================================================
+--- modules/proxy/proxy_util.c (revision 657083)
++++ modules/proxy/proxy_util.c (working copy)
+@@ -2139,6 +2139,135 @@
+ }
+ #endif /* USE_ALTERNATE_IS_CONNECTED */
+
++/*
++ * Accept a connection from the backend server
++ */
++PROXY_DECLARE(int) ap_proxy_accept_backend(const char *proxy_function,
++ proxy_conn_rec *conn,
++ proxy_worker *worker,
++ server_rec *s)
++{
++ apr_status_t rv;
++ int connected = 0;
++ int loglevel;
++ apr_sockaddr_t *backend_addr = conn->addr;
++ apr_socket_t *newsock;
++ void *sconf = s->module_config;
++ proxy_server_conf *conf =
++ (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
++
++ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
++ "ap_proxy_accept_backend");
++ if (conn->sock) {
++ /*
++ * This increases the connection pool size
++ * but the number of dropped connections is
++ * relatively small compared to connection lifetime
++ */
++ if (!(connected = is_socket_connected(conn->sock))) {
++ apr_socket_close(conn->sock);
++ conn->sock = NULL;
++ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
++ "proxy: %s: backend socket is disconnected.",
++ proxy_function);
++ }
++ }
++
++ /* If we aren't connected we have to accept a connection */
++ while (!connected) {
++ if ((rv = apr_socket_accept(&newsock, worker->opaque,
++ conn->pool)) != APR_SUCCESS) {
++ loglevel = backend_addr->next ? APLOG_DEBUG : APLOG_ERR;
++ ap_log_error(APLOG_MARK, loglevel, rv, s,
++ "proxy: %s: error creating fam %d socket for target %s",
++ proxy_function,
++ backend_addr->family,
++ worker->hostname);
++ /*
++ * XXX: We loop... But that is a just a test...
++ */
++ continue;
++ }
++
++#if !defined(TPF) && !defined(BEOS)
++ if (worker->recv_buffer_size > 0 &&
++ (rv = apr_socket_opt_set(newsock, APR_SO_RCVBUF,
++ worker->recv_buffer_size))) {
++ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
++ "apr_socket_opt_set(SO_RCVBUF): Failed to set "
++ "ProxyReceiveBufferSize, using default");
++ }
++#endif
++
++ rv = apr_socket_opt_set(newsock, APR_TCP_NODELAY, 1);
++ if (rv != APR_SUCCESS && rv != APR_ENOTIMPL) {
++ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
++ "apr_socket_opt_set(APR_TCP_NODELAY): "
++ "Failed to set");
++ }
++
++ /* Set a timeout on the socket */
++ if (worker->timeout_set == 1) {
++ apr_socket_timeout_set(newsock, worker->timeout);
++ }
++ else if (conf->timeout_set == 1) {
++ apr_socket_timeout_set(newsock, conf->timeout);
++ }
++ else {
++ apr_socket_timeout_set(newsock, s->timeout);
++ }
++ /* Set a keepalive option */
++ if (worker->keepalive) {
++ if ((rv = apr_socket_opt_set(newsock,
++ APR_SO_KEEPALIVE, 1)) != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_ERR, rv, s,
++ "apr_socket_opt_set(SO_KEEPALIVE): Failed to set"
++ " Keepalive");
++ }
++ }
++ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
++ "proxy: %s: fam %d socket created to connect to %s",
++ proxy_function, backend_addr->family, worker->hostname);
++
++ /* if an error occurred, loop round and try again */
++ if (rv != APR_SUCCESS) {
++ apr_socket_close(newsock);
++ loglevel = backend_addr->next ? APLOG_DEBUG : APLOG_ERR;
++ ap_log_error(APLOG_MARK, loglevel, rv, s,
++ "proxy: %s: attempt to connect to %pI (%s) failed",
++ proxy_function,
++ backend_addr,
++ worker->hostname);
++ backend_addr = backend_addr->next;
++ continue;
++ }
++
++ conn->sock = newsock;
++ connected = 1;
++ }
++ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s,
++ "ap_proxy_accept_backend: CONNECTED");
++ /*
++ * Put the entire worker to error state if
++ * the PROXY_WORKER_IGNORE_ERRORS flag is not set.
++ * Altrough some connections may be alive
++ * no further connections to the worker could be made
++ */
++ if (!connected && PROXY_WORKER_IS_USABLE(worker) &&
++ !(worker->s->status & PROXY_WORKER_IGNORE_ERRORS)) {
++ worker->s->status |= PROXY_WORKER_IN_ERROR;
++ worker->s->error_time = apr_time_now();
++ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
++ "ap_proxy_connect_backend disabling worker for (%s)",
++ worker->hostname);
++ }
++ else {
++ worker->s->error_time = 0;
++ worker->s->retries = 0;
++ }
++ return connected ? OK : DECLINED;
++}
++
+ PROXY_DECLARE(int) ap_proxy_connect_backend(const char *proxy_function,
+ proxy_conn_rec *conn,
+ proxy_worker *worker,
+Index: modules/proxy/mod_proxy.c
+===================================================================
+--- modules/proxy/mod_proxy.c (revision 657083)
++++ modules/proxy/mod_proxy.c (working copy)
+@@ -415,6 +415,8 @@
+ (proxy_server_conf *) ap_get_module_config(sconf, &proxy_module);
+
+ /* Ick... msvc (perhaps others) promotes ternary short results to int */
++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server,
++ "proxy_detect");
+
+ if (conf->req && r->parsed_uri.scheme) {
+ /* but it might be something vhosted */
+@@ -453,6 +455,8 @@
+ char *found = NULL;
+ int mismatch = 0;
+
++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server,
++ "proxy_trans");
+ if (r->proxyreq) {
+ /* someone has already set up the proxy, it was possibly ourselves
+ * in proxy_detect
+@@ -690,6 +694,8 @@
+ struct dirconn_entry *list = (struct dirconn_entry *)conf->dirconn->elts;
+
+ /* is this for us? */
++ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server,
++ "proxy_handler %s %d %s", r->handler, r->proxyreq, r->filename);
+ if (!r->proxyreq || !r->filename || strncmp(r->filename, "proxy:", 6) != 0)
+ return DECLINED;
+
+Index: modules/proxy/mod_proxy.h
+===================================================================
+--- modules/proxy/mod_proxy.h (revision 657083)
++++ modules/proxy/mod_proxy.h (working copy)
+@@ -701,6 +701,10 @@
+ proxy_conn_rec *conn,
+ proxy_worker *worker,
+ server_rec *s);
++PROXY_DECLARE(int) ap_proxy_accept_backend(const char *proxy_function,
++ proxy_conn_rec *conn,
++ proxy_worker *worker,
++ server_rec *s);
+ /**
+ * Make a connection record for backend connection
+ * @param proxy_function calling proxy scheme (http, ajp, ...)
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1608 - trunk/mod_cluster/native/mod_manager.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-16 05:04:09 -0400 (Fri, 16 May 2008)
New Revision: 1608
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Arrange the error messages.
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-15 14:57:35 UTC (rev 1607)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-16 09:04:09 UTC (rev 1608)
@@ -50,6 +50,23 @@
#define DEFMAXNODE 10
#define DEFMAXHOST 20
+/* Error messages */
+#define SMESPAR "SYNTAX: Can't parse message"
+#define SBALBIG "SYNTAX: Balancer field too big"
+#define SROUBIG "SYNTAX: JVMRoute field too big"
+#define SDOMBIG "SYNTAX: Domain field too big"
+#define SHOSBIG "SYNTAX: Host field too big"
+#define SPORBIG "SYNTAX: Port field too big"
+#define STYPBIG "SYNTAX: Type field too big"
+#define SALIBAD "SYNTAX: Alias without Context"
+#define SCONBAD "SYNTAX: Context without Alias"
+#define SBADFLD "SYNTAX: Invalid field name in message"
+#define SCMDUNS "SYNTAX: Command is not supported"
+
+#define MNODEUI "MEM: Can't update or insert node"
+#define MNODERD "MEM: Can't read node"
+#define MHOSTRD "MEM: Can't read host alias"
+
/* shared memory */
mem_t *contextstatsmem = NULL;
mem_t *nodestatsmem = NULL;
@@ -341,7 +358,7 @@
* Context corresponding to the applications.
* Context: <context list>
*/
-static int process_config(request_rec *r, char *buff)
+static char * process_config(request_rec *r, char *buff)
{
/* Process the node description */
nodeinfo_t nodeinfo;
@@ -357,7 +374,7 @@
char **ptr = process_buff(r, buff);
if (ptr == NULL)
- return 500;
+ return SMESPAR;
vhost = apr_palloc(r->pool, sizeof(struct cluster_host));
/* Map nothing by default */
@@ -371,32 +388,32 @@
while (ptr[i]) {
if (strcasecmp(ptr[i], "Balancer") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.balancer))
- return 500;
+ return SBALBIG;
strcpy(nodeinfo.mess.balancer, ptr[i+1]);
}
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
- return 500;
+ return SROUBIG;
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Domain") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Domain))
- return 500;
+ return SDOMBIG;
strcpy(nodeinfo.mess.Domain, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Host") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Host))
- return 500;
+ return SHOSBIG;
strcpy(nodeinfo.mess.Host, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Port") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Port))
- return 500;
+ return SPORBIG;
strcpy(nodeinfo.mess.Port, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Type") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.Type))
- return 500;
+ return STYPBIG;
strcpy(nodeinfo.mess.Type, ptr[i+1]);
}
if (strcasecmp(ptr[i], "Reversed") == 0) {
@@ -406,7 +423,7 @@
}
if (strcasecmp(ptr[i], "Alias") == 0) {
if (phost->host && !phost->context) {
- return 500;
+ return SALIBAD;
}
if (phost->host) {
phost->next = apr_palloc(r->pool, sizeof(struct cluster_host));
@@ -420,7 +437,7 @@
}
if (strcasecmp(ptr[i], "Context") == 0) {
if (phost->context) {
- return 500;
+ return SCONBAD;
}
phost->context = ptr[i+1];
}
@@ -432,7 +449,7 @@
/* Insert or update node description */
int id;
if (insert_update_node(nodestatsmem, &nodeinfo, &id) != APR_SUCCESS)
- return 500;
+ return MNODEUI;
/* Insert the Alias and corresponding Context */
phost = vhost;
@@ -443,12 +460,12 @@
phost = phost->next;
vid++;
}
- return OK;
+ return NULL;
}
/*
* Process a DUMP command.
*/
-static int process_dump(request_rec *r, char *buff)
+static char * process_dump(request_rec *r, char *buff)
{
int size, i;
int *id;
@@ -486,11 +503,11 @@
ou->vhost, ou->node,
ou->status);
}
- return OK;
+ return NULL;
}
/* Process an enable/disable/stop application message */
-static int process_appl_cmd(request_rec *r, char *buff, int status)
+static char * process_appl_cmd(request_rec *r, char *buff, int status)
{
char *JVMRoute;
nodeinfo_t nodeinfo;
@@ -500,7 +517,7 @@
char **ptr = process_buff(r, buff);
if (ptr == NULL)
- return 500;
+ return SMESPAR;
/* Map nothing by default */
vhost->host = NULL;
@@ -513,13 +530,13 @@
while (ptr[i]) {
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
- return 500;
+ return SROUBIG;
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
nodeinfo.mess.id = 0;
}
if (strcasecmp(ptr[i], "Alias") == 0) {
if (phost->host && !phost->context) {
- return 500;
+ return SALIBAD;
}
if (phost->host) {
phost->next = apr_palloc(r->pool, sizeof(struct cluster_host));
@@ -533,7 +550,7 @@
}
if (strcasecmp(ptr[i], "Context") == 0) {
if (phost->context) {
- return 500;
+ return SCONBAD;
}
phost->context = ptr[i+1];
}
@@ -544,7 +561,7 @@
/* Read the node */
node = read_node(nodestatsmem, &nodeinfo);
if (node == NULL)
- return 500;
+ return MNODERD;
/* Read the ID of the virtual corresponding to the first Alias */
hostinfo_t hostinfo;
@@ -559,26 +576,26 @@
hostinfo.id = 0;
host = read_host(hoststatsmem, &hostinfo);
if (host == NULL) {
- return 500;
+ return MHOSTRD;
}
/* Now update each context from Context: part */
insert_update_contexts(contextstatsmem, phost->context, node->mess.id, host->vhost, status);
- return OK;
+ return NULL;
}
-static int process_enable(request_rec *r, char *buff)
+static char * process_enable(request_rec *r, char *buff)
{
return process_appl_cmd(r, buff, ENABLED);
}
-static int process_disable(request_rec *r, char *buff)
+static char * process_disable(request_rec *r, char *buff)
{
return process_appl_cmd(r, buff, DISABLED);
}
-static int process_stop(request_rec *r, char *buff)
+static char * process_stop(request_rec *r, char *buff)
{
return process_appl_cmd(r, buff, STOPPED);
}
-static int process_remove(request_rec *r, char *buff)
+static char * process_remove(request_rec *r, char *buff)
{
return process_appl_cmd(r, buff, REMOVE);
}
@@ -600,20 +617,20 @@
* Load 0 : Standby.
* Load 1-100 : Load factor.
*/
-static int process_status(request_rec *r, char *buff)
+static char * process_status(request_rec *r, char *buff)
{
int Load;
nodeinfo_t nodeinfo;
nodeinfo_t *node;
char **ptr = process_buff(r, buff);
if (ptr == NULL)
- return 500;
+ return SMESPAR;
int i = 0;
while (ptr[i]) {
if (strcasecmp(ptr[i], "JVMRoute") == 0) {
if (strlen(ptr[i+1])>=sizeof(nodeinfo.mess.JVMRoute))
- return 500;
+ return SROUBIG;
strcpy(nodeinfo.mess.JVMRoute, ptr[i+1]);
nodeinfo.mess.id = 0;
}
@@ -621,7 +638,7 @@
Load = atoi(ptr[i+1]);
}
else
- return 500;
+ return SBADFLD;
i++;
i++;
}
@@ -629,7 +646,7 @@
/* Read the node */
node = read_node(nodestatsmem, &nodeinfo);
if (node == NULL)
- return 500;
+ return MNODERD;
/*
* If the node is usualable do a ping/pong to prevent Split-Brain Syndrome
@@ -648,7 +665,7 @@
ap_rprintf(r, "&id=%d", ap_scoreboard_image->global->restart_time);
ap_rprintf(r, "\n");
- return OK;
+ return NULL;
}
/*
@@ -695,6 +712,8 @@
ours = 1;
else if (strcasecmp(r->method, "DUMP") == 0)
ours = 1;
+ else if (strcasecmp(r->method, "ERROR") == 0)
+ ours = 1;
if (ours) {
/* The method one of ours */
r->handler = "mod-cluster";
@@ -709,8 +728,10 @@
static int manager_handler(request_rec *r)
{
apr_bucket_brigade *input_brigade;
+ char *errstring = NULL;
char buff[4096];
int bufsiz=sizeof(buff);
+
if (strcmp(r->handler, "mod-cluster"))
return DECLINED;
input_brigade = apr_brigade_create(r->connection->pool, r->connection->bucket_alloc);
@@ -719,24 +740,28 @@
buff[bufsiz] = '\0';
decodeenc(buff);
if (strcasecmp(r->method, "CONFIG") == 0)
- return(process_config(r, buff));
+ errstring = process_config(r, buff);
/* Application handling */
else if (strcasecmp(r->method, "ENABLE-APP") == 0)
- return(process_enable(r, buff));
+ errstring = process_enable(r, buff);
else if (strcasecmp(r->method, "DISABLE-APP") == 0)
- return(process_disable(r, buff));
+ errstring = process_disable(r, buff);
else if (strcasecmp(r->method, "STOP-APP") == 0)
- return(process_stop(r, buff));
+ errstring = process_stop(r, buff);
else if (strcasecmp(r->method, "REMOVE-APP") == 0)
- return(process_remove(r, buff));
+ errstring = process_remove(r, buff);
/* Status handling */
else if (strcasecmp(r->method, "STATUS") == 0)
- return(process_status(r, buff));
+ errstring = process_status(r, buff);
else if (strcasecmp(r->method, "DUMP") == 0)
- return(process_dump(r, buff));
+ errstring = process_dump(r, buff);
else {
- /* The command is not supported */
- r->status_line = apr_psprintf(r->pool, "%3.3u VERSION %d.%d.%d", 500, 0, 0, 0);
+ errstring = SCMDUNS;
+ }
+
+ /* Check error string and build the error message */
+ if (errstring) {
+ r->status_line = apr_psprintf(r->pool, "%3.3u %d.%d.%d \"%s\"", 500, 0, 0, 0, errstring);
return 500;
}
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1607 - trunk/mod_cluster/native/mod_proxy_cluster.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-15 10:57:35 -0400 (Thu, 15 May 2008)
New Revision: 1607
Added:
trunk/mod_cluster/native/mod_proxy_cluster/.deps
trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in
trunk/mod_cluster/native/mod_proxy_cluster/buildconf
trunk/mod_cluster/native/mod_proxy_cluster/configure.in
trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
Log:
mod_proxy balancer part of mod_cluster.
Added: trunk/mod_cluster/native/mod_proxy_cluster/.deps
===================================================================
Added: trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in (rev 0)
+++ trunk/mod_cluster/native/mod_proxy_cluster/Makefile.in 2008-05-15 14:57:35 UTC (rev 1607)
@@ -0,0 +1,30 @@
+#
+# Copyright 2006 Red Hat Middleware, LLC.
+# Licensed 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,i
+# 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.
+
+APACHE_BASE = @APACHE_BASE@
+top_builddir = @APACHE_BASE@
+# For .deps.
+builddir = @CLUSTER_BASE@
+
+MOD_OBJS_LO=
+
+include $(APACHE_BASE)/build/rules.mk
+SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) -I../include -prefer-pic -c $< && touch $@
+
+all: mod_proxy_cluster.so
+
+mod_proxy_cluster.so: mod_proxy_cluster.la
+ $(APACHE_BASE)/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_proxy_cluster.la `pwd`
+
+mod_proxy_cluster.la: mod_proxy_cluster.slo
+ $(SH_LINK) -rpath $(libexecdir) -module -avoid-version mod_proxy_cluster.lo $(MOD_OBJS_LO)
Added: trunk/mod_cluster/native/mod_proxy_cluster/buildconf
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/buildconf (rev 0)
+++ trunk/mod_cluster/native/mod_proxy_cluster/buildconf 2008-05-15 14:57:35 UTC (rev 1607)
@@ -0,0 +1,11 @@
+# Remove aclocal.m4 as it'll break some builds...
+rm -rf aclocal.m4 autom4te*.cache
+
+echo "Creating configure ..."
+### do some work to toss config.cache?
+if ${AUTOCONF:-autoconf}; then
+ :
+else
+ echo "autoconf failed"
+ exit 1
+fi
Added: trunk/mod_cluster/native/mod_proxy_cluster/configure.in
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/configure.in (rev 0)
+++ trunk/mod_cluster/native/mod_proxy_cluster/configure.in 2008-05-15 14:57:35 UTC (rev 1607)
@@ -0,0 +1,24 @@
+dnl configure for mod_manager
+dnl
+
+AC_INIT(mod_proxy_cluster.c)
+
+AC_MSG_CHECKING(for Apache httpd installation)
+AC_ARG_WITH(apache,
+[ --with-apache[=DIR] DIR is the apache base installation
+],
+[ if test "$withval" = "yes"; then
+ withval=/usr/local/etc/httpd
+ fi
+ if test "$withval" != "no"; then
+ APACHE_BASE=$withval
+ else
+ AC_MSG_ERROR(mod_manager need a valid apache location)
+ fi
+],
+[ AC_MSG_ERROR(Please use --with-apache[=DIR])])
+CLUSTER_BASE=`pwd`
+
+AC_SUBST(APACHE_BASE)
+AC_SUBST(CLUSTER_BASE)
+AC_OUTPUT(Makefile)
Added: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c
===================================================================
--- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c (rev 0)
+++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2008-05-15 14:57:35 UTC (rev 1607)
@@ -0,0 +1,1289 @@
+/*
+ * mod_cluster
+ *
+ * Copyright(c) 2008 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision$
+ */
+
+#include "apr_strings.h"
+
+#include "httpd.h"
+#include "http_config.h"
+#include "http_log.h"
+#include "http_main.h"
+#include "http_request.h"
+#include "http_protocol.h"
+#include "http_core.h"
+#include "mod_proxy.h"
+
+#include "mod_proxy_cluster.h"
+
+#include "slotmem.h"
+
+#include "node.h"
+#include "host.h"
+#include "context.h"
+#include "balancer.h"
+
+static struct node_storage_method *node_storage = NULL;
+static struct host_storage_method *host_storage = NULL;
+static struct context_storage_method *context_storage = NULL;
+static struct balancer_storage_method *balancer_storage = NULL;
+
+/*
+ * XXX: Should use the proxy_util.c one?.
+ */
+static void my_ap_proxy_add_worker_to_balancer(apr_pool_t *pool, proxy_balancer *balancer,
+ proxy_worker *worker)
+{
+ proxy_worker *runtime;
+
+ runtime = apr_array_push(balancer->workers);
+ memcpy(runtime, worker, sizeof(proxy_worker));
+ /* Increase the total runtime count */
+ proxy_lb_workers++;
+
+}
+
+/*
+ * Create/Get the worker before using it
+ */
+static void create_worker(proxy_server_conf *conf, proxy_balancer *balancer,
+ server_rec *server, proxy_worker **worker,
+ nodeinfo_t *node)
+{
+ char url[6+64+7+4]; /* Type :// Host : Port */
+
+ /* build the name (scheme and port) when needed */
+ strcpy(url, node->mess.Type);
+ strcat(url, "://");
+ strcat(url, node->mess.Host);
+ strcat(url, ":");
+ strcat(url, node->mess.Port);
+
+ *worker = ap_proxy_get_worker(conf->pool, conf, url);
+ if (*worker == NULL) {
+ char *ptr;
+ proxy_worker *proxy_worker;
+
+ /* creates it */
+ const char *err = ap_proxy_add_worker(worker, conf->pool, conf, url);
+ if (err) {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server,
+ "Created: worker for %s failed: %s", url, err);
+ return;
+ }
+ proxy_worker = (struct proxy_worker *) *worker;
+ /* Get the shared memory for this worker */
+ ptr = (char *) node;
+ ptr = ptr + node->offset;
+ proxy_worker->s = (proxy_worker_stat *) ptr;
+ proxy_worker->id = node->mess.id;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server,
+ "Created: worker for %s", url);
+ /*
+ * XXX: The Shared datastatus may already contains a valid information
+ */
+ if (!proxy_worker->s->status)
+ proxy_worker->s->status = PROXY_WORKER_INITIALIZED;
+
+ my_ap_proxy_add_worker_to_balancer(conf->pool, balancer, *worker);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server,
+ "Created: worker for %s %d (status): %d", url, proxy_worker->id, proxy_worker->s->status);
+
+ /* XXX: it may be already filled... */
+ strncpy(proxy_worker->s->route, node->mess.JVMRoute, PROXY_WORKER_MAX_ROUTE_SIZ);
+ proxy_worker->s->route[PROXY_WORKER_MAX_ROUTE_SIZ] = '\0';
+ /* XXX: We need that information from TC */
+ proxy_worker->s->redirect[0] = '\0';
+ }
+}
+/*
+ * Create workers corresponding to newer nodes.
+ */
+static void create_workers_node(proxy_server_conf *conf, apr_pool_t *pool, server_rec *server)
+{
+ int *ids, num;
+
+ /* read the ident of the nodes */
+
+ ids = apr_pcalloc(pool, sizeof(int) * node_storage->get_max_size_node());
+ num = node_storage->get_ids_used_node(ids);
+ /* XXX: How to skip the balancer that aren't controled by mod_manager */
+ if (conf->workers->nelts<num) {
+ /* There are more workers in shared area than in the local tables */
+ proxy_worker *worker;
+ int i, j;
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server,
+ "create_workers_node starting");
+ worker = (proxy_worker *)conf->workers->elts;
+ for (i = 0; i < conf->workers->nelts; i++) {
+ /* check the id against the table of used ids */
+ for (j=0; j<num; j++) {
+ if (worker->id == ids[j]) {
+ ids[j] = 0;
+ break;
+ }
+ }
+ worker++;
+ }
+ /* create the workers */
+ for (j=0; j<num; j++) {
+ if (ids[j]) {
+ /* read the node and create the worker */
+ nodeinfo_t *node;
+ if (node_storage->read_node(ids[j], &node) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server,
+ "create_workers_node can't read id %d", ids[j]);
+ continue;
+ }
+ char *name = apr_pstrcat(pool, "cluster://", node->mess.balancer, NULL);
+ proxy_balancer *balancer = ap_proxy_get_balancer(pool, conf, name);
+ if (!balancer) {
+ /* Create one */
+ ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server,
+ "create_workers_node: Create balancer %s", name);
+ balancer = apr_array_push(conf->balancers);
+ memset(balancer, 0, sizeof(proxy_balancer));
+ balancer->name = apr_pstrdup(conf->pool, name);
+ balancer->lbmethod = ap_lookup_provider(PROXY_LBMETHOD, "cluster_bytraffic", "0");
+ balancer->workers = apr_array_make(conf->pool, 5, sizeof(proxy_worker));
+ /* XXX Is this a right place to create mutex */
+#if APR_HAS_THREADS
+ if (apr_thread_mutex_create(&(balancer->mutex),
+ APR_THREAD_MUTEX_DEFAULT, conf->pool) != APR_SUCCESS) {
+ /* XXX: Do we need to log something here */
+ ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server,
+ "create_workers_node: Can't create lock for balancer");
+ }
+#endif
+ }
+ if (balancer) {
+ create_worker(conf, balancer, server, &worker, node);
+ } else {
+ ap_log_error(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, server,
+ "create_workers_node: Can't find balancer");
+ }
+ }
+ }
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, server,
+ "create_workers_node done");
+ }
+}
+
+/* reslist constructor */
+/* XXX: Should use the proxy_util one. */
+static apr_status_t connection_constructor(void **resource, void *params,
+ apr_pool_t *pool)
+{
+ apr_pool_t *ctx;
+ proxy_conn_rec *conn;
+ proxy_worker *worker = (proxy_worker *)params;
+
+ /*
+ * Create the subpool for each connection
+ * This keeps the memory consumption constant
+ * when disconnecting from backend.
+ */
+ apr_pool_create(&ctx, pool);
+ conn = apr_pcalloc(pool, sizeof(proxy_conn_rec));
+
+ conn->pool = ctx;
+ conn->worker = worker;
+#if APR_HAS_THREADS
+ conn->inreslist = 1;
+#endif
+ *resource = conn;
+
+ return APR_SUCCESS;
+}
+
+/* connection cleanup routine */
+/* XXX: Should use the proxy_util one. */
+static apr_status_t connection_cleanup(void *theconn)
+{
+ proxy_conn_rec *conn = (proxy_conn_rec *)theconn;
+ proxy_worker *worker = conn->worker;
+
+ /*
+ * If the connection pool is NULL the worker
+ * cleanup has been run. Just return.
+ */
+ if (!worker->cp) {
+ return APR_SUCCESS;
+ }
+
+#if APR_HAS_THREADS
+ /* Sanity check: Did we already return the pooled connection? */
+ if (conn->inreslist) {
+ ap_log_perror(APLOG_MARK, APLOG_ERR, 0, conn->pool,
+ "proxy: Pooled connection 0x%pp for worker %s has been"
+ " already returned to the connection pool.", conn,
+ worker->name);
+ return APR_SUCCESS;
+ }
+#endif
+
+ /* determine if the connection need to be closed */
+ if (conn->close_on_recycle || conn->close) {
+ apr_pool_t *p = conn->pool;
+ apr_pool_clear(conn->pool);
+ memset(conn, 0, sizeof(proxy_conn_rec));
+ conn->pool = p;
+ conn->worker = worker;
+ }
+#if APR_HAS_THREADS
+ if (worker->hmax && worker->cp->res) {
+ conn->inreslist = 1;
+ apr_reslist_release(worker->cp->res, (void *)conn);
+ }
+ else
+#endif
+ {
+ worker->cp->conn = conn;
+ }
+
+ /* Always return the SUCCESS */
+ return APR_SUCCESS;
+}
+
+/* Retrieve the parameter with the given name
+ * Something like 'JSESSIONID=12345...N'
+ * XXX: Should use the mod_proxy_balancer ones.
+ */
+static char *get_path_param(apr_pool_t *pool, char *url,
+ const char *name)
+{
+ char *path = NULL;
+
+ for (path = strstr(url, name); path; path = strstr(path + 1, name)) {
+ path += strlen(name);
+ if (*path == '=') {
+ /*
+ * Session path was found, get it's value
+ */
+ ++path;
+ if (strlen(path)) {
+ char *q;
+ path = apr_strtok(apr_pstrdup(pool, path), "?&", &q);
+ return path;
+ }
+ }
+ }
+ return NULL;
+}
+
+static char *get_cookie_param(request_rec *r, const char *name)
+{
+ const char *cookies;
+ const char *start_cookie;
+
+ if ((cookies = apr_table_get(r->headers_in, "Cookie"))) {
+ for (start_cookie = ap_strstr_c(cookies, name); start_cookie;
+ start_cookie = ap_strstr_c(start_cookie + 1, name)) {
+ if (start_cookie == cookies ||
+ start_cookie[-1] == ';' ||
+ start_cookie[-1] == ',' ||
+ isspace(start_cookie[-1])) {
+
+ start_cookie += strlen(name);
+ while(*start_cookie && isspace(*start_cookie))
+ ++start_cookie;
+ if (*start_cookie == '=' && start_cookie[1]) {
+ /*
+ * Session cookie was found, get it's value
+ */
+ char *end_cookie, *cookie;
+ ++start_cookie;
+ cookie = apr_pstrdup(r->pool, start_cookie);
+ if ((end_cookie = strchr(cookie, ';')) != NULL)
+ *end_cookie = '\0';
+ if((end_cookie = strchr(cookie, ',')) != NULL)
+ *end_cookie = '\0';
+ return cookie;
+ }
+ }
+ }
+ }
+ return NULL;
+}
+
+/*
+ * Check that the request has a sessionid (even invalid)
+ */
+static int hassession(request_rec *r, proxy_balancer *balancer)
+{
+ char *route;
+ char *uri = r->filename + 6;
+ char *sticky_path, *sticky, *path;
+
+ if (balancer->sticky == NULL)
+ return 0;
+
+ /* for 2.2.x the sticky parameter may contain 2 values */
+ sticky = sticky_path = apr_pstrdup(r->pool, balancer->sticky);
+ if ((path = strchr(sticky, '|'))) {
+ *path++ = '\0';
+ sticky_path = path;
+ }
+ route = get_path_param(r->pool, uri , sticky_path);
+ if (route == NULL)
+ route = get_cookie_param(r, sticky);
+ if (route) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "mod_proxy_cluster: found route %s", route);
+ return 1;
+ }
+ return 0;
+}
+
+/*
+ * Check that the worker will handle the host/context.
+ * The id of the worker is used to find the (slot) node in the shared
+ * memory.
+ */
+static int iscontext_host_ok(request_rec *r, proxy_balancer *balancer,
+ proxy_worker *worker)
+{
+ nodeinfo_t *node;
+
+ node_storage->read_node(worker->id, &node);
+
+ /*
+ * check the hosts and contexts
+ * A node may have several virtual hosts and
+ * each virtual hosts may have several context
+ */
+ int sizevhost = host_storage->get_max_size_host();
+ int *vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost);
+ sizevhost = host_storage->get_ids_used_host(vhosts);
+ int i;
+ for (i=0; i<sizevhost; i++) {
+ hostinfo_t *vhost;
+ host_storage->read_host(vhosts[i], &vhost);
+ if (vhost->node == node->mess.id) {
+ /* XXX Check the virtual host */
+
+ /* Check the contexts */
+ int sizecontext = context_storage->get_max_size_context();
+ int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext);
+ sizecontext = context_storage->get_ids_used_context(contexts);
+ int j;
+ for (j=0; j<sizecontext; j++) {
+ contextinfo_t *context;
+ context_storage->read_context(contexts[j], &context);
+ if (context->vhost != vhost->vhost)
+ continue;
+
+ /* check for /context[/] in the URL */
+ int len = strlen(context->context);
+ if (strncmp(r->uri, context->context, len) == 0) {
+ if (r->uri[len] == '\0' || r->uri[len] == '/') {
+ /* Check status */
+ switch (context->status)
+ {
+ case ENABLED:
+ return 1;
+ break;
+ case DISABLED:
+ /* Only the request with sessionid ok for it */
+ if (hassession(r, balancer))
+ return 1;
+ break;
+ }
+ }
+ }
+ }
+
+ }
+ }
+ return 0;
+}
+
+/*
+ * Check that the request has a sessionid (even invalid)
+ * Use the name of the balancer.
+ */
+static int hassession_byname(request_rec *r, char *balancer_name, proxy_server_conf *conf)
+{
+ proxy_balancer *balancer;
+ char *route;
+ char *uri = r->filename + 6;
+ char *sticky_path, *sticky, *path;
+ int i;
+
+ balancer = (proxy_balancer *)conf->balancers->elts;
+ for (i = 0; i < conf->balancers->nelts; i++) {
+ if (strcasecmp(balancer->name, uri) == 0)
+ break;
+ }
+
+ /* XXX: We don't find the balancer, that is BAD */
+ if (i == conf->balancers->nelts)
+ return 0;
+
+ if (balancer->sticky == NULL)
+ return 0;
+
+ /* for 2.2.x the sticky parameter may contain 2 values */
+ sticky = sticky_path = apr_pstrdup(r->pool, balancer->sticky);
+ if ((path = strchr(sticky, '|'))) {
+ *path++ = '\0';
+ sticky_path = path;
+ }
+ route = get_path_param(r->pool, uri , sticky_path);
+ if (route == NULL)
+ route = get_cookie_param(r, sticky);
+ if (route) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "mod_proxy_cluster: found route %s", route);
+ return 1;
+ }
+ return 0;
+}
+/*
+ * Search the balancer that corresponds to the pair context/host
+ */
+static char *get_context_host_balancer(request_rec *r)
+{
+ void *sconf = r->server->module_config;
+ proxy_server_conf *conf = (proxy_server_conf *)
+ ap_get_module_config(sconf, &proxy_module);
+
+ int sizenode = node_storage->get_max_size_node();
+ int n;
+ int *nodes = apr_palloc(r->pool, sizeof(int)*sizenode);
+ sizenode = node_storage->get_ids_used_node(nodes);
+ for (n=0; n<sizenode; n++) {
+ nodeinfo_t *node;
+ node_storage->read_node(nodes[n], &node);
+
+ /*
+ * check the hosts and contexts
+ * A node may have several virtual hosts and
+ * each virtual hosts may have several context
+ */
+ int sizevhost = host_storage->get_max_size_host();
+ int *vhosts = apr_palloc(r->pool, sizeof(int)*sizevhost);
+ sizevhost = host_storage->get_ids_used_host(vhosts);
+ int i;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "get_context_host_balancer testing node %s", node->mess.JVMRoute);
+ for (i=0; i<sizevhost; i++) {
+ hostinfo_t *vhost;
+ host_storage->read_host(vhosts[i], &vhost);
+ if (vhost->node == node->mess.id) {
+ /* XXX Check the virtual host */
+
+ /* Check the contexts */
+ int sizecontext = context_storage->get_max_size_context();
+ int *contexts = apr_palloc(r->pool, sizeof(int)*sizecontext);
+ sizecontext = context_storage->get_ids_used_context(contexts);
+ int j;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "get_context_host_balancer testing host %s", vhost->host);
+ for (j=0; j<sizecontext; j++) {
+ contextinfo_t *context;
+ context_storage->read_context(contexts[j], &context);
+ if (context->vhost != vhost->vhost)
+ continue;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "get_context_host_balancer testing context %s", context->context);
+
+ /* check for /context[/] in the URL */
+ int len = strlen(context->context);
+ if (strncmp(r->uri, context->context, len) == 0) {
+ if (r->uri[len] == '\0' || r->uri[len] == '/') {
+ /* Check status */
+ switch (context->status)
+ {
+ case ENABLED:
+ return node->mess.balancer;
+ break;
+ case DISABLED:
+ /* Only the request with sessionid ok for it */
+ if (hassession_byname(r, node->mess.balancer, conf))
+ return node->mess.balancer;
+ break;
+ }
+ }
+ }
+ }
+
+ }
+ }
+ }
+ return NULL;
+}
+
+/*
+ * The ModClusterService from the cluster fills the lbfactor values.
+ * Our logic is a bit different the mod_balancer one. We check the
+ * context and host to prevent to route to application beeing redeploy or
+ * stopped in one node but not in others.
+ */
+static proxy_worker *find_best_bytraffic(proxy_balancer *balancer,
+ request_rec *r)
+{
+ int i;
+ apr_off_t mytraffic = 0;
+ apr_off_t curmin = 0;
+ proxy_worker *worker;
+ proxy_worker *mycandidate = NULL;
+ int cur_lbset = 0;
+ int max_lbset = 0;
+ int checking_standby;
+ int checked_standby;
+ void *sconf = r->server->module_config;
+ proxy_server_conf *conf = (proxy_server_conf *)
+ ap_get_module_config(sconf, &proxy_module);
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: Entering bytraffic for CLUSTER (%s)",
+ balancer->name);
+
+ /* create workers for new nodes */
+ create_workers_node(conf, r->pool, r->server);
+
+ /* First try to see if we have available candidate */
+ do {
+ checking_standby = checked_standby = 0;
+ while (!mycandidate && !checked_standby) {
+ worker = (proxy_worker *)balancer->workers->elts;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: bytraffic for BALANCER (%d)", balancer->workers->nelts);
+ for (i = 0; i < balancer->workers->nelts; i++, worker++) {
+ if (!checking_standby) { /* first time through */
+ if (worker->s->lbset > max_lbset)
+ max_lbset = worker->s->lbset;
+ }
+ if (worker->s->lbset > cur_lbset)
+ continue;
+ if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) )
+ continue;
+ /* If the worker is in error state run
+ * retry on that worker. It will be marked as
+ * operational if the retry timeout is elapsed.
+ * The worker might still be unusable, but we try
+ * anyway.
+ */
+ if (!PROXY_WORKER_IS_USABLE(worker))
+ ap_proxy_retry_worker("BALANCER", worker, r->server);
+
+ /* Take into calculation only the workers that are
+ * not in error state or not disabled.
+ */
+ if (PROXY_WORKER_IS_USABLE(worker) && iscontext_host_ok(r, balancer, worker)) {
+ if (worker->s->lbfactor <= 0)
+ mytraffic = curmin;
+ else
+ mytraffic = (worker->s->transferred/worker->s->lbfactor) +
+ (worker->s->read/worker->s->lbfactor);
+ if (!mycandidate || mytraffic < curmin) {
+ mycandidate = worker;
+ curmin = mytraffic;
+ }
+ }
+ }
+ checked_standby = checking_standby++;
+ }
+ cur_lbset++;
+ } while (cur_lbset <= max_lbset && !mycandidate);
+
+ return mycandidate;
+}
+static const proxy_balancer_method bytraffic =
+{
+ "bytraffic",
+ &find_best_bytraffic,
+ NULL
+};
+
+/*
+ * Do a ping/pong to the node
+ */
+static apr_status_t proxy_cluster_try_pingpong(request_rec *r, proxy_worker *worker, char *scheme)
+{
+ apr_status_t rv;
+ proxy_conn_rec *conn;
+ /* get the proxy_conn_rec: from ap_proxy_acquire_connection */
+#if APR_HAS_THREADS
+ if (worker->hmax && worker->cp->res) {
+ rv = apr_reslist_acquire(worker->cp->res, (void **)&conn);
+ }
+ else
+#endif
+ {
+ /* create the new connection if the previous was destroyed */
+ if (!worker->cp->conn) {
+ connection_constructor((void **)&conn, worker, worker->cp->pool);
+ }
+ else {
+ conn = worker->cp->conn;
+ worker->cp->conn = NULL;
+ }
+ rv = APR_SUCCESS;
+ }
+
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_try_pingpong: failed acquiring connection");
+ if (conn) {
+ conn->close = 1;
+ ap_proxy_release_connection(scheme, conn, r->server);
+ }
+ return rv;
+ }
+
+ conn->worker = worker;
+ conn->close = 0;
+#if APR_HAS_THREADS
+ conn->inreslist = 0;
+#endif
+
+ /* Replace ap_proxy_determine_connection XXX: Still not ok */
+ if (!conn->hostname) {
+ conn->hostname = apr_pstrdup(conn->pool, worker->hostname);
+ conn->port = worker->port;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_try_pingpong: connection to %s : %d",
+ conn->hostname, conn->port);
+
+ if (conn->sock) {
+ apr_socket_close(conn->sock);
+ conn->sock = NULL;
+ }
+ if (conn->connection) {
+ apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
+ conn->connection = NULL;
+ }
+ rv = apr_sockaddr_info_get(&(conn->addr),
+ conn->hostname, APR_UNSPEC,
+ conn->port, 0,
+ conn->pool);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_try_pingpong: can't resolve %s",
+ conn->hostname);
+ ap_proxy_release_connection(scheme, conn, r->server);
+ return rv;
+ }
+ }
+
+ /* Connect to the backend: Check connected/reuse otherwise create new */
+ rv = ap_proxy_connect_backend(scheme, conn, worker, r->server);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_try_pingpong: can't connect to backend");
+ ap_proxy_release_connection(scheme, conn, r->server);
+ return rv;
+ }
+
+ apr_interval_time_t timeout = worker->ping_timeout;
+ if (timeout <= 0)
+ timeout = apr_time_from_sec(10); /* 10 seconds */
+
+ /* XXX: For the moment we support only AJP */
+ if (strcasecmp(scheme, "AJP") == 0) {
+ rv = ajp_handle_cping_cpong(conn->sock, r, timeout);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_try_pingpong: cping_cpong failed");
+ }
+ }
+ ap_proxy_release_connection(scheme, conn, r->server);
+ return rv;
+}
+/*
+ * Check that we could connect to the node
+ * id : worker id
+ * load : load factor from the cluster manager.
+ */
+PROXY_DECLARE(int) proxy_node_isup(request_rec *r, int id, char *scheme, int load)
+{
+ void *sconf = r->server->module_config;
+ proxy_server_conf *conf = (proxy_server_conf *)
+ ap_get_module_config(sconf, &proxy_module);
+ int i;
+ apr_status_t rv;
+ proxy_worker *worker;
+
+ /* create the workers (that could be the first time) */
+ create_workers_node(conf, r->pool, r->server);
+
+ /* search for the worker */
+ worker = (proxy_worker *)conf->workers->elts;
+ for (i = 0; i < conf->workers->nelts; i++) {
+ if (worker->id == id)
+ break;
+ }
+ if (i == conf->workers->nelts) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_isup: Can't find worker for %d", id);
+ return 500;
+ }
+
+ /* Try a ping/pong to check the node */
+ if (load > 0) {
+ /* Only try usuable nodes */
+ rv = proxy_cluster_try_pingpong(r, worker, scheme);
+ if (rv != APR_SUCCESS) {
+ worker->s->status |= PROXY_WORKER_IN_ERROR;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy_cluster_isup: pingpong failed");
+ return 500;
+ }
+ }
+ if (load == -1) {
+ worker->s->status |= PROXY_WORKER_IN_ERROR;
+ }
+ else if (load == 0) {
+ /*
+ * XXX: PROXY_WORKER_HOT_STANDBY Doesn't look supported
+ * mark worker in error for the moment
+ */
+ worker->s->status |= PROXY_WORKER_IN_ERROR;
+ worker->s->status |= PROXY_WORKER_HOT_STANDBY;
+ }
+ else {
+ worker->s->status &= ~PROXY_WORKER_IN_ERROR;
+ worker->s->status &= ~PROXY_WORKER_STOPPED;
+ worker->s->status &= ~PROXY_WORKER_DISABLED;
+ worker->s->status &= ~PROXY_WORKER_HOT_STANDBY;
+ worker->s->lbfactor = load;
+ }
+ return 0;
+}
+/*
+ * For the provider
+ */
+static const struct balancer_method balancerhandler =
+{
+ proxy_node_isup
+};
+
+static void * APR_THREAD_FUNC proxy_cluster_watchdog_func(apr_thread_t *thd, void *data)
+{
+ apr_pool_t *pool;
+ server_rec *s = (server_rec *) data;
+ void *sconf = s->module_config;
+ proxy_server_conf *conf = (proxy_server_conf *)
+ ap_get_module_config(sconf, &proxy_module);
+
+ for (;;) {
+ apr_sleep(apr_time_make(0, 1000));
+ /* Create new workers if the shared memory changes */
+ apr_pool_create(&pool, conf->pool);
+ create_workers_node(conf, pool, s);
+ apr_pool_destroy(pool);
+ }
+ apr_thread_exit(thd, 0);
+ return NULL;
+}
+
+/*
+ * Create a thread per process to make maintenance task.
+ */
+static void proxy_cluster_child_init(apr_pool_t *p, server_rec *s)
+{
+ apr_status_t rv;
+ apr_thread_t *wdt;
+
+ rv = apr_thread_create(&wdt, NULL, proxy_cluster_watchdog_func, s, p);
+ if (rv != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+ "proxy_cluster_child_init: apr_thread_create failed");
+ }
+}
+
+static int proxy_cluster_post_config(apr_pool_t *p, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s)
+{
+ node_storage = ap_lookup_provider("manager" , "shared", "0");
+ if (node_storage == NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+ "proxy_cluster_post_config: Can't find mod_manager for nodes");
+ return !OK;
+ }
+ host_storage = ap_lookup_provider("manager" , "shared", "1");
+ if (host_storage == NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+ "proxy_cluster_post_config: Can't find mod_manager for hosts");
+ return !OK;
+ }
+ context_storage = ap_lookup_provider("manager" , "shared", "2");
+ if (context_storage == NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+ "proxy_cluster_post_config: Can't find mod_manager for contexts");
+ return !OK;
+ }
+ balancer_storage = ap_lookup_provider("manager" , "shared", "3");
+ if (balancer_storage == NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+ "proxy_cluster_post_config: Can't find mod_manager for balancers");
+ return !OK;
+ }
+
+ return OK;
+}
+
+/*
+ * See if we could map the request.
+ */
+static int proxy_cluster_trans(request_rec *r)
+{
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server,
+ "proxy_cluster_trans for %d %s %s uri: %s",
+ r->proxyreq, r->filename, r->handler, r->uri);
+
+ char *balancer = get_context_host_balancer(r);
+ if (balancer) {
+ r->filename = apr_pstrcat(r->pool, "proxy:cluster://", balancer, r->uri, NULL);
+ r->handler = "proxy-server";
+ r->proxyreq = PROXYREQ_REVERSE;
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, r->server,
+ "proxy_cluster_trans using %s uri: %s",
+ balancer, r->filename);
+ return OK; /* Mod_proxy will process it */
+ }
+
+ return DECLINED;
+}
+
+/*
+ * canonise the url
+ */
+static int proxy_cluster_canon(request_rec *r, char *url)
+{
+ if (strncasecmp(url, "balancer:", 9) == 0) {
+ OK; /* XXX: need more */
+ }
+ else {
+ return DECLINED;
+ }
+}
+
+/* Find the worker that has the 'route' defined
+ */
+static proxy_worker *find_route_worker(proxy_balancer *balancer,
+ const char *route, request_rec *r)
+{
+ int i;
+ int checking_standby;
+ int checked_standby;
+
+ proxy_worker *worker;
+
+ checking_standby = checked_standby = 0;
+ while (!checked_standby) {
+ worker = (proxy_worker *)balancer->workers->elts;
+ for (i = 0; i < balancer->workers->nelts; i++, worker++) {
+ if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(worker) : PROXY_WORKER_IS_STANDBY(worker)) )
+ continue;
+ if (*(worker->s->route) && strcmp(worker->s->route, route) == 0) {
+ if (worker && PROXY_WORKER_IS_USABLE(worker)) {
+ return worker;
+ } else {
+ /*
+ * If the worker is in error state run
+ * retry on that worker. It will be marked as
+ * operational if the retry timeout is elapsed.
+ * The worker might still be unusable, but we try
+ * anyway.
+ */
+ ap_proxy_retry_worker("BALANCER", worker, r->server);
+ if (PROXY_WORKER_IS_USABLE(worker)) {
+ return worker;
+ } else {
+ /*
+ * We have a worker that is unusable.
+ * It can be in error or disabled, but in case
+ * it has a redirection set use that redirection worker.
+ * This enables to safely remove the member from the
+ * balancer. Of course you will need some kind of
+ * session replication between those two remote.
+ */
+ if (*worker->s->redirect) {
+ proxy_worker *rworker = NULL;
+ rworker = find_route_worker(balancer, worker->s->redirect, r);
+ /* Check if the redirect worker is usable */
+ if (rworker && !PROXY_WORKER_IS_USABLE(rworker)) {
+ /*
+ * If the worker is in error state run
+ * retry on that worker. It will be marked as
+ * operational if the retry timeout is elapsed.
+ * The worker might still be unusable, but we try
+ * anyway.
+ */
+ ap_proxy_retry_worker("BALANCER", rworker, r->server);
+ }
+ if (rworker && PROXY_WORKER_IS_USABLE(rworker))
+ return rworker;
+ }
+ }
+ }
+ }
+ }
+ checked_standby = checking_standby++;
+ }
+ return NULL;
+}
+static proxy_worker *find_session_route(proxy_balancer *balancer,
+ request_rec *r,
+ char **route,
+ char **sticky_used,
+ char **url)
+{
+ proxy_worker *worker = NULL;
+ char *sticky, *sticky_path, *path;
+
+ if (!balancer->sticky)
+ return NULL;
+ sticky = sticky_path = apr_pstrdup(r->pool, balancer->sticky);
+ if ((path = strchr(sticky, '|'))) {
+ *path++ = '\0';
+ sticky_path = path;
+ }
+
+ /* Try to find the sticky route inside url */
+ *sticky_used = sticky_path;
+ *route = get_path_param(r->pool, *url, sticky_path);
+ if (!*route) {
+ *route = get_cookie_param(r, sticky);
+ *sticky_used = sticky;
+ }
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: CLUSTER: Found value %s for "
+ "stickysession %s", *route, balancer->sticky);
+ /*
+ * If we found a value for sticksession, find the first '.' within.
+ * Everything after '.' (if present) is our route.
+ */
+ if ((*route) && ((*route = strchr(*route, '.')) != NULL ))
+ (*route)++;
+ if ((*route) && (**route)) {
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: CLUSTER: Found route %s", *route);
+ /* We have a route in path or in cookie
+ * Find the worker that has this route defined.
+ */
+ worker = find_route_worker(balancer, *route, r);
+ if (worker && strcmp(*route, worker->s->route)) {
+ /*
+ * Notice that the route of the worker chosen is different from
+ * the route supplied by the client.
+ */
+ apr_table_setn(r->subprocess_env, "BALANCER_ROUTE_CHANGED", "1");
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: CLUSTER: Route changed from %s to %s",
+ *route, worker->s->route);
+ }
+ return worker;
+ }
+ else
+ return NULL;
+}
+
+static proxy_worker *find_best_worker(proxy_balancer *balancer,
+ request_rec *r)
+{
+ proxy_worker *candidate = NULL;
+ apr_status_t rv;
+
+ if ((rv = PROXY_THREAD_LOCK(balancer)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+ "proxy: CLUSTER: (%s). Lock failed for find_best_worker()", balancer->name);
+ return NULL;
+ }
+
+ candidate = (*balancer->lbmethod->finder)(balancer, r);
+
+ if (candidate)
+ candidate->s->elected++;
+
+/*
+ PROXY_THREAD_UNLOCK(balancer);
+ return NULL;
+*/
+
+ if ((rv = PROXY_THREAD_UNLOCK(balancer)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+ "proxy: CLUSTER: (%s). Unlock failed for find_best_worker()", balancer->name);
+ }
+
+ if (candidate == NULL) {
+ /* All the workers are in error state or disabled.
+ * If the balancer has a timeout sleep for a while
+ * and try again to find the worker. The chances are
+ * that some other thread will release a connection.
+ * By default the timeout is not set, and the server
+ * returns SERVER_BUSY.
+ */
+#if APR_HAS_THREADS
+ if (balancer->timeout) {
+ /* XXX: This can perhaps be build using some
+ * smarter mechanism, like tread_cond.
+ * But since the statuses can came from
+ * different childs, use the provided algo.
+ */
+ apr_interval_time_t timeout = balancer->timeout;
+ apr_interval_time_t step, tval = 0;
+ /* Set the timeout to 0 so that we don't
+ * end in infinite loop
+ */
+ balancer->timeout = 0;
+ step = timeout / 100;
+ while (tval < timeout) {
+ apr_sleep(step);
+ /* Try again */
+ if ((candidate = find_best_worker(balancer, r)))
+ break;
+ tval += step;
+ }
+ /* restore the timeout */
+ balancer->timeout = timeout;
+ }
+#endif
+ }
+ return candidate;
+}
+
+static int rewrite_url(request_rec *r, proxy_worker *worker,
+ char **url)
+{
+ const char *scheme = strstr(*url, "://");
+ const char *path = NULL;
+
+ if (scheme)
+ path = ap_strchr_c(scheme + 3, '/');
+
+ /* we break the URL into host, port, uri */
+ if (!worker) {
+ return ap_proxyerror(r, HTTP_BAD_REQUEST, apr_pstrcat(r->pool,
+ "missing worker. URI cannot be parsed: ", *url,
+ NULL));
+ }
+
+ *url = apr_pstrcat(r->pool, worker->name, path, NULL);
+
+ return OK;
+}
+
+/*
+ * Find a worker for mod_proxy logic
+ */
+static int proxy_cluster_pre_request(proxy_worker **worker,
+ proxy_balancer **balancer,
+ request_rec *r,
+ proxy_server_conf *conf, char **url)
+{
+ int access_status;
+ proxy_worker *runtime;
+ char *route = NULL;
+ char *sticky = NULL;
+ apr_status_t rv;
+
+ *worker = NULL;
+ /* Step 1: check if the url is for us
+ * The url we can handle starts with 'balancer://'
+ * If balancer is already provided skip the search
+ * for balancer, because this is failover attempt.
+ */
+ if (!*balancer &&
+ !(*balancer = ap_proxy_get_balancer(r->pool, conf, *url)))
+ return DECLINED;
+
+ /* Step 2: find the session route */
+
+ runtime = find_session_route(*balancer, r, &route, &sticky, url);
+ /* Lock the LoadBalancer
+ * XXX: perhaps we need the process lock here
+ */
+ if ((rv = PROXY_THREAD_LOCK(*balancer)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+ "proxy: CLUSTER: (%s). Lock failed for pre_request",
+ (*balancer)->name);
+ return DECLINED;
+ }
+ if (runtime) {
+ int i, total_factor = 0;
+ proxy_worker *workers;
+ /* We have a sticky load balancer
+ * Update the workers status
+ * so that even session routes get
+ * into account.
+ */
+ workers = (proxy_worker *)(*balancer)->workers->elts;
+ for (i = 0; i < (*balancer)->workers->nelts; i++) {
+ /* Take into calculation only the workers that are
+ * not in error state or not disabled.
+ *
+ * TODO: Abstract the below, since this is dependent
+ * on the LB implementation
+ */
+ if (PROXY_WORKER_IS_USABLE(workers)) {
+ workers->s->lbstatus += workers->s->lbfactor;
+ total_factor += workers->s->lbfactor;
+ }
+ workers++;
+ }
+ runtime->s->lbstatus -= total_factor;
+ runtime->s->elected++;
+
+ *worker = runtime;
+ }
+ else if (route && (*balancer)->sticky_force) {
+ int i, member_of = 0;
+ proxy_worker *workers;
+ /*
+ * We have a route provided that doesn't match the
+ * balancer name. See if the provider route is the
+ * member of the same balancer in which case return 503
+ */
+ workers = (proxy_worker *)(*balancer)->workers->elts;
+ for (i = 0; i < (*balancer)->workers->nelts; i++) {
+ if (*(workers->s->route) && strcmp(workers->s->route, route) == 0) {
+ member_of = 1;
+ break;
+ }
+ workers++;
+ }
+ if (member_of) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ "proxy: CLUSTER: (%s). All workers are in error state for route (%s)",
+ (*balancer)->name, route);
+ if ((rv = PROXY_THREAD_UNLOCK(*balancer)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+ "proxy: CLUSTER: (%s). Unlock failed for pre_request",
+ (*balancer)->name);
+ }
+ return HTTP_SERVICE_UNAVAILABLE;
+ }
+ }
+
+ if ((rv = PROXY_THREAD_UNLOCK(*balancer)) != APR_SUCCESS) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,
+ "proxy: CLUSTER: (%s). Unlock failed for pre_request",
+ (*balancer)->name);
+ }
+ if (!*worker) {
+ runtime = find_best_worker(*balancer, r);
+ if (!runtime) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
+ "proxy: CLUSTER: (%s). All workers are in error state",
+ (*balancer)->name);
+
+ return HTTP_SERVICE_UNAVAILABLE;
+ }
+ if ((*balancer)->sticky && runtime) {
+ /*
+ * This balancer has sticky sessions and the client either has not
+ * supplied any routing information or all workers for this route
+ * including possible redirect and hotstandby workers are in error
+ * state, but we have found another working worker for this
+ * balancer where we can send the request. Thus notice that we have
+ * changed the route to the backend.
+ */
+ apr_table_setn(r->subprocess_env, "BALANCER_ROUTE_CHANGED", "1");
+ }
+ *worker = runtime;
+ }
+
+ /* Add balancer/worker info to env. */
+ apr_table_setn(r->subprocess_env,
+ "BALANCER_NAME", (*balancer)->name);
+ apr_table_setn(r->subprocess_env,
+ "BALANCER_WORKER_NAME", (*worker)->name);
+ apr_table_setn(r->subprocess_env,
+ "BALANCER_WORKER_ROUTE", (*worker)->s->route);
+
+ /* Rewrite the url from 'balancer://url'
+ * to the 'worker_scheme://worker_hostname[:worker_port]/url'
+ * This replaces the balancers fictional name with the
+ * real hostname of the elected worker.
+ */
+ access_status = rewrite_url(r, *worker, url);
+ /* Add the session route to request notes if present */
+ if (route) {
+ apr_table_setn(r->notes, "session-sticky", sticky);
+ apr_table_setn(r->notes, "session-route", route);
+
+ /* Add session info to env. */
+ apr_table_setn(r->subprocess_env,
+ "BALANCER_SESSION_STICKY", sticky);
+ apr_table_setn(r->subprocess_env,
+ "BALANCER_SESSION_ROUTE", route);
+ }
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+ "proxy: CLUSTER (%s) worker (%s) rewritten to %s",
+ (*balancer)->name, (*worker)->name, *url);
+
+ return access_status;
+}
+
+/*
+ * Register the hooks on our module.
+ */
+static void proxy_cluster_hooks(apr_pool_t *p)
+{
+ static const char * const aszPre[]={ "mod_manager.c", NULL };
+ static const char * const aszSucc[]={ "mod_proxy.c", NULL };
+
+ ap_hook_post_config(proxy_cluster_post_config, NULL, NULL, APR_HOOK_MIDDLE);
+
+ /* create the provider for the proxy logic */
+ ap_register_provider(p, PROXY_LBMETHOD, "cluster_bytraffic", "0", &bytraffic);
+
+ /* create the "maintenance" thread */
+ ap_hook_child_init(proxy_cluster_child_init, NULL, NULL, APR_HOOK_MIDDLE);
+
+ /* check the url and give the mapping to mod_proxy */
+ ap_hook_translate_name(proxy_cluster_trans, aszPre, aszSucc, APR_HOOK_FIRST);
+
+ proxy_hook_canon_handler(proxy_cluster_canon, NULL, NULL, APR_HOOK_FIRST);
+
+ proxy_hook_pre_request(proxy_cluster_pre_request, NULL, NULL, APR_HOOK_FIRST);
+
+ ap_register_provider(p, "proxy_cluster" , "balancer", "0", &balancerhandler);
+}
+
+static void *create_proxy_cluster_dir_config(apr_pool_t *p, char *dir)
+{
+ return NULL;
+}
+
+static void *create_proxy_cluster_server_config(apr_pool_t *p, server_rec *s)
+{
+ return NULL;
+}
+
+module AP_MODULE_DECLARE_DATA proxy_cluster_module = {
+ STANDARD20_MODULE_STUFF,
+ NULL, /* per-directory config creator */
+ NULL, /* dir config merger */
+ create_proxy_cluster_server_config, /* server config creator */
+ NULL, /* server config merger */
+ NULL, /* command table */
+ proxy_cluster_hooks /* register hooks */
+};
16 years, 7 months
- 1
- 0
JBoss Native SVN: r1606 - in trunk/mod_cluster/native: mod_manager and 1 other directory.
by jbossnative-commits＠lists.jboss.org
Author: jfrederic.clere(a)jboss.com
Date: 2008-05-15 10:22:27 -0400 (Thu, 15 May 2008)
New Revision: 1606
Added:
trunk/mod_cluster/native/include/mod_proxy_cluster.h
Modified:
trunk/mod_cluster/native/mod_manager/mod_manager.c
Log:
Add the provider logic for ping/pong.
Added: trunk/mod_cluster/native/include/mod_proxy_cluster.h
===================================================================
--- trunk/mod_cluster/native/include/mod_proxy_cluster.h (rev 0)
+++ trunk/mod_cluster/native/include/mod_proxy_cluster.h 2008-05-15 14:22:27 UTC (rev 1606)
@@ -0,0 +1,42 @@
+/*
+ * mod_cluster
+ *
+ * Copyright(c) 2008 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision$
+ */
+
+#ifndef MOD_PROXY_CLUSTER_H
+#define MOD_PROXY_CLUSTER_H
+struct balancer_method {
+/**
+ * Check that the node is responding
+ * @param r request_rec structure.
+ * @param id ident of the worker.
+ * @param load load factor to set if test is ok.
+ * @param scheme AJP/http/https protocol to use.
+ * @return 0: All OK 500 : Error
+ */
+APR_DECLARE(int) (* proxy_node_isup)(request_rec *r, int id, char *scheme, int load);
+};
+typedef struct balancer_method balancer_method;
+#endif /*MOD_PROXY_CLUSTER_H*/
Modified: trunk/mod_cluster/native/mod_manager/mod_manager.c
===================================================================
--- trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-15 14:21:28 UTC (rev 1605)
+++ trunk/mod_cluster/native/mod_manager/mod_manager.c 2008-05-15 14:22:27 UTC (rev 1606)
@@ -1,15 +1,28 @@
/*
- Copyright 2008 Red Hat Middleware, LLC.
- Licensed 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,i
- 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.
+ * mod_cluster
+ *
+ * Copyright(c) 2008 Red Hat Middleware, LLC,
+ * and individual contributors as indicated by the @authors tag.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library in the file COPYING.LIB;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * @author Jean-Frederic Clere
+ * @version $Revision$
*/
#include "apr_strings.h"
@@ -24,6 +37,8 @@
#include "http_core.h"
#include "scoreboard.h"
+#include "mod_proxy_cluster.h"
+
#include "slotmem.h"
#include "node.h"
@@ -42,6 +57,7 @@
mem_t *balancerstatsmem = NULL;
slotmem_storage_method *storage = NULL;
+balancer_method *balancerhandler = NULL;
module AP_MODULE_DECLARE_DATA manager_module;
@@ -207,7 +223,12 @@
return !OK;
}
- // sharedmem_initialize_cleanup(p);
+ /* Get a provider to ping/pong logics */
+
+ balancerhandler = ap_lookup_provider("proxy_cluster", "balancer", "0");
+ if (balancerhandler == NULL) {
+ ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, s, "can't find a ping/pong logic");
+ }
return OK;
}
static char **process_buff(request_rec *r, char *buff)
@@ -563,11 +584,14 @@
}
/*
- * XXX: Need to be write the idea is to get a provider for mod_proxy_cluster for each scheme.
+ * Call the ping/pong logic
* Do a ping/png request to the node and set the load factor.
*/
static int isnode_up(request_rec *r, int id, char *scheme, int Load)
{
+ if (balancerhandler != NULL) {
+ return (balancerhandler->proxy_node_isup(r, id, scheme, Load));
+ }
return OK;
}
/*
16 years, 7 months
- 1
- 0