May 2009 - jbossnative-commits - Jboss List Archives

JBoss Native SVN: r2455 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-05-28 23:02:57 -0400 (Thu, 28 May 2009) New Revision: 2455 Modified: trunk/mod_cluster/pom.xml Log: Update jboss-test to match AS testsuite version Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-05-28 16:34:59 UTC (rev 2454) +++ trunk/mod_cluster/pom.xml 2009-05-29 03:02:57 UTC (rev 2455) @@ -65,7 +65,7 @@ <dependency> <groupId>org.jboss.test</groupId> <artifactId>jboss-test</artifactId> - <version>1.1.4.GA</version> + <version>1.1.5-alpha-2</version> <scope>test</scope> </dependency>

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2454 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-28 12:34:59 -0400 (Thu, 28 May 2009) New Revision: 2454 Added: trunk/mod_cluster/release.txt Log: Add doc about how to release mod_cluster. Added: trunk/mod_cluster/release.txt =================================================================== --- trunk/mod_cluster/release.txt (rev 0) +++ trunk/mod_cluster/release.txt 2009-05-28 16:34:59 UTC (rev 2454) @@ -0,0 +1,7 @@ +1 - Do the maven magic + See http://www.jboss.org/community/wiki/MavenReleaseProcess +2 - Once done go to ../build/unix edit package.list add something like: +mod_cluster|1.0.0.GA|2.2.11|ssl:v:0.9.8k|zlib:v:1.2.3|jk:v:1.2.27|iconv:v:1.11| +expat:v:1.95.8|cluster:t:mod_cluster/1.0.0.GA + commit it, with message like GA builds. +3 - Wait for hudson it should build all the bundle.

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2453 - trunk/mod_cluster.

by jbossnative-commits＠lists.jboss.org

