Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_util.c jk_util.h
Return Receipt Your Re: cvs commit: jakarta-tomcat-connectors/jk/native/common document jk_lb_worker.c jk_util.c jk_util.h : was Rahul P Akolkar/Watson/IBM received by: at: 02/22/2005 12:11:03 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_util.c jk_util.h
this message contains virus. don't send messages!
- Original Message -
From: [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Wednesday, February 16, 2005 2:55 PM
Subject: cvs commit: jakarta-tomcat-connectors/jk/native/common
jk_lb_worker.c jk_util.c jk_util.h
mturk 2005/02/16 01:25:35
Modified:jk/native/common jk_lb_worker.c jk_util.c jk_util.h
Log:
Added disabled boolean directive to worker. This is used for
hot-standby workers that can be later enabled using jkstatus console.
Revision ChangesPath
1.53 +3 -1
jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jk_lb_worker.c 16 Feb 2005 08:30:58 - 1.52
+++ jk_lb_worker.c 16 Feb 2005 09:25:35 - 1.53
@@ -643,6 +643,8 @@
p-lb_workers[i].s-lb_value =
p-lb_workers[i].s-lb_factor;
p-lb_workers[i].s-in_error_state = JK_FALSE;
p-lb_workers[i].s-in_recovering = JK_FALSE;
+/* Worker can be initaly disabled as hot standby */
+p-lb_workers[i].s-is_disabled =
jk_get_is_worker_disabled(props, worker_names[i]);
if (!wc_create_worker(p-lb_workers[i].s-name,
props,
(p-lb_workers[i].w),
1.57 +16 -1
jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- jk_util.c 16 Feb 2005 08:23:56 - 1.56
+++ jk_util.c 16 Feb 2005 09:25:35 - 1.57
@@ -65,6 +65,7 @@
#define REDIRECT_OF_WORKER (redirect)
#define MOUNT_OF_WORKER (mount)
#define METHOD_OF_WORKER(method)
+#define IS_WORKER_DISABLED (disabled)
#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER(secretkey)
@@ -640,6 +641,20 @@
return JK_FALSE;
}
+int jk_get_is_worker_disabled(jk_map_t *m, const char *wname)
+{
+int rc = JK_TRUE;
+char buf[1024];
+if (m wname) {
+int value;
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
IS_WORKER_DISABLED);
+value = jk_map_get_bool(m, buf, 0);
+if (!value)
+rc = JK_FALSE;
+}
+return rc;
+}
+
void jk_set_log_format(const char *logformat)
{
jk_log_fmt = (logformat) ? logformat : JK_TIME_FORMAT;
1.27 +3 -1
jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_util.h 16 Feb 2005 08:23:56 - 1.26
+++ jk_util.h 16 Feb 2005 09:25:35 - 1.27
@@ -78,6 +78,8 @@
int jk_get_worker_retries(jk_map_t *m, const char *wname, int def);
+int jk_get_is_worker_disabled(jk_map_t *m, const char *wname);
+
void jk_set_log_format(const char *logformat);
int jk_get_worker_list(jk_map_t *m, char ***list, unsigned
*num_of_wokers);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_util.c jk_util.h
mturk 2005/02/16 01:25:35
Modified:jk/native/common jk_lb_worker.c jk_util.c jk_util.h
Log:
Added disabled boolean directive to worker. This is used for
hot-standby workers that can be later enabled using jkstatus console.
Revision ChangesPath
1.53 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- jk_lb_worker.c16 Feb 2005 08:30:58 - 1.52
+++ jk_lb_worker.c16 Feb 2005 09:25:35 - 1.53
@@ -643,6 +643,8 @@
p-lb_workers[i].s-lb_value = p-lb_workers[i].s-lb_factor;
p-lb_workers[i].s-in_error_state = JK_FALSE;
p-lb_workers[i].s-in_recovering = JK_FALSE;
+/* Worker can be initaly disabled as hot standby */
+p-lb_workers[i].s-is_disabled =
jk_get_is_worker_disabled(props, worker_names[i]);
if (!wc_create_worker(p-lb_workers[i].s-name,
props,
(p-lb_workers[i].w),
1.57 +16 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- jk_util.c 16 Feb 2005 08:23:56 - 1.56
+++ jk_util.c 16 Feb 2005 09:25:35 - 1.57
@@ -65,6 +65,7 @@
#define REDIRECT_OF_WORKER (redirect)
#define MOUNT_OF_WORKER (mount)
#define METHOD_OF_WORKER(method)
+#define IS_WORKER_DISABLED (disabled)
#define DEFAULT_WORKER_TYPE JK_AJP13_WORKER_NAME
#define SECRET_KEY_OF_WORKER(secretkey)
@@ -640,6 +641,20 @@
return JK_FALSE;
}
+int jk_get_is_worker_disabled(jk_map_t *m, const char *wname)
+{
+int rc = JK_TRUE;
+char buf[1024];
+if (m wname) {
+int value;
+sprintf(buf, %s.%s.%s, PREFIX_OF_WORKER, wname,
IS_WORKER_DISABLED);
+value = jk_map_get_bool(m, buf, 0);
+if (!value)
+rc = JK_FALSE;
+}
+return rc;
+}
+
void jk_set_log_format(const char *logformat)
{
jk_log_fmt = (logformat) ? logformat : JK_TIME_FORMAT;
1.27 +3 -1 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_util.h 16 Feb 2005 08:23:56 - 1.26
+++ jk_util.h 16 Feb 2005 09:25:35 - 1.27
@@ -78,6 +78,8 @@
int jk_get_worker_retries(jk_map_t *m, const char *wname, int def);
+int jk_get_is_worker_disabled(jk_map_t *m, const char *wname);
+
void jk_set_log_format(const char *logformat);
int jk_get_worker_list(jk_map_t *m, char ***list, unsigned *num_of_wokers);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_util.c jk_util.h
costin 02/05/15 14:00:29
Modified:jk/native build.xml
jk/native/common jk_lb_worker.c jk_util.c jk_util.h
Log:
Patch from Bernd Koecke, adding better support for hw balancers
Submitted by: Bernd Keocke [EMAIL PROTECTED]
Revision ChangesPath
1.33 +4 -1 jakarta-tomcat-connectors/jk/native/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- build.xml 7 May 2002 01:43:52 - 1.32
+++ build.xml 15 May 2002 21:00:29 - 1.33
@@ -82,7 +82,7 @@
include name=${novellndk.dir}/include if=netware /
include name=${java.home}/../include/netware if=netware /
include name=${java.home}/../include/hp-ux if=hpux /
-include name=${java.home}/../include/linux if=linux /
+include name=${java.home}/../include/linux if=linux/
include name=${java.home}/../include/win32 if=win32 /
/includes
depends
@@ -162,6 +162,7 @@
include name=${java.home}/../include/win32 if=win32 /
include name=${java.home}/../include/hp-ux if=hpux /
include name=${java.home}/../include/netware if=netware /
+include name=${java.home}/../include/linux if=linux/
include name=${novelllibc.dir}/include if=netware /
/includes
depends
@@ -223,6 +224,7 @@
src dir=.
include name=apache-1.3/mod_jk.c /
include name=common/*.c /
+ exclude name=common/jk_jni_worker.c /
exclude name=common/jk_nwmain.c unless=netware /
include name=common/apr/*.c unless=HAVE_APR /
/src
@@ -365,6 +367,7 @@
include name=${novellndk.dir}/include/nlm if=netware /
include name=${novellndk.dir}/include if=netware /
+include name=${java.home}/../include/linux if=linux /
include name=${java.home}/../include/netware if=netware /
include name=${apache13.home}/os/win32 if=win32 /
1.10 +55 -20jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jk_lb_worker.c3 May 2002 23:32:43 - 1.9
+++ jk_lb_worker.c15 May 2002 21:00:29 - 1.10
@@ -60,7 +60,7 @@
* several workers. *
* Author: Gal Shachor [EMAIL PROTECTED] *
* Based on: *
- * Version: $Revision: 1.9 $ *
+ * Version: $Revision: 1.10 $ *
***/
#include jk_pool.h
@@ -84,6 +84,7 @@
char*name;
double lb_factor;
double lb_value;
+int is_local_worker;
int in_error_state;
int in_recovering;
time_t error_time;
@@ -100,6 +101,8 @@
char *name;
jk_worker_t worker;
+int in_local_worker_mode;
+int local_worker_only;
};
typedef struct lb_worker lb_worker_t;
@@ -270,28 +273,29 @@
}
for(i = 0 ; i p-num_of_workers ; i++) {
-if(p-lb_workers[i].in_error_state) {
-if(!p-lb_workers[i].in_recovering) {
-time_t now = time(0);
-
-if((now - p-lb_workers[i].error_time) WAIT_BEFORE_RECOVER) {
-
-p-lb_workers[i].in_recovering = JK_TRUE;
-p-lb_workers[i].error_time = now;
+if (!p-in_local_worker_mode || p-lb_workers[i].is_local_worker ||
!p-local_worker_only) {
+if(p-lb_workers[i].in_error_state) {
+if(!p-lb_workers[i].in_recovering) {
+time_t now = time(0);
+if((now - p-lb_workers[i].error_time) WAIT_BEFORE_RECOVER) {
+p-lb_workers[i].in_recovering = JK_TRUE;
+p-lb_workers[i].error_time = now;
+rc = (p-lb_workers[i]);
+
+break;
+}
+}
+} else {
+if(p-lb_workers[i].lb_value lb_min || !rc) {
+lb_min = p-lb_workers[i].lb_value;
rc = (p-lb_workers[i]);
-
-break;
+if (rc-is_local_worker) break;
}
