www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Code Activity
15,696 Commits 62 Branches 313 Tags
httpd-proxy-scoreboard
Commit Graph

5189 Commits

Author SHA1 Message Date
Jean-Frederic Clere
4f469515c2 missing apr include. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@431328 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-14 12:15:11 +00:00
Jean-Frederic Clere
c30c2715a7 Arrange ident around if and if else. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@429472 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-07 20:48:05 +00:00
Jean-Frederic Clere
29b7e9bac8 Remove shared memory before creating it. (That only removes the file!). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428700 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-04 11:44:01 +00:00
Jean-Frederic Clere
abcc180710 Move health in proxy_worker_stat otherwise testing it in 
httpd is too complex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428492 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 19:31:12 +00:00
Jean-Frederic Clere
26d5e1681b Use only one slotmem for status and checker. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428437 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 16:01:50 +00:00
Jean-Frederic Clere
fa6fd6f3f3 Use a global pool for global pool. 
Remove the file containing the slotmems if its size has changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428435 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 15:56:20 +00:00
Jean-Frederic Clere
0363bedc4e A presistence to the shared memory slotmem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@428374 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 12:11:14 +00:00
Jean-Frederic Clere
ee0d40e5d2 Arrange the health_checker: add set_slotmem_storage_method(), 
create_slotmem() and attach_slotmem(). Arrange corresponding
files.

Start using the health logic in the balancer.

