1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Commit Graph

29 Commits

Author SHA1 Message Date
Mladen Turk
f3c232041a The name of the module is mod_proxy not mpm_proxy.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105348 13f79535-47bb-0310-9956-ffa450edef68
2004-09-29 19:14:15 +00:00
Mladen Turk
5a27b0519e No need to call the ap_proxy_initialize_worker when initializing
balancer members, but make sure that balancer module is initialized
after proxy module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105347 13f79535-47bb-0310-9956-ffa450edef68
2004-09-29 19:09:55 +00:00
Mladen Turk
0d9c89ae6f Reformat code to no tab and no CR-LF
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105320 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 16:54:29 +00:00
Mladen Turk
258273c945 Make sure that we don't increase balancer worker count on
gracefull restart. Thanks to Christian...again.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105318 13f79535-47bb-0310-9956-ffa450edef68
2004-09-28 16:35:29 +00:00
Mladen Turk
349fbd8eb1 Initialize workers for every virtual server not just for default one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105298 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 18:17:38 +00:00
Mladen Turk
568bee156b Use the Christian von Roques's idea that makes the election mechanism
much simpler. This also removes the need to count the number of free
connections per channel.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105295 13f79535-47bb-0310-9956-ffa450edef68
2004-09-26 06:58:36 +00:00
Mladen Turk
f726314b43 Add failover attempts management to balancer-manager.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105173 13f79535-47bb-0310-9956-ffa450edef68
2004-09-16 14:12:36 +00:00
Mladen Turk
31df4f2be8 Do not set shared data from previous worker if ap_get_scoreboard_lb fails.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105156 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 18:27:08 +00:00
Mladen Turk
89bcba3513 Fix core dump on WIN32 caused by the fact that there is no way to run a
hook after ap_scoreboard_init. Since we only have a single child on
WIN32 that isn't a big problem, cause plain memory is enough. Other
platforms were not affected cause scoreboard_image is inherited from parent.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105151 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 17:11:08 +00:00
Mladen Turk
d967283d1f Worker shared data has to be visible across all child processes,
so remove creating that data on per-child basis.
Thanks to Christian von Roques for the patch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105135 13f79535-47bb-0310-9956-ffa450edef68
2004-09-15 12:10:36 +00:00
Mladen Turk
99af1492a3 Add more comments to the code -- No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105075 13f79535-47bb-0310-9956-ffa450edef68
2004-09-11 16:39:38 +00:00
Mladen Turk
4877098bc4 Initialize the balancer on child_init instead on first request to skip
the race condition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105063 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 18:25:54 +00:00
Mladen Turk
e93d6400e3 Include unistd.h for getpid.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105061 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 14:49:38 +00:00
Mladen Turk
916b02a98d Move the shared scoreboard data initization to the balancer module.
The initialization is done like for the worker, on first request.
This is done because during config phase we don't have a scoreboard
to allocate from. Thanks to Chritian von Roques for spotting that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105057 13f79535-47bb-0310-9956-ffa450edef68
2004-09-10 08:16:25 +00:00
Jeff Trawick
8091053814 spell check
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104944 13f79535-47bb-0310-9956-ffa450edef68
2004-09-03 16:15:03 +00:00
André Malo
7fe1e763e8 remove unused variables and fix some compiler warnings about const
qualifiers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104838 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 21:10:01 +00:00
Mladen Turk
2d7f11c803 Add dynamic management to load balancer:
<Location /manager>
  SetHandler balancer-manager
</Location>
It enables changing load factors, session routes, redirection
routes, and disabling/enabling particular workers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104812 13f79535-47bb-0310-9956-ffa450edef68
2004-08-26 06:53:39 +00:00
Mladen Turk
38974860db Remove uneeded access_status variable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104792 13f79535-47bb-0310-9956-ffa450edef68
2004-08-24 13:50:43 +00:00
Mladen Turk
b9bee51adf Do not check the balancer param.
It is already checked prior the hook is called from mod_proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104791 13f79535-47bb-0310-9956-ffa450edef68
2004-08-24 13:48:13 +00:00
Mladen Turk
58e35c8a4b Increase the request count for each runtime worker
when the worker is elected.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104789 13f79535-47bb-0310-9956-ffa450edef68
2004-08-24 12:10:37 +00:00
Mladen Turk
e238532201 Add session route to request rec notes if present.
The session route is used only in proxy_ajp for now and
passed inside AJP header message.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104786 13f79535-47bb-0310-9956-ffa450edef68
2004-08-24 11:27:31 +00:00
Jeff Trawick
64119fafdd fix some const issues with string searching
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104644 13f79535-47bb-0310-9956-ffa450edef68
2004-08-13 12:11:50 +00:00
William A. Rowe Jr
6590e33ec9 Fix the url rewriting, and few minor developement bugs.
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104622 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 23:08:34 +00:00
William A. Rowe Jr
4d5f6895d1 Implement the worker retry functionality.
It uses either worker->retry option or default 60 second retry
that is on each revolution extended by another 60 seconds.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104619 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 23:05:59 +00:00
William A. Rowe Jr
ec90a6826c Use the proxy_runtime_stat that either comes from scoreboard or
directly allocating memory if there is no scoreboard support or it is not
neaded, due to the fact that we have single child process.

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104618 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 23:03:43 +00:00
William A. Rowe Jr
e1c9bf4b2a Add rewrite url function and calcute lbstatuses when session worker is elected.
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104614 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 22:58:51 +00:00
William A. Rowe Jr
9bdff3874d The lbstatus needs to be updated for every worker, not just the candidate.
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104613 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 22:58:30 +00:00
William A. Rowe Jr
392b0fc5fc Add finding of a most suitable worker.
Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104612 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 22:58:03 +00:00
William A. Rowe Jr
3c5a741b55 Add proxy_balancer to proxy module, including config and capturing
-I ../generators for the mod_status.h

Submitted by: mturk


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104608 13f79535-47bb-0310-9956-ffa450edef68
2004-08-11 22:52:46 +00:00