mirror of
http://git.haproxy.org/git/haproxy.git/
synced 2024-12-18 09:24:31 +00:00
BUG/MINOR: cache: Fix loop on cache entries in "show cache"
A regression was introduced in the commit da91842b6
("BUG/MEDIUM: cache/cli:
make "show cache" thread-safe"). When cli_io_handler_show_cache() is called,
only one node is retrieved and is used to fill the output buffer in loop.
Once set, the "node" variable is never renewed. At the end, all nodes are
dumped but each one is duplicated several time into the output buffer.
This patch must be backported everywhere the above commit is. It means only
to 2.5 and 2.4.
This commit is contained in:
parent
73dec76e85
commit
27f88a9059
@ -2589,8 +2589,7 @@ static int cli_io_handler_show_cache(struct appctx *appctx)
|
||||
while (1) {
|
||||
|
||||
shctx_lock(shctx_ptr(cache));
|
||||
if (!node)
|
||||
node = eb32_lookup_ge(&cache->entries, next_key);
|
||||
node = eb32_lookup_ge(&cache->entries, next_key);
|
||||
if (!node) {
|
||||
shctx_unlock(shctx_ptr(cache));
|
||||
appctx->ctx.cli.i0 = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user