Arrange ap_proxy_add_worker_to_balancer().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427623 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-01 15:44:33 +00:00
Jean-Frederic Clere
2212dca5d0 create and attach cannot be used before the globalmem has been initialized. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427505 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-01 09:46:00 +00:00
Jean-Frederic Clere
cf8c677b6c Remove health_worker_method for mod_proxy.h and 
mod_proxy_health_checker.h from the includes of proxy_util.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427267 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 21:02:57 +00:00
Jean-Frederic Clere
2518c933e0 Move what belongs to the health_checker in the health checker. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427145 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 15:43:11 +00:00
Jean-Frederic Clere
55af90f7b9 AJP needs to be register at IANA before beeing in apr_uri_port_of_scheme(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@427103 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 12:40:01 +00:00
Jean-Frederic Clere
39f9634921 Allow anonymous shared memory. 
Arrange the mixing of checker size and proper httpd workers status in proxy_util.
Make slotmem.h multi times includable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426900 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-30 17:15:34 +00:00
Jean-Frederic Clere
f87da8ee19 Add ProxySlotMemLoc parameter: location of the file associated with the slot mem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426845 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 22:24:00 +00:00
Jean-Frederic Clere
6924bf0aff Rollback r426781. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426841 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 21:20:52 +00:00
Jean-Frederic Clere
6464834567 Copy the workers to the comarea for the checker in the post-config. 
(Instead doing it when parsing the configuration file).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426837 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 21:08:00 +00:00
Jean-Frederic Clere
d514bfb90b Create the directory for the path to the shared memory. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426781 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 11:43:25 +00:00
Jean-Frederic Clere
4d1426fc1c Use id instead worker->id so that a rearrange to the slot mems is possible. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426732 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:56:23 +00:00
Jean-Frederic Clere
36d27e847b Arrange stuff reported by Davi Arnaud. (thanks). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426717 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-29 00:20:21 +00:00
Jean-Frederic Clere
900139a150 Arrange the warning. Thanks Jim. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426708 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-28 23:37:15 +00:00
Jean-Frederic Clere
d0e5132941 First try to put togother an external health checker for mod_proxy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@426604 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-28 16:33:58 +00:00
Jean-Frederic Clere
b09239fa4a Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425764 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:36:05 +00:00
Jean-Frederic Clere
cd963e2fcf Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425761 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:26:49 +00:00
Jean-Frederic Clere
4963008b41 Try to have something that has the right size. 
The remaining problem is that proxy_lb_workers() only gives a good value when
the config file has been parsed (can't be used in preconfig().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425759 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 15:21:19 +00:00
Jean-Frederic Clere
cd6979529e Oops. item_size and item_num are pointers. Thanks Ruediger Pluem. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425752 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 14:57:25 +00:00
Jean-Frederic Clere
3e5ef3ea80 Add ap_slotmem_attach() to the slotmem_storage_method. 
Cut mod_sharemem.c in 2 so that its features could be
used outside httpd.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@425734 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-26 13:42:43 +00:00
Jean-Frederic Clere
cd80ecf805 Correct small errors: Thanks Ruediger Pluem who review the code. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@424059 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-20 20:49:56 +00:00
Jean-Frederic Clere
1005eae32f Arrange the licence. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@424045 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-20 20:21:03 +00:00
Jean-Frederic Clere
eb6c5271b9 Typo. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423581 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 19:47:23 +00:00
Jean-Frederic Clere
e784ba6932 Allow to use the new slotmem providers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423451 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 12:54:07 +00:00
Jean-Frederic Clere
82229302b7 Add 3 memory handlers to replace the scoreboard area of mod-proxy. 
Note the mod_scoreboard.c just uses the actual scoreboard "shared" area
for the workers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-proxy-scoreboard@423444 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-19 12:18:10 +00:00
Ruediger Pluem
ef947df07e * Remove ourselves from the filter chain if we failed to init libz, as we 
pass data down the filter chain uncompressed afterwards.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422739 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 15:24:29 +00:00
Ruediger Pluem
e65116b777 * Fix potential memory leaks in deflate_out_filter if bailing out due to an 
error (either in the lower filter chain or during a libz operation). We need
  to call deflateEnd as it is very likely that this filter is never called
  again to ensures that libz's internal structures get cleaned properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422736 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 15:08:27 +00:00
Ruediger Pluem
54c1b9749e * Fix wrong FLUSH bucket handling in deflate_out_filter: Actually the internal 
structures of libz never got flushed as ctx->stream.avail_in is always zero
  here. As the EOS and the FLUSH bucket case use the same code for flushing
  libz's internal buffers move this code to the new function flush_zlib_buffer.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422731 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-17 14:32:50 +00:00
Nick Kew
a3f4adfa28 Use <string.h>-compatible versions of ap_str* functions. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422178 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 08:39:41 +00:00
Jim Jagielski
58c0a69c7b Don't down cast 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421959 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-14 17:34:59 +00:00
Nick Kew
346c6c3e76 Support environment variable interpolation in reverse proxy configuration 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421686 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-13 19:00:26 +00:00
Jim Jagielski
ae24222e23 The number of times elected as well as the i/o 
of the workers is useful info to show in the
manager.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421287 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 15:13:22 +00:00
Jim Jagielski
3e2c97f512 It never fails. I sit on a patch for awhile and 
it's not until almost right after I commit it that
I think "hey, there's a better way to do that."
Anyway, I was never happy about the code
duplication of the primary/standby checks...
This fixes that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421283 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 15:01:15 +00:00
Jean-Frederic Clere
2afcfcfe6d Issue a warning when the same worker name is reused. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421252 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 12:08:36 +00:00
Roy T. Fielding
70d52262ee update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421021 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 23:07:06 +00:00
Roy T. Fielding
8543206431 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421020 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 23:04:56 +00:00
Roy T. Fielding
47e590252a update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420993 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 21:18:15 +00:00
Roy T. Fielding
44fa6e0073 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420990 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:55:32 +00:00
Jim Jagielski
0b80babf0b Add in hot-standby balancer member. If all other members 
are disabled or not-usable, ONLY THEN will the hot
standby's be used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420986 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:39:38 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Jim Jagielski
7b9391e010 Clean up some proxy macros. Avoid the use of magic 
numbers, and instead use pre-defined defines. Also,
ensure that usable workers have been initialized :)

Allocate a bit for hot standbys. Adjust so that
normal "usable" workers don't count these.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420954 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 19:32:36 +00:00
Jim Jagielski
92a185a104 Restructure the find_route_worker() function. Basically, 
it should take care of knowing about usable and unusable
workers. By centralizing this logic, it will make it
easier and more streamlined to add in the forthcoming
hot-standby status workers.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420936 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 17:51:54 +00:00
William A. Rowe Jr
b31873b39b This tree can't be named modules/debug/. Now it isn't. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419652 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-06 18:47:09 +00:00
William A. Rowe Jr
6df9b82d20 Revert Revision 397647 
While it solves the studio 2005 (we desire this), it breaks
the studio 6 packaging (we require this).  Discussion on list
of practical solutions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419644 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-06 18:36:23 +00:00