Author: pferraro Date: 2009-05-28 11:45:29 -0400 (Thu, 28 May 2009) New Revision: 2453 Modified: trunk/mod_cluster/pom.xml Log: Dependency refresh - rebase against AS 5.1.0.GA Modified: trunk/mod_cluster/pom.xml =================================================================== --- trunk/mod_cluster/pom.xml 2009-05-28 14:02:07 UTC (rev 2452) +++ trunk/mod_cluster/pom.xml 2009-05-28 15:45:29 UTC (rev 2453) @@ -38,14 +38,14 @@ <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> - <version>2.0.5.GA</version> + <version>2.0.6.GA</version> </dependency>  <dependency> <groupId>org.jboss.logging</groupId> <artifactId>jboss-logging-jdk</artifactId> - <version>2.0.5.GA</version> + <version>2.1.0.GA</version> <optional>true</optional> </dependency> @@ -72,7 +72,7 @@ <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-server</artifactId> - <version>5.0.1.GA</version> + <version>5.1.0.GA</version> <scope>test</scope> </dependency> @@ -345,4 +345,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project>

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2452 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-28 10:02:07 -0400 (Thu, 28 May 2009) New Revision: 2452 Modified: trunk/mod_cluster/test/java/SAdvertize.java Log: Bind to have the same behaviour than httpd. Modified: trunk/mod_cluster/test/java/SAdvertize.java =================================================================== --- trunk/mod_cluster/test/java/SAdvertize.java 2009-05-26 09:50:55 UTC (rev 2451) +++ trunk/mod_cluster/test/java/SAdvertize.java 2009-05-28 14:02:07 UTC (rev 2452) @@ -1,15 +1,20 @@ import java.net.MulticastSocket; import java.net.InetAddress; +import java.net.InetSocketAddress; import java.net.DatagramPacket; public class SAdvertize { public static void main(String[] args) throws Exception { - // InetAddress group = InetAddress.getByName("224.0.1.105"); - InetAddress group = InetAddress.getByName("232.0.0.2"); - MulticastSocket s = new MulticastSocket(23364); - s.setTimeToLive(16); + InetAddress group = InetAddress.getByName("224.0.1.105"); + // InetAddress group = InetAddress.getByName("232.0.0.2"); + InetAddress addr = InetAddress.getByName("10.16.88.178"); + // InetAddress addr = InetAddress.getByName("172.17.41.254"); + InetSocketAddress addrs = new InetSocketAddress(addr, 23364); + + MulticastSocket s = new MulticastSocket(addrs); + s.setTimeToLive(29); s.joinGroup(group); boolean ok = true; while (ok) {

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2451 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-26 05:50:55 -0400 (Tue, 26 May 2009) New Revision: 2451 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: balancer:// = 11 cluster:// 10 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-26 07:25:30 UTC (rev 2450) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-26 09:50:55 UTC (rev 2451) @@ -1471,7 +1471,7 @@ "cluster: Found route %s", route); #endif if (node_storage->find_node(&ou, route) == APR_SUCCESS) { - if (strlen(balancer->name)>10 && !strcmp(&balancer->name[10], ou->mess.balancer)) { + if (strlen(balancer->name)>11 && !strcmp(&balancer->name[11], ou->mess.balancer)) { #if HAVE_CLUSTER_EX_DEBUG ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "cluster: Found balancer %s for %s", ou->mess.balancer, route); @@ -1491,7 +1491,7 @@ #endif apr_table_setn(r->notes, "CLUSTER_DOMAIN", ou->mess.Domain); } - return &balancer->name[10]; + return &balancer->name[11]; } } } @@ -1857,8 +1857,13 @@ *worker = NULL; #if HAVE_CLUSTER_EX_DEBUG + if (*balancer) { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy_cluster_pre_request: url %s balancer %s", *url, (*balancer)->name); + } else { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy_cluster_pre_request: url %s", *url); + } #endif /* Step 1: check if the url is for us * The url we can handle starts with 'balancer://' @@ -1868,7 +1873,11 @@ if (*balancer) { /* Adjust the helper->count corresponding to the previous try */ const char *worker_name = apr_table_get(r->subprocess_env, "BALANCER_WORKER_NAME"); - if (domain && *domain) { + if (worker_name && *worker_name) { +#if HAVE_CLUSTER_EX_DEBUG + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, + "proxy_cluster_pre_request: worker %s", worker_name); +#endif int i; runtime = (proxy_worker *)(*balancer)->workers->elts; for (i = 0; i < (*balancer)->workers->nelts; i++, runtime++) {

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2450 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-26 03:25:30 -0400 (Tue, 26 May 2009) New Revision: 2450 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Arrange add_balancers_workers() and clean stuff. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-25 16:40:25 UTC (rev 2449) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-26 07:25:30 UTC (rev 2450) @@ -79,7 +79,7 @@ #define CREAT_ALL 0 /* create balancers/workers in all VirtualHost */ #define CREAT_NONE 1 /* don't create balancers (but add workers) */ #define CREAT_ROOT 2 /* Only create balancers/workers in the main server */ -static int creat_bal = 2; +static int creat_bal = CREAT_ROOT; #define WAITFORREMOVE 10 /* seconds */ @@ -442,9 +442,8 @@ } /* * Adds the balancers and the workers to the VirtualHosts - * Note server is only here for logging purposes. */ -static void add_balancers_workers(nodeinfo_t *node, apr_pool_t *pool, server_rec *server) +static void add_balancers_workers(nodeinfo_t *node, apr_pool_t *pool) { server_rec *s = main_server; char *name = apr_pstrcat(pool, "balancer://", node->mess.balancer, NULL); @@ -458,7 +457,7 @@ s = s->next; continue; } - add_workers_node(node, conf, balancer, name, pool, server); + add_workers_node(node, conf, balancer, name, pool, s); if (creat_bal == CREAT_ROOT) break; s = s->next; @@ -1228,7 +1227,7 @@ return 500; /* create the balancers and workers (that could be the first time) */ - add_balancers_workers(node, r->pool, r->server); + add_balancers_workers(node, r->pool); /* search for the worker in the VirtualHosts */ while (s) { @@ -2004,7 +2003,7 @@ #if HAVE_CLUSTER_EX_DEBUG ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, - "proxy: CLUSTER (%s) worker (%s) rewritten to %s", + "proxy_cluster_pre_request: balancer (%s) worker (%s) rewritten to %s", (*balancer)->name, (*worker)->name, *url); #endif

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2449 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-25 12:40:25 -0400 (Mon, 25 May 2009) New Revision: 2449 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Fix warnings. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-25 16:26:01 UTC (rev 2448) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-25 16:40:25 UTC (rev 2449) @@ -376,8 +376,6 @@ { proxy_worker *worker = NULL; if (!balancer) { - int sizebal, i; - int *bal; if (creat_bal == CREAT_NONE) return; /* Don't create balancers */ if (creat_bal == CREAT_ROOT && server != main_server) @@ -455,7 +453,6 @@ void *sconf = s->module_config; proxy_server_conf *conf = (proxy_server_conf *)ap_get_module_config(sconf, &proxy_module); proxy_balancer *balancer = ap_proxy_get_balancer(pool, conf, name); - int i; if (!balancer && creat_bal == CREAT_NONE) { s = s->next;

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2448 - trunk/mod_cluster/test/java.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-25 12:26:01 -0400 (Mon, 25 May 2009) New Revision: 2448 Modified: trunk/mod_cluster/test/java/Advertize.java Log: Log the sender address. Modified: trunk/mod_cluster/test/java/Advertize.java =================================================================== --- trunk/mod_cluster/test/java/Advertize.java 2009-05-25 15:59:48 UTC (rev 2447) +++ trunk/mod_cluster/test/java/Advertize.java 2009-05-25 16:26:01 UTC (rev 2448) @@ -18,6 +18,7 @@ s.receive(recv); String data = new String(buf); System.out.println("received: " + data); + System.out.println("received from " + recv.getSocketAddress()); } s.leaveGroup(group); }

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2447 - trunk/mod_cluster/native/mod_proxy_cluster.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-25 11:59:48 -0400 (Mon, 25 May 2009) New Revision: 2447 Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c Log: Oops that won't compile on windoze for example. Modified: trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c =================================================================== --- trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-25 15:06:11 UTC (rev 2446) +++ trunk/mod_cluster/native/mod_proxy_cluster/mod_proxy_cluster.c 2009-05-25 15:59:48 UTC (rev 2447) @@ -376,13 +376,13 @@ { proxy_worker *worker = NULL; if (!balancer) { + int sizebal, i; + int *bal; if (creat_bal == CREAT_NONE) return; /* Don't create balancers */ if (creat_bal == CREAT_ROOT && server != main_server) return; /* Don't create balancers if not root */ /* Create one */ - int sizebal, i; - int *bal; ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, server, "add_workers_node: Create balancer %s", name); balancer = apr_array_push(conf->balancers);

15 years, 7 months

1
0
0 / 0

JBoss Native SVN: r2446 - trunk/mod_cluster/native/advertise.

by jbossnative-commits＠lists.jboss.org

Author: jfrederic.clere(a)jboss.com Date: 2009-05-25 11:06:11 -0400 (Mon, 25 May 2009) New Revision: 2446 Modified: trunk/mod_cluster/native/advertise/mod_advertise.c Log: Fix for MODCLUSTER-76. Modified: trunk/mod_cluster/native/advertise/mod_advertise.c =================================================================== --- trunk/mod_cluster/native/advertise/mod_advertise.c 2009-05-25 12:20:31 UTC (rev 2445) +++ trunk/mod_cluster/native/advertise/mod_advertise.c 2009-05-25 15:06:11 UTC (rev 2446) @@ -71,6 +71,10 @@ static char *ma_advertise_skey = NULL; +static int ma_bind_set = 0; +static char *ma_bind_adrs = NULL; +static char *ma_bind_adsi = NULL; +static apr_port_t ma_bind_port = 0; static ma_advertise_srv_t ma_advs_server; @@ -199,6 +203,34 @@ /*--------------------------------------------------------------------------*/ /* */ +/* AdvertiseBindAddress directive */ +/* */ +/*--------------------------------------------------------------------------*/ +static const char *cmd_bindaddr(cmd_parms *cmd, void *dummy, + const char *arg) +{ + if (ma_server_rec !=NULL && ma_server_rec != cmd->server) + return "All Advertise directives must be in the same VirtualHost"; + if (ma_server_rec == NULL) + ma_server_rec = cmd->server; + + if (ma_bind_set) + return "Duplicate AdvertiseBindAddress directives are not allowed"; + + if (apr_parse_addr_port(&ma_bind_adrs, + &ma_bind_adsi, + &ma_bind_port, + arg, cmd->pool) != APR_SUCCESS) + return "Invalid AdvertiseBindAddress address"; + if (!ma_bind_adrs) + return "Missing Ip part from AdvertiseBindAddress address"; + if (!ma_bind_port) + ma_bind_port = MA_DEFAULT_ADVPORT; + ma_bind_set = 1; + return NULL; +} +/*--------------------------------------------------------------------------*/ +/* */ /* AdvertiseFrequency directive */ /* */ /*--------------------------------------------------------------------------*/ @@ -343,11 +375,11 @@ addr, port); return rv; } - if ((rv = apr_sockaddr_info_get(&ma_listen_sa, NULL, - ma_mgroup_sa->family, 0, + if ((rv = apr_sockaddr_info_get(&ma_listen_sa, ma_bind_adrs, + ma_mgroup_sa->family, ma_bind_port, APR_UNSPEC, pool)) != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, - "mod_advertise: ma_group_join apr_sockaddr_info_get(0.0.0.0:0) failed"); + "mod_advertise: ma_group_join apr_sockaddr_info_get(%s:%d) failed", ma_bind_adsi, ma_bind_port); return rv; } if ((rv = apr_sockaddr_info_get(&ma_niface_sa, NULL, @@ -700,6 +732,13 @@ RSRC_CONF, /* where available */ "Advertise manager url" ), + AP_INIT_TAKE1( + "AdvertiseBindAddress", /* directive name */ + cmd_bindaddr, /* config action routine */ + NULL, /* argument to include in call */ + RSRC_CONF, /* where available */ + "Local adress to bind to for Multicast logic" + ), {NULL} };

15 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbossnative-commits May 2009