upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-24 15:49:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
haproxy/src/cli.c

4564 lines
136 KiB
C
Raw Normal View History

[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
/*
[MEDIUM] separate protocol-level accept() from the frontend's For a long time we had two large accept() functions, one for TCP sockets instanciating proxies, and another one for UNIX sockets instanciating the stats interface. A lot of code was duplicated and both did not work exactly the same way. Now we have a stream_sock layer accept() called for either TCP or UNIX sockets, and this function calls the frontend-specific accept() function which does the rest of the frontend-specific initialisation. Some code is still duplicated (session & task allocation, stream interface initialization), and might benefit from having an intermediate session-level accept() callback to perform such initializations. Still there are some minor differences that need to be addressed first. For instance, the monitor nets should only be checked for proxies and not for other connection templates. Last, we renamed l->private as l->frontend. The "private" pointer in the listener is only used to store a frontend, so let's rename it to eliminate this ambiguity. When we later support detached listeners (eg: FTP), we'll add another field to avoid the confusion.
2010-05-28 12:46:57 -04:00
* Functions dedicated to statistics output and the stats socket
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
*
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
* Copyright 2000-2012 Willy Tarreau <w@1wt.eu>
[MEDIUM] Collect & show information about last health check, v3 Collect information about last health check result, including L7 code if possible (for example http or smtp return code) and time took to finish last check. Health check info is provided on both stats pages (html & csv) and logged when a server is marked UP or DOWN. Currently active check are marked with an asterisk, but only in html mode. Currently there are 14 status codes: UNK -> unknown INI -> initializing SOCKERR -> socket error L4OK -> check passed on layer 4, no upper layers testing enabled L4TOUT -> layer 1-4 timeout L4CON -> layer 1-4 connection problem, for example "Connection refused" (tcp rst) or "No route to host" (icmp) L6OK -> check passed on layer 6 L6TOUT -> layer 6 (SSL) timeout L6RSP -> layer 6 invalid response - protocol error L7OK -> check passed on layer 7 L7OKC -> check conditionally passed on layer 7, for example 404 with disable-on-404 L7TOUT -> layer 7 (HTTP/SMTP) timeout L7RSP -> layer 7 invalid response - protocol error L7STS -> layer 7 response error, for example HTTP 5xx
2009-09-23 16:09:24 -04:00
* Copyright 2007-2009 Krzysztof Piotr Oledzki <ole@ans.pl>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
* 2 of the License, or (at your option) any later version.
*
*/
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
#include <pwd.h>
#include <grp.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h>
[MEDIUM] modularize the global "stats" keyword configuration parser The "stats" keyword already relied on an external parser, let's make use of the new keyword registration mechanism.
2008-07-09 14:12:41 -04:00
#include <common/cfgparse.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <common/compat.h>
#include <common/config.h>
#include <common/debug.h>
#include <common/memory.h>
#include <common/mini-clist.h>
#include <common/standard.h>
[MAJOR] convert all expiration timers from timeval to ticks This is the first attempt at moving all internal parts from using struct timeval to integer ticks. Those provides simpler and faster code due to simplified operations, and this change also saved about 64 bytes per session. A new header file has been added : include/common/ticks.h. It is possible that some functions should finally not be inlined because they're used quite a lot (eg: tick_first, tick_add_ifset and tick_is_expired). More measurements are required in order to decide whether this is interesting or not. Some function and variable names are still subject to change for a better overall logics.
2008-07-06 18:09:58 -04:00
#include <common/ticks.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <common/time.h>
#include <common/uri_auth.h>
#include <common/version.h>
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
#include <common/base64.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
REORG: applet: move the applet definitions out of stream_interface We're tidying the definitions so that appctx lives on its own. A new set of applet.h files has been added for this purpose.
2015-04-13 07:24:54 -04:00
#include <types/applet.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <types/global.h>
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
#include <types/dns.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <proto/backend.h>
REORG: buffers: split buffers into chunk,buffer,channel Many parts of the channel definition still make use of the "buffer" word.
2012-08-24 13:22:53 -04:00
#include <proto/channel.h>
[MEDIUM] Collect & show information about last health check, v3 Collect information about last health check result, including L7 code if possible (for example http or smtp return code) and time took to finish last check. Health check info is provided on both stats pages (html & csv) and logged when a server is marked UP or DOWN. Currently active check are marked with an asterisk, but only in html mode. Currently there are 14 status codes: UNK -> unknown INI -> initializing SOCKERR -> socket error L4OK -> check passed on layer 4, no upper layers testing enabled L4TOUT -> layer 1-4 timeout L4CON -> layer 1-4 connection problem, for example "Connection refused" (tcp rst) or "No route to host" (icmp) L6OK -> check passed on layer 6 L6TOUT -> layer 6 (SSL) timeout L6RSP -> layer 6 invalid response - protocol error L7OK -> check passed on layer 7 L7OKC -> check conditionally passed on layer 7, for example 404 with disable-on-404 L7TOUT -> layer 7 (HTTP/SMTP) timeout L7RSP -> layer 7 invalid response - protocol error L7STS -> layer 7 response error, for example HTTP 5xx
2009-09-23 16:09:24 -04:00
#include <proto/checks.h>
MINOR: compression: report zlib memory usage Show the memory usage and the max memory available for zlib. The value stored is now the memory used instead of the remaining available memory.
2012-11-20 05:25:20 -05:00
#include <proto/compression.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
#include <proto/dumpstats.h>
#include <proto/fd.h>
[MEDIUM] measure and report session rate on frontend, backends and servers With this change, all frontends, backends, and servers maintain a session counter and a timer to compute a session rate over the last second. This value will be very useful because it varies instantly and can be used to check thresholds. This value is also reported in the stats in a new "rate" column.
2009-03-05 12:43:00 -05:00
#include <proto/freq_ctr.h>
MEDIUM: stats: use frontend_accept() as the accept function We don't need to use our dedicated function anymore, so stats_accept() was removed.
2015-03-13 11:14:57 -04:00
#include <proto/frontend.h>
[MEDIUM] separate protocol-level accept() from the frontend's For a long time we had two large accept() functions, one for TCP sockets instanciating proxies, and another one for UNIX sockets instanciating the stats interface. A lot of code was duplicated and both did not work exactly the same way. Now we have a stream_sock layer accept() called for either TCP or UNIX sockets, and this function calls the frontend-specific accept() function which does the rest of the frontend-specific initialisation. Some code is still duplicated (session & task allocation, stream interface initialization), and might benefit from having an intermediate session-level accept() callback to perform such initializations. Still there are some minor differences that need to be addressed first. For instance, the monitor nets should only be checked for proxies and not for other connection templates. Last, we renamed l->private as l->frontend. The "private" pointer in the listener is only used to store a frontend, so let's rename it to eliminate this ambiguity. When we later support detached listeners (eg: FTP), we'll add another field to avoid the confusion.
2010-05-28 12:46:57 -04:00
#include <proto/log.h>
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
#include <proto/pattern.h>
[STATS] report pipe usage in the statistics Pipe usage is reported in info and web stats including maxpipes, pipes_free, and pipes_used.
2009-01-25 08:02:00 -05:00
#include <proto/pipe.h>
REORG: split "protocols" files into protocol and listener It was becoming confusing to have protocols and listeners in the same files, split them.
2012-09-12 16:58:11 -04:00
#include <proto/listener.h>
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
#include <proto/map.h>
MINOR: cli: report the msg state in full text in "show sess $PTR" It's more convenient to debug with real state names.
2012-11-23 05:19:33 -05:00
#include <proto/proto_http.h>
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
#include <proto/proto_uxst.h>
[MEDIUM] make the global stats socket part of a frontend Creating a frontend for the global stats socket will help merge unix sockets management with the other socket management. Since frontends are huge structs, we only allocate it if required.
2009-08-16 11:41:45 -04:00
#include <proto/proxy.h>
MINOR: sample: move smp_to_type to sample.c This way it can be exported and reused anywhere else to report type names.
2014-02-07 06:14:54 -05:00
#include <proto/sample.h>
REORG: session: move the session parts out of stream.c This concerns everythins related to accepting a new session and expiring the embryonic session. There's still a hard-coded call to stream_accept_session() which could be set somewhere in the frontend, but for now it's not a problem.
2015-04-04 12:50:31 -04:00
#include <proto/session.h>
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
#include <proto/stream.h>
[MEDIUM] stats: report server and backend cumulated downtime Hello, This patch implements new statistics for SLA calculation by adding new field 'Dwntime' with total down time since restart (both HTTP/CSV) and extending status field (HTTP) or inserting a new one (CSV) with time showing how long each server/backend is in a current state. Additionaly, down transations are also calculated and displayed for backends, so it is possible to know how many times selected backend was down, generating "No server is available to handle this request." error. New information are presentetd in two different ways: - for HTTP: a "human redable form", one of "100000d 23h", "23h 59m" or "59m 59s" - for CSV: seconds I believe that seconds resolution is enough. As there are more columns in the status page I decided to shrink some names to make more space: - Weight -> Wght - Check -> Chk - Down -> Dwn Making described changes I also made some improvements and fixed some small bugs: - don't increment s->health above 's->rise + s->fall - 1'. Previously it was incremented an then (re)set to 's->rise + s->fall - 1'. - do not set server down if it is down already - do not set server up if it is up already - fix colspan in multiple places (mostly introduced by my previous patch) - add missing "status" header to CSV - fix order of retries/redispatches in server (CSV) - s/Tthen/Then/ - s/server/backend/ in DATA_ST_PX_BE (dumpstats.c) Changes from previous version: - deal with negative time intervales - don't relay on s->state (SRV_RUNNING) - little reworked human_time + compacted format (no spaces). If needed it can be used in the future for other purposes by optionally making "cnt" as an argument - leave set_server_down mostly unchanged - only little reworked "process_chk: 9" - additional fields in CSV are appended to the rigth - fix "SEC" macro - named arguments (human_time, be_downtime, srv_downtime) Hope it is OK. If there are only cosmetic changes needed please fill free to correct it, however if there are some bigger changes required I would like to discuss it first or at last to know what exactly was changed especially since I already put this patch into my production server. :) Thank you, Best regards, Krzysztof Oledzki
2007-10-22 10:21:10 -04:00
#include <proto/server.h>
REORG: sock_raw: rename the files raw_sock* The "raw_sock" prefix will be more convenient for naming functions as it will be prefixed with the data layer and suffixed with the data direction. So let's rename the files now to avoid any further confusion. The #include directive was also removed from a number of files which do not need it anymore.
2012-08-20 11:01:35 -04:00
#include <proto/raw_sock.h>
[MINOR] replace client_retnclose() with stream_int_retnclose() This makes more sense to return a message to a stream interface than to a session. senddata.{c,h} have been removed.
2008-11-30 13:48:07 -05:00
#include <proto/stream_interface.h>
[OPTIM] task: don't unlink a task from a wait queue when waking it up In many situations, we wake a task on an I/O event, then queue it exactly where it was. This is a real waste because we delete/insert tasks into the wait queue for nothing. The only reason for this is that there was only one tree node in the task struct. By adding another tree node, we can have one tree for the timers (wait queue) and one tree for the priority (run queue). That way, we can have a task both in the run queue and wait queue at the same time. The wait queue now really holds timers, which is what it was designed for. The net gain is at least 1 delete/insert cycle per session, and up to 2-3 depending on the workload, since we save one cycle each time the expiration date is not changed during a wake up.
2009-03-07 11:25:21 -05:00
#include <proto/task.h>
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
BUILD: cli: fix build when SSL is enabled Commit bc174aa forgot to include proto/ssl_sock.h.
2012-11-19 11:13:16 -05:00
#ifdef USE_OPENSSL
#include <proto/ssl_sock.h>
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#include <types/ssl_sock.h>
BUILD: cli: fix build when SSL is enabled Commit bc174aa forgot to include proto/ssl_sock.h.
2012-11-19 11:13:16 -05:00
#endif
MINOR: stats: add all the "show info" fields in a table This will be used to dump them in the most appropriate format.
2016-01-11 12:12:26 -05:00
/* These are the field names for each INF_* field position. Please pay attention
* to always use the exact same name except that the strings for new names must
* be lower case or CamelCase while the enum entries must be upper case.
*/
const char *info_field_names[INF_TOTAL_FIELDS] = {
[INF_NAME] = "Name",
[INF_VERSION] = "Version",
[INF_RELEASE_DATE] = "Release_date",
[INF_NBPROC] = "Nbproc",
[INF_PROCESS_NUM] = "Process_num",
[INF_PID] = "Pid",
[INF_UPTIME] = "Uptime",
[INF_UPTIME_SEC] = "Uptime_sec",
[INF_MEMMAX_MB] = "Memmax_MB",
[INF_POOL_ALLOC_MB] = "PoolAlloc_MB",
[INF_POOL_USED_MB] = "PoolUsed_MB",
[INF_POOL_FAILED] = "PoolFailed",
[INF_ULIMIT_N] = "Ulimit-n",
[INF_MAXSOCK] = "Maxsock",
[INF_MAXCONN] = "Maxconn",
[INF_HARD_MAXCONN] = "Hard_maxconn",
[INF_CURR_CONN] = "CurrConns",
[INF_CUM_CONN] = "CumConns",
[INF_CUM_REQ] = "CumReq",
[INF_MAX_SSL_CONNS] = "MaxSslConns",
[INF_CURR_SSL_CONNS] = "CurrSslConns",
[INF_CUM_SSL_CONNS] = "CumSslConns",
[INF_MAXPIPES] = "Maxpipes",
[INF_PIPES_USED] = "PipesUsed",
[INF_PIPES_FREE] = "PipesFree",
[INF_CONN_RATE] = "ConnRate",
[INF_CONN_RATE_LIMIT] = "ConnRateLimit",
[INF_MAX_CONN_RATE] = "MaxConnRate",
[INF_SESS_RATE] = "SessRate",
[INF_SESS_RATE_LIMIT] = "SessRateLimit",
[INF_MAX_SESS_RATE] = "MaxSessRate",
[INF_SSL_RATE] = "SslRate",
[INF_SSL_RATE_LIMIT] = "SslRateLimit",
[INF_MAX_SSL_RATE] = "MaxSslRate",
[INF_SSL_FRONTEND_KEY_RATE] = "SslFrontendKeyRate",
[INF_SSL_FRONTEND_MAX_KEY_RATE] = "SslFrontendMaxKeyRate",
[INF_SSL_FRONTEND_SESSION_REUSE_PCT] = "SslFrontendSessionReuse_pct",
[INF_SSL_BACKEND_KEY_RATE] = "SslBackendKeyRate",
[INF_SSL_BACKEND_MAX_KEY_RATE] = "SslBackendMaxKeyRate",
[INF_SSL_CACHE_LOOKUPS] = "SslCacheLookups",
[INF_SSL_CACHE_MISSES] = "SslCacheMisses",
[INF_COMPRESS_BPS_IN] = "CompressBpsIn",
[INF_COMPRESS_BPS_OUT] = "CompressBpsOut",
[INF_COMPRESS_BPS_RATE_LIM] = "CompressBpsRateLim",
[INF_ZLIB_MEM_USAGE] = "ZlibMemUsage",
[INF_MAX_ZLIB_MEM_USAGE] = "MaxZlibMemUsage",
[INF_TASKS] = "Tasks",
[INF_RUN_QUEUE] = "Run_queue",
[INF_IDLE_PCT] = "Idle_pct",
[INF_NODE] = "node",
[INF_DESCRIPTION] = "description",
};
/* one line of stats */
static struct field info[INF_TOTAL_FIELDS];
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
static int stats_dump_backend_to_buffer(struct stream_interface *si);
MINOR: cli: add a new "show env" command Using environment variables in configuration files can make troubleshooting complicated because there's no easy way to verify that the variables are correct. This patch introduces a new "show env" command which displays the whole environment on the CLI, one variable per line. The socket must at least have level operator to display the environment.
2016-02-16 05:27:28 -05:00
static int stats_dump_env_to_buffer(struct stream_interface *si);
REORG: stats: functions are now HTTP/CLI agnostic All the functions that were called "http" or "raw" have been cleaned up to support either only HTML and use that word in their name, or support both HTML and CSV and be usable both from the HTTP and the CLI entry points. stats_http_dump() now explicitly checks for HTML mode before adding HTML-specific headers/trailers, and has been renamed since it's now used by both entry points. Some more duplicated code could be removed. The patch looks big but it's mostly due to re-indents resulting from the moves or comments updates. The calling sequences now look like this : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_info_to_buffer() // "show info" -> stats_dump_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy_to_buffer() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() http_stats_io_handler() -> stats_dump_stat_to_buffer() // same as above, but used for CSV or HTML -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_html_head() // emits the HTML headers -> stats_dump_html_info() // emits the equivalent of "show info" at the top -> stats_dump_proxy_to_buffer() // same as above, valid for CSV and HTML -> stats_dump_html_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_html_px_end() -> stats_dump_html_end() // emits HTML trailer
2012-12-22 17:20:30 -05:00
static int stats_dump_info_to_buffer(struct stream_interface *si);
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
static int stats_dump_servers_state_to_buffer(struct stream_interface *si);
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
static int stats_dump_pools_to_buffer(struct stream_interface *si);
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
static int stats_dump_full_sess_to_buffer(struct stream_interface *si, struct stream *sess);
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static int stats_dump_sess_to_buffer(struct stream_interface *si);
static int stats_dump_errors_to_buffer(struct stream_interface *si);
BUILD: stdbool is not portable Benjamin Polidore reported a build issue on Solaris with gcc 4.2.4 where stdbool is not usable without c99. It only appeared at one location in dumpstats and is totally useless, let's use the more common and portable int as everywhere else.
2012-12-05 17:01:12 -05:00
static int stats_table_request(struct stream_interface *si, int show);
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
static int stats_dump_resolvers_to_buffer(struct stream_interface *si);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
static int stats_pats_list(struct stream_interface *si);
static int stats_pat_list(struct stream_interface *si);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
static int stats_map_lookup(struct stream_interface *si);
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
static int stats_tlskeys_list(struct stream_interface *si);
#endif
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
static int dump_servers_state(struct stream_interface *si, struct chunk *buf);
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
CLEANUP: applet: rename struct si_applet to applet Since this one does not depend on stream_interface anymore, remove the "si_" prefix.
2015-04-13 07:50:30 -04:00
static struct applet cli_applet;
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static const char stats_sock_usage_msg[] =
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
"Unknown command. Please enter one of the following commands only :\n"
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
" clear counters : clear max statistics counters (add 'all' for all counters)\n"
[MEDIUM] stats: add "clear table <name> key <value>" to clear table entries This feature will be required at some point, when the stick tables are used to enforce security measures. For instance, some visitors may be incorrectly flagged as abusers and would ask the site admins to remove their entry from the table.
2010-07-13 07:48:00 -04:00
" clear table : remove an entry from a table\n"
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
" help : this message\n"
" prompt : toggle interactive mode with prompt\n"
" quit : disconnect\n"
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
" show backend : list backends in the current running config\n"
MINOR: cli: add a new "show env" command Using environment variables in configuration files can make troubleshooting complicated because there's no easy way to verify that the variables are correct. This patch introduces a new "show env" command which displays the whole environment on the CLI, one variable per line. The socket must at least have level operator to display the environment.
2016-02-16 05:27:28 -05:00
" show env [var] : dump environment variables known to the process\n"
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
" show info : report information about the running process\n"
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
" show pools : report information about the memory pools usage\n"
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
" show stat : report counters for each proxy and server\n"
MINOR: stats: show stat resolvers missing in the help message The help message provided by the "help" command on the unix socket didn't provide "show stat resolvers" in the list of supported commands. This patch should be backported to 1.6
2016-05-06 06:18:51 -04:00
" show stat resolvers [id]: dumps counters from all resolvers section and\n"
" associated name servers\n"
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
" show errors : report last request and response errors for each proxy\n"
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" show sess [id] : report the list of current sessions or dump this session\n"
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
" show table [id]: report table usage stats or dump this table's contents\n"
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
" show servers state [id]: dump volatile server information (for backend <id>)\n"
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
" get weight : report a server's current weight\n"
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
" set weight : change a server's weight\n"
MEDIUM: server: change server ip address from stats socket New command available on the stats socket to change a server addr using the command "set server <backend>/<server> addr <ip4|ip6>"
2015-04-13 16:54:33 -04:00
" set server : change a server's state, weight or address\n"
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
" set table [id] : update or create a table entry's data\n"
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
" set timeout : change a timeout setting\n"
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
" set maxconn : change a maxconn setting\n"
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
" set rate-limit : change a rate limiting value\n"
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
" disable : put a server or frontend in maintenance mode\n"
" enable : re-enable a server or frontend which is in maintenance mode\n"
" shutdown : kill a session or a frontend (eg:to release listening ports)\n"
MINOR: stats: fix typo in help messages The word "available" was mistakenly written "avalaible" in help messages and comments. This patch should be backported to 1.5 and 1.6
2016-05-06 06:18:50 -04:00
" show acl [id] : report available acls or dump an acl's contents\n"
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
" get acl : reports the patterns matching a sample for an ACL\n"
" add acl : add acl entry\n"
" del acl : delete acl entry\n"
" clear acl <id> : clear the content of this acl\n"
MINOR: stats: fix typo in help messages The word "available" was mistakenly written "avalaible" in help messages and comments. This patch should be backported to 1.5 and 1.6
2016-05-06 06:18:50 -04:00
" show map [id] : report available maps or dump a map's contents\n"
MINOR: dumpstats: Group map inline help
2014-03-11 08:42:38 -04:00
" get map : reports the keys and values matching a sample for a map\n"
" set map : modify map entry\n"
" add map : add map entry\n"
" del map : delete map entry\n"
" clear map <id> : clear the content of this map\n"
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
" set ssl <stmt> : set statement for ssl\n"
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
" show tls-keys [id|*]: show tls keys references or dump tls ticket keys when id specified\n"
#endif
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
"";
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static const char stats_permission_denied_msg[] =
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
"Permission denied\n"
"";
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
static char *dynamic_usage_msg = NULL;
/* List head of cli keywords */
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static struct cli_kw_list cli_keywords = {
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
.list = LIST_HEAD_INIT(cli_keywords.list)
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
};
MINOR: stats admin: reduce memcmp()/strcmp() calls on status codes memcmp()/strcmp() calls were needed in different parts of code to determine the status code. Each new status code introduces new calls, which can become inefficient and source of bugs. This patch reorganizes the code to rely on a numeric status code internally and to be hopefully more generic.
2012-04-04 06:57:21 -04:00
extern const char *stat_status_codes[];
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
char *cli_gen_usage_msg()
{
struct cli_kw_list *kw_list;
struct cli_kw *kw;
struct chunk *tmp = get_trash_chunk();
struct chunk out;
free(dynamic_usage_msg);
dynamic_usage_msg = NULL;
if (LIST_ISEMPTY(&cli_keywords.list))
return NULL;
chunk_reset(tmp);
chunk_strcat(tmp, stats_sock_usage_msg);
list_for_each_entry(kw_list, &cli_keywords.list, list) {
kw = &kw_list->kw[0];
while (kw->usage) {
chunk_appendf(tmp, " %s\n", kw->usage);
kw++;
}
}
chunk_init(&out, NULL, 0);
chunk_dup(&out, tmp);
dynamic_usage_msg = out.str;
return dynamic_usage_msg;
}
struct cli_kw* cli_find_kw(char **args)
{
struct cli_kw_list *kw_list;
struct cli_kw *kw;/* current cli_kw */
char **tmp_args;
const char **tmp_str_kw;
int found = 0;
if (LIST_ISEMPTY(&cli_keywords.list))
return NULL;
list_for_each_entry(kw_list, &cli_keywords.list, list) {
kw = &kw_list->kw[0];
while (*kw->str_kw) {
tmp_args = args;
tmp_str_kw = kw->str_kw;
while (*tmp_str_kw) {
if (strcmp(*tmp_str_kw, *tmp_args) == 0) {
found = 1;
} else {
found = 0;
break;
}
tmp_args++;
tmp_str_kw++;
}
if (found)
return (kw);
kw++;
}
}
return NULL;
}
void cli_register_kw(struct cli_kw_list *kw_list)
{
LIST_ADDQ(&cli_keywords.list, &kw_list->list);
}
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
/* allocate a new stats frontend named <name>, and return it
* (or NULL in case of lack of memory).
*/
MINOR: stats: fill the file and line numbers in the stats frontend The stats frontend struct has config file and line which were not set. They're not used right now but better fill them correctly anyway.
2012-09-18 14:05:00 -04:00
static struct proxy *alloc_stats_fe(const char *name, const char *file, int line)
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
{
struct proxy *fe;
CLEANUP: uniformize last argument of malloc/calloc Instead of repeating the type of the LHS argument (sizeof(struct ...)) in calls to malloc/calloc, we directly use the pointer name (sizeof(*...)). The following Coccinelle patch was used: @@ type T; T *x; @@ x = malloc( - sizeof(T) + sizeof(*x) ) @@ type T; T *x; @@ x = calloc(1, - sizeof(T) + sizeof(*x) ) When the LHS is not just a variable name, no change is made. Moreover, the following patch was used to ensure that "1" is consistently used as a first argument of calloc, not the last one: @@ @@ calloc( + 1, ... - ,1 )
2016-04-03 07:48:43 -04:00
fe = calloc(1, sizeof(*fe));
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
if (!fe)
return NULL;
[BUG] proxy: stats frontend and peers were missing many initializers This was revealed with one of the very latest patches which caused the listener_queue not to be initialized on the stats socket frontend. And in fact a number of other ones were missing too. This is getting so boring that now we'll always make use of the same function to initialize any proxy. Doing so has even saved about 500 bytes on the binary due to the avoided code redundancy. No backport is needed.
2011-07-28 19:49:03 -04:00
init_new_proxy(fe);
MEDIUM: proxy: add the global frontend to the list of normal proxies Since recent changes on the global frontend, it was not possible anymore to soft-reload a process which had a stats socket because the socket would not be disabled upon reload. The only solution to this endless madness is to have the global frontend part of normal proxies. Since we don't want to get an ID that shifts all other proxies and causes trouble in deployed environments, we assign it ID #0 which other proxies can't grab, and we don't report it in the stats pages.
2012-10-04 02:47:34 -04:00
fe->next = proxy;
proxy = fe;
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
fe->last_change = now.tv_sec;
fe->id = strdup("GLOBAL");
fe->cap = PR_CAP_FE;
[MEDIUM] stats: disable complex socket reservation for stats socket The way the unix socket is initialized is awkward. Some of the settings are put in the sockets itself, other ones in the backend. And more importantly the global.maxsock value is adjusted so that the stats socket evades the global maxconn value. This complexifies maxsock computations for nothing, since the stats socket is not supposed to receive hundreds of concurrent connections when the global maxconn is very low. What is needed however is to ensure that there are always connections left for the stats socket even when traffic sockets are saturated, but this guarantee is not offered anymore by current code. So as of now, the stats socket is subject to the global maxconn limitation just as any other socket until a reservation mechanism is implemented.
2011-09-07 06:13:34 -04:00
fe->maxconn = 10; /* default to 10 concurrent connections */
fe->timeout.client = MS_TO_TICKS(10000); /* default timeout of 10 seconds */
MINOR: stats: fill the file and line numbers in the stats frontend The stats frontend struct has config file and line which were not set. They're not used right now but better fill them correctly anyway.
2012-09-18 14:05:00 -04:00
fe->conf.file = strdup(file);
fe->conf.line = line;
MEDIUM: stats: use frontend_accept() as the accept function We don't need to use our dedicated function anymore, so stats_accept() was removed.
2015-03-13 11:14:57 -04:00
fe->accept = frontend_accept;
MINOR: proxy: store the default target into the frontend's configuration Some services such as peers and CLI pre-set the target applet immediately during accept(), and for this reason they're forced to have a dedicated accept() function which does not even properly follow everything the regular one does (eg: sndbuf/rcvbuf/linger/nodelay are not set, etc). Let's store the default target when known into the frontend's config so that it's session_accept() which automatically sets it.
2015-03-13 10:55:16 -04:00
fe->default_target = &cli_applet.obj_type;
MEDIUM: proxy: add the global frontend to the list of normal proxies Since recent changes on the global frontend, it was not possible anymore to soft-reload a process which had a stats socket because the socket would not be disabled upon reload. The only solution to this endless madness is to have the global frontend part of normal proxies. Since we don't want to get an ID that shifts all other proxies and causes trouble in deployed environments, we assign it ID #0 which other proxies can't grab, and we don't report it in the stats pages.
2012-10-04 02:47:34 -04:00
/* the stats frontend is the only one able to assign ID #0 */
fe->conf.id.key = fe->uuid = 0;
eb32_insert(&used_proxy_id, &fe->conf.id);
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
return fe;
}
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
/* This function parses a "stats" statement in the "global" section. It returns
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
* -1 if there is any error, otherwise zero. If it returns -1, it will write an
* error message into the <err> buffer which will be preallocated. The trailing
* '\n' must not be written. The function must be called with <args> pointing to
* the first word after "stats".
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
*/
[MEDIUM] modularize the global "stats" keyword configuration parser The "stats" keyword already relied on an external parser, let's make use of the new keyword registration mechanism.
2008-07-09 14:12:41 -04:00
static int stats_parse_global(char **args, int section_type, struct proxy *curpx,
MINOR: config: pass the file and line to config keyword parsers This will be needed when we need to create bind config settings.
2012-09-18 14:02:48 -04:00
struct proxy *defpx, const char *file, int line,
char **err)
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
{
MAJOR: listeners: use dual-linked lists to chain listeners with frontends Navigating through listeners was very inconvenient and error-prone. Not to mention that listeners were linked in reverse order and reverted afterwards. In order to definitely get rid of these issues, we now do the following : - frontends have a dual-linked list of bind_conf - frontends have a dual-linked list of listeners - bind_conf have a dual-linked list of listeners - listeners have a pointer to their bind_conf This way we can now navigate from anywhere to anywhere and always find the proper bind_conf for a given listener, as well as find the list of listeners for a current bind_conf.
2012-09-20 10:48:07 -04:00
struct bind_conf *bind_conf;
MEDIUM: stats: remove the stats_sock struct from the global struct Now the stats socket is allocated when the 'stats socket' line is parsed, and assigned using the standard str2listener(). This has two effects : - more than one stats socket can now be declared - stats socket now support protocols other than UNIX The next step is to remove the duplicate bind config parsing.
2012-09-20 14:19:28 -04:00
struct listener *l;
MAJOR: listeners: use dual-linked lists to chain listeners with frontends Navigating through listeners was very inconvenient and error-prone. Not to mention that listeners were linked in reverse order and reverted afterwards. In order to definitely get rid of these issues, we now do the following : - frontends have a dual-linked list of bind_conf - frontends have a dual-linked list of listeners - bind_conf have a dual-linked list of listeners - listeners have a pointer to their bind_conf This way we can now navigate from anywhere to anywhere and always find the proper bind_conf for a given listener, as well as find the list of listeners for a current bind_conf.
2012-09-20 10:48:07 -04:00
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
if (!strcmp(args[1], "socket")) {
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
int cur_arg;
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
if (*args[2] == 0) {
MEDIUM: stats: remove the stats_sock struct from the global struct Now the stats socket is allocated when the 'stats socket' line is parsed, and assigned using the standard str2listener(). This has two effects : - more than one stats socket can now be declared - stats socket now support protocols other than UNIX The next step is to remove the duplicate bind config parsing.
2012-09-20 14:19:28 -04:00
memprintf(err, "'%s %s' in global section expects an address or a path to a UNIX socket", args[0], args[1]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
return -1;
}
[MEDIUM] make the global stats socket part of a frontend Creating a frontend for the global stats socket will help merge unix sockets management with the other socket management. Since frontends are huge structs, we only allocate it if required.
2009-08-16 11:41:45 -04:00
if (!global.stats_fe) {
MINOR: stats: fill the file and line numbers in the stats frontend The stats frontend struct has config file and line which were not set. They're not used right now but better fill them correctly anyway.
2012-09-18 14:05:00 -04:00
if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
[MEDIUM] make the global stats socket part of a frontend Creating a frontend for the global stats socket will help merge unix sockets management with the other socket management. Since frontends are huge structs, we only allocate it if required.
2009-08-16 11:41:45 -04:00
return -1;
}
}
MAJOR: listeners: use dual-linked lists to chain listeners with frontends Navigating through listeners was very inconvenient and error-prone. Not to mention that listeners were linked in reverse order and reverted afterwards. In order to definitely get rid of these issues, we now do the following : - frontends have a dual-linked list of bind_conf - frontends have a dual-linked list of listeners - bind_conf have a dual-linked list of listeners - listeners have a pointer to their bind_conf This way we can now navigate from anywhere to anywhere and always find the proper bind_conf for a given listener, as well as find the list of listeners for a current bind_conf.
2012-09-20 10:48:07 -04:00
bind_conf = bind_conf_alloc(&global.stats_fe->conf.bind, file, line, args[2]);
REORG: listener: move unix perms from the listener to the bind_conf Unix permissions are per-bind configuration line and not per listener, so let's concretize this in the way the config is stored. This avoids some unneeded loops to set permissions on all listeners. The access level is not part of the unix perms so it has been moved away. Once we can use str2listener() to set all listener addresses, we'll have a bind keyword parser for this one.
2012-09-20 12:07:14 -04:00
bind_conf->level = ACCESS_LVL_OPER; /* default access level */
MAJOR: listeners: use dual-linked lists to chain listeners with frontends Navigating through listeners was very inconvenient and error-prone. Not to mention that listeners were linked in reverse order and reverted afterwards. In order to definitely get rid of these issues, we now do the following : - frontends have a dual-linked list of bind_conf - frontends have a dual-linked list of listeners - bind_conf have a dual-linked list of listeners - listeners have a pointer to their bind_conf This way we can now navigate from anywhere to anywhere and always find the proper bind_conf for a given listener, as well as find the list of listeners for a current bind_conf.
2012-09-20 10:48:07 -04:00
MEDIUM: stats: remove the stats_sock struct from the global struct Now the stats socket is allocated when the 'stats socket' line is parsed, and assigned using the standard str2listener(). This has two effects : - more than one stats socket can now be declared - stats socket now support protocols other than UNIX The next step is to remove the duplicate bind config parsing.
2012-09-20 14:19:28 -04:00
if (!str2listener(args[2], global.stats_fe, bind_conf, file, line, err)) {
memprintf(err, "parsing [%s:%d] : '%s %s' : %s\n",
file, line, args[0], args[1], err && *err ? *err : "error");
return -1;
}
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
cur_arg = 3;
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
while (*args[cur_arg]) {
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
static int bind_dumped;
struct bind_kw *kw;
kw = bind_find_kw(args[cur_arg]);
if (kw) {
if (!kw->parse) {
memprintf(err, "'%s %s' : '%s' option is not implemented in this version (check build options).",
args[0], args[1], args[cur_arg]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
return -1;
}
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
BUG/MINOR: config: make the stats socket pass the correct proxy to the parsers Baptiste reported a segfault when the "id" keyword was passed on the "stats socket" line. The problem is related to the fact that the stats parser stats_parse_global() passes curpx instead of global.stats_fe to the keyword parser. Indeed, curpx being a pointer to the proxy in the current section, it is not correct here since the global section does not describe a proxy. It's just by pure luck that only bind_parse_id() uses the proxy since any other keyword parser could use it as well. The bug has no impact since the id specified here is not usable at all and can be discarded from a faulty configuration. This fix must be backported to 1.5.
2015-10-13 09:06:57 -04:00
if (kw->parse(args, cur_arg, global.stats_fe, bind_conf, err) != 0) {
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
if (err && *err)
memprintf(err, "'%s %s' : '%s'", args[0], args[1], *err);
else
memprintf(err, "'%s %s' : error encountered while processing '%s'",
args[0], args[1], args[cur_arg]);
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
return -1;
}
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
cur_arg += 1 + kw->skip;
continue;
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
}
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
if (!bind_dumped) {
bind_dump_kws(err);
indent_msg(err, 4);
bind_dumped = 1;
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
}
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
memprintf(err, "'%s %s' : unknown keyword '%s'.%s%s",
args[0], args[1], args[cur_arg],
err && *err ? " Registered keywords :" : "", err && *err ? *err : "");
return -1;
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
}
[MAJOR] make unix sockets work again with stats The unix protocol handler had not been updated during the last stream_sock changes. This has been done now. There is still a lot of duplicated code between session.c and proto_uxst.c due to the way the session is handled. Session.c relies on the existence of a frontend while it does not exist here. It is easier to see the difference between the stats part (placed in dumpstats.c) and the unix-stream part (in proto_uxst.c). The hijacking function still needs to be dynamically set into the response buffer, and some cleanup is still required, then all those changes should be forward-ported to the HTTP part. Adding support for new keywords should not cause trouble now.
2008-12-07 10:06:43 -05:00
MEDIUM: stats: remove the stats_sock struct from the global struct Now the stats socket is allocated when the 'stats socket' line is parsed, and assigned using the standard str2listener(). This has two effects : - more than one stats socket can now be declared - stats socket now support protocols other than UNIX The next step is to remove the duplicate bind config parsing.
2012-09-20 14:19:28 -04:00
list_for_each_entry(l, &bind_conf->listeners, by_bind) {
l->maxconn = global.stats_fe->maxconn;
l->backlog = global.stats_fe->backlog;
REORG: session: move the session parts out of stream.c This concerns everythins related to accepting a new session and expiring the embryonic session. There's still a hard-coded call to stream_accept_session() which could be set somewhere in the frontend, but for now it's not a problem.
2015-04-04 12:50:31 -04:00
l->accept = session_accept_fd;
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
l->handler = process_stream;
MEDIUM: listener: store the default target per listener This will be useful later to state that some listeners have to use certain decoders (typically an HTTP/2 decoder) regardless of the regular processing applied to other listeners. For now it simply defaults to the frontend's default target, and it is used by the session.
2015-03-13 11:43:12 -04:00
l->default_target = global.stats_fe->default_target;
MEDIUM: stats: remove the stats_sock struct from the global struct Now the stats socket is allocated when the 'stats socket' line is parsed, and assigned using the standard str2listener(). This has two effects : - more than one stats socket can now be declared - stats socket now support protocols other than UNIX The next step is to remove the duplicate bind config parsing.
2012-09-20 14:19:28 -04:00
l->options |= LI_O_UNLIMITED; /* don't make the peers subject to global limits */
l->nice = -64; /* we want to boost priority for local stats */
global.maxsock += l->maxconn;
}
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
}
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
else if (!strcmp(args[1], "timeout")) {
[MEDIUM] add support for time units in the configuration It is not always handy to manipulate large values exprimed in milliseconds for timeouts. Also, some values are entered in seconds (such as the stats refresh interval). This patch adds support for time units. It knows about 'us', 'ms', 's', 'm', 'h', and 'd'. It automatically converts each value into the caller's expected unit. Unit-less values are still passed unchanged. The unit must be passed as a suffix to the number. For instance: clitimeout 15m If any character is not understood, an error is returned.
2007-12-02 16:15:14 -05:00
unsigned timeout;
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
const char *res = parse_time_err(args[2], &timeout, TIME_UNIT_MS);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
[MEDIUM] add support for time units in the configuration It is not always handy to manipulate large values exprimed in milliseconds for timeouts. Also, some values are entered in seconds (such as the stats refresh interval). This patch adds support for time units. It knows about 'us', 'ms', 's', 'm', 'h', and 'd'. It automatically converts each value into the caller's expected unit. Unit-less values are still passed unchanged. The unit must be passed as a suffix to the number. For instance: clitimeout 15m If any character is not understood, an error is returned.
2007-12-02 16:15:14 -05:00
if (res) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' : unexpected character '%c'", args[0], args[1], *res);
[MEDIUM] add support for time units in the configuration It is not always handy to manipulate large values exprimed in milliseconds for timeouts. Also, some values are entered in seconds (such as the stats refresh interval). This patch adds support for time units. It knows about 'us', 'ms', 's', 'm', 'h', and 'd'. It automatically converts each value into the caller's expected unit. Unit-less values are still passed unchanged. The unit must be passed as a suffix to the number. For instance: clitimeout 15m If any character is not understood, an error is returned.
2007-12-02 16:15:14 -05:00
return -1;
}
if (!timeout) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' expects a positive value", args[0], args[1]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
return -1;
}
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
if (!global.stats_fe) {
MINOR: stats: fill the file and line numbers in the stats frontend The stats frontend struct has config file and line which were not set. They're not used right now but better fill them correctly anyway.
2012-09-18 14:05:00 -04:00
if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
[BUG] stats: global stats timeout may be specified before stats socket. If the global stats timeout statement was found before the stats socket (or without), the parser would crash because the stats frontend was not initialized. Now we have an allocation function which solves the issue. This bug was introduced with 1.4 so it does not need backporting. (was commit 1c5819d2498ae3643c3880507847f948a53d2773 in 1.4)
2010-08-17 15:48:17 -04:00
return -1;
}
}
[MEDIUM] make the global stats socket part of a frontend Creating a frontend for the global stats socket will help merge unix sockets management with the other socket management. Since frontends are huge structs, we only allocate it if required.
2009-08-16 11:41:45 -04:00
global.stats_fe->timeout.client = MS_TO_TICKS(timeout);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
}
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
else if (!strcmp(args[1], "maxconn")) {
int maxconn = atol(args[2]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
if (maxconn <= 0) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' expects a positive value", args[0], args[1]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
return -1;
}
[MEDIUM] stats: disable complex socket reservation for stats socket The way the unix socket is initialized is awkward. Some of the settings are put in the sockets itself, other ones in the backend. And more importantly the global.maxsock value is adjusted so that the stats socket evades the global maxconn value. This complexifies maxsock computations for nothing, since the stats socket is not supposed to receive hundreds of concurrent connections when the global maxconn is very low. What is needed however is to ensure that there are always connections left for the stats socket even when traffic sockets are saturated, but this guarantee is not offered anymore by current code. So as of now, the stats socket is subject to the global maxconn limitation just as any other socket until a reservation mechanism is implemented.
2011-09-07 06:13:34 -04:00
if (!global.stats_fe) {
MINOR: stats: fill the file and line numbers in the stats frontend The stats frontend struct has config file and line which were not set. They're not used right now but better fill them correctly anyway.
2012-09-18 14:05:00 -04:00
if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
MEDIUM: cfgparse: use the new error reporting framework for remaining cfg_keywords All keywords registered using a cfg_kw_list now make use of the new error reporting framework. This allows easier and more precise error reporting without having to deal with complex buffer allocation issues.
2012-05-08 13:47:01 -04:00
memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
[MEDIUM] stats: disable complex socket reservation for stats socket The way the unix socket is initialized is awkward. Some of the settings are put in the sockets itself, other ones in the backend. And more importantly the global.maxsock value is adjusted so that the stats socket evades the global maxconn value. This complexifies maxsock computations for nothing, since the stats socket is not supposed to receive hundreds of concurrent connections when the global maxconn is very low. What is needed however is to ensure that there are always connections left for the stats socket even when traffic sockets are saturated, but this guarantee is not offered anymore by current code. So as of now, the stats socket is subject to the global maxconn limitation just as any other socket until a reservation mechanism is implemented.
2011-09-07 06:13:34 -04:00
return -1;
}
}
global.stats_fe->maxconn = maxconn;
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
}
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
else if (!strcmp(args[1], "bind-process")) { /* enable the socket only on some processes */
int cur_arg = 2;
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
unsigned long set = 0;
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
BUG/MEDIUM: stats: allocate the stats frontend also on "stats bind-process" Bryan Talbot reported that a config with only "stats bind-process 1" in the global section would crash during parsing. This bug was introduced with this new statement in 1.5-dev13. The stats frontend must be allocated if it was not yet. No backport is needed. The workaround consists in having previously declared any other stats keyword (generally stats socket).
2013-04-20 03:48:50 -04:00
if (!global.stats_fe) {
if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
return -1;
}
}
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
while (*args[cur_arg]) {
MINOR: config: support process ranges for "bind-process" Several users have already been caught by "bind-process" which does not support ranges, so let's support them now.
2012-11-15 11:50:01 -05:00
unsigned int low, high;
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
if (strcmp(args[cur_arg], "all") == 0) {
set = 0;
break;
}
else if (strcmp(args[cur_arg], "odd") == 0) {
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
set |= ~0UL/3UL; /* 0x555....555 */
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
}
else if (strcmp(args[cur_arg], "even") == 0) {
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
set |= (~0UL/3UL) << 1; /* 0xAAA...AAA */
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
}
BUILD: silence a warning on Solaris about usage of isdigit() On Solaris, isdigit() is a macro and it complains about the use of a char instead of the int for the argument. Let's cast it to an int to silence it.
2012-11-21 19:04:31 -05:00
else if (isdigit((int)*args[cur_arg])) {
MINOR: config: support process ranges for "bind-process" Several users have already been caught by "bind-process" which does not support ranges, so let's support them now.
2012-11-15 11:50:01 -05:00
char *dash = strchr(args[cur_arg], '-');
low = high = str2uic(args[cur_arg]);
if (dash)
high = str2uic(dash + 1);
if (high < low) {
unsigned int swap = low;
low = high;
high = swap;
}
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
if (low < 1 || high > LONGBITS) {
memprintf(err, "'%s %s' supports process numbers from 1 to %d.\n",
args[0], args[1], LONGBITS);
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
return -1;
}
MINOR: config: support process ranges for "bind-process" Several users have already been caught by "bind-process" which does not support ranges, so let's support them now.
2012-11-15 11:50:01 -05:00
while (low <= high)
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
set |= 1UL << (low++ - 1);
MINOR: config: support process ranges for "bind-process" Several users have already been caught by "bind-process" which does not support ranges, so let's support them now.
2012-11-15 11:50:01 -05:00
}
else {
memprintf(err,
MEDIUM: config: limit nbproc to the machine's word size Some consistency checks cannot be performed between frontends, backends and peers at the moment because there is no way to check for intersection between processes bound to some processes when the number of processes is higher than the number of bits in a word. So first, let's limit the number of processes to the machine's word size. This means nbproc will be limited to 32 on 32-bit machines and 64 on 64-bit machines. This is far more than enough considering that configs rarely go above 16 processes due to scalability and management issues, so 32 or 64 should be fine. This way we'll ensure we can always build a mask of all the processes a section is bound to.
2013-01-18 05:29:29 -05:00
"'%s %s' expects 'all', 'odd', 'even', or a list of process ranges with numbers from 1 to %d.\n",
args[0], args[1], LONGBITS);
MINOR: config: support process ranges for "bind-process" Several users have already been caught by "bind-process" which does not support ranges, so let's support them now.
2012-11-15 11:50:01 -05:00
return -1;
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
}
cur_arg++;
}
global.stats_fe->bind_proc = set;
}
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
else {
MEDIUM: cli: allow the stats socket to be bound to a specific set of processes Using "stats bind-process", it becomes possible to indicate to haproxy which process will get the incoming connections to the stats socket. It will also shut down the warning when nbproc > 1.
2012-10-22 17:17:18 -04:00
memprintf(err, "'%s' only supports 'socket', 'maxconn', 'bind-process' and 'timeout' (got '%s')", args[0], args[1]);
[MEDIUM] introduce the "stats" keyword in global section Removed old unused MODE_LOG and MODE_STATS, and replaced the "stats" keyword in the global section. The new "stats" keyword in the global section is used to create a UNIX socket on which the statistics will be accessed. The client must issue a "show stat\n" command in order to get a CSV-formated output similar to the output on the HTTP socket in CSV mode.
2007-10-18 07:53:22 -04:00
return -1;
}
return 0;
}
[MINOR] stats: report the server warm up status in a "throttle" column A new "throttle" column has been added to HTML and RAW stats to indicate in percent, the level of throttling due to server warmup. The column is empty at 100%.
2007-11-30 12:16:29 -05:00
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
/* print a string of text buffer to <out>. The format is :
* Non-printable chars \t, \n, \r and \e are * encoded in C format.
MINOR: stats: Escape equals sign on socket dump Greetings, Was recently working with a stick table storing URL's and one had an equals sign in it (e.g. 127.0.0.1/f=ab) which made it difficult to easily split the key and value without a regex. This patch will change it so that the key looks like "key=127.0.0.1/f\=ab" instead of "key=127.0.0.1/f=ab". Not very important given that there are ways to work around it. Thanks, - Chad
2016-10-04 16:10:40 -04:00
* Other non-printable chars are encoded "\xHH". Space, '\', and '=' are also escaped.
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
* Print stopped if null char or <bsize> is reached, or if no more place in the chunk.
*/
static int dump_text(struct chunk *out, const char *buf, int bsize)
{
unsigned char c;
int ptr = 0;
while (buf[ptr] && ptr < bsize) {
c = buf[ptr];
MINOR: stats: Escape equals sign on socket dump Greetings, Was recently working with a stick table storing URL's and one had an equals sign in it (e.g. 127.0.0.1/f=ab) which made it difficult to easily split the key and value without a regex. This patch will change it so that the key looks like "key=127.0.0.1/f\=ab" instead of "key=127.0.0.1/f=ab". Not very important given that there are ways to work around it. Thanks, - Chad
2016-10-04 16:10:40 -04:00
if (isprint(c) && isascii(c) && c != '\\' && c != ' ' && c != '=') {
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
if (out->len > out->size - 1)
break;
out->str[out->len++] = c;
}
MINOR: stats: Escape equals sign on socket dump Greetings, Was recently working with a stick table storing URL's and one had an equals sign in it (e.g. 127.0.0.1/f=ab) which made it difficult to easily split the key and value without a regex. This patch will change it so that the key looks like "key=127.0.0.1/f\=ab" instead of "key=127.0.0.1/f=ab". Not very important given that there are ways to work around it. Thanks, - Chad
2016-10-04 16:10:40 -04:00
else if (c == '\t' || c == '\n' || c == '\r' || c == '\e' || c == '\\' || c == ' ' || c == '=') {
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
if (out->len > out->size - 2)
break;
out->str[out->len++] = '\\';
switch (c) {
case ' ': c = ' '; break;
case '\t': c = 't'; break;
case '\n': c = 'n'; break;
case '\r': c = 'r'; break;
case '\e': c = 'e'; break;
case '\\': c = '\\'; break;
MINOR: stats: Escape equals sign on socket dump Greetings, Was recently working with a stick table storing URL's and one had an equals sign in it (e.g. 127.0.0.1/f=ab) which made it difficult to easily split the key and value without a regex. This patch will change it so that the key looks like "key=127.0.0.1/f\=ab" instead of "key=127.0.0.1/f=ab". Not very important given that there are ways to work around it. Thanks, - Chad
2016-10-04 16:10:40 -04:00
case '=': c = '='; break;
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
}
out->str[out->len++] = c;
}
else {
if (out->len > out->size - 4)
break;
out->str[out->len++] = '\\';
out->str[out->len++] = 'x';
out->str[out->len++] = hextab[(c >> 4) & 0xF];
out->str[out->len++] = hextab[c & 0xF];
}
ptr++;
}
return ptr;
}
/* print a buffer in hexa.
* Print stopped if <bsize> is reached, or if no more place in the chunk.
*/
static int dump_binary(struct chunk *out, const char *buf, int bsize)
{
unsigned char c;
int ptr = 0;
while (ptr < bsize) {
c = buf[ptr];
if (out->len > out->size - 2)
break;
out->str[out->len++] = hextab[(c >> 4) & 0xF];
out->str[out->len++] = hextab[c & 0xF];
ptr++;
}
return ptr;
}
/* Dump the status of a table to a stream interface's
* read buffer. It returns 0 if the output buffer is full
* and needs to be called again, otherwise non-zero.
*/
static int stats_dump_table_head_to_buffer(struct chunk *msg, struct stream_interface *si,
struct proxy *proxy, struct proxy *target)
{
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *s = si_strm(si);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "# table: %s, type: %s, size:%d, used:%d\n",
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
proxy->id, stktable_types[proxy->table.type].kw, proxy->table.size, proxy->table.current);
/* any other information should be dumped here */
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (target && strm_li(s)->bind_conf->level < ACCESS_LVL_OPER)
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "# contents not dumped due to insufficient privileges\n");
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), msg) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
return 1;
}
/* Dump the a table entry to a stream interface's
* read buffer. It returns 0 if the output buffer is full
* and needs to be called again, otherwise non-zero.
*/
static int stats_dump_table_entry_to_buffer(struct chunk *msg, struct stream_interface *si,
struct proxy *proxy, struct stksess *entry)
{
int dt;
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "%p:", entry);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
if (proxy->table.type == SMP_T_IPV4) {
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
char addr[INET_ADDRSTRLEN];
inet_ntop(AF_INET, (const void *)&entry->key.key, addr, sizeof(addr));
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " key=%s", addr);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
}
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
else if (proxy->table.type == SMP_T_IPV6) {
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
char addr[INET6_ADDRSTRLEN];
inet_ntop(AF_INET6, (const void *)&entry->key.key, addr, sizeof(addr));
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " key=%s", addr);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
}
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
else if (proxy->table.type == SMP_T_SINT) {
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " key=%u", *(unsigned int *)entry->key.key);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
}
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
else if (proxy->table.type == SMP_T_STR) {
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " key=");
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
dump_text(msg, (const char *)entry->key.key, proxy->table.key_size);
}
else {
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " key=");
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
dump_binary(msg, (const char *)entry->key.key, proxy->table.key_size);
}
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " use=%d exp=%d", entry->ref_cnt - 1, tick_remain(now_ms, entry->expire));
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
for (dt = 0; dt < STKTABLE_DATA_TYPES; dt++) {
void *ptr;
if (proxy->table.data_ofs[dt] == 0)
continue;
if (stktable_data_types[dt].arg_type == ARG_T_DELAY)
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " %s(%d)=", stktable_data_types[dt].name, proxy->table.data_arg[dt].u);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
else
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, " %s=", stktable_data_types[dt].name);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
ptr = stktable_data_ptr(&proxy->table, entry, dt);
switch (stktable_data_types[dt].std_type) {
case STD_T_SINT:
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "%d", stktable_data_cast(ptr, std_t_sint));
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
break;
case STD_T_UINT:
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "%u", stktable_data_cast(ptr, std_t_uint));
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
break;
case STD_T_ULL:
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "%lld", stktable_data_cast(ptr, std_t_ull));
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
break;
case STD_T_FRQP:
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "%d",
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
read_freq_ctr_period(&stktable_data_cast(ptr, std_t_frqp),
proxy->table.data_arg[dt].u));
break;
}
}
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(msg, "\n");
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), msg) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
return 1;
}
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
static void stats_sock_table_key_request(struct stream_interface *si, char **args, int action)
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
{
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *s = si_strm(si);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
struct proxy *px = appctx->ctx.table.target;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
struct stksess *ts;
[MINOR] Allow showing and clearing by key of integer stick tables
2011-06-15 02:18:51 -04:00
uint32_t uint32_key;
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
unsigned char ip6_key[sizeof(struct in6_addr)];
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
long long value;
int data_type;
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
int cur_arg;
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
void *ptr;
struct freq_ctr_period *frqp;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_OUTPUT;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
if (!*args[4]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Key value expected\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
return;
}
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
switch (px->table.type) {
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
case SMP_T_IPV4:
[MINOR] Allow showing and clearing by key of integer stick tables
2011-06-15 02:18:51 -04:00
uint32_key = htonl(inetaddr_host(args[4]));
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
static_table_key->key = &uint32_key;
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
break;
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
case SMP_T_IPV6:
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
inet_pton(AF_INET6, args[4], ip6_key);
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
static_table_key->key = &ip6_key;
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
break;
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
case SMP_T_SINT:
[MINOR] Allow showing and clearing by key of integer stick tables
2011-06-15 02:18:51 -04:00
{
char *endptr;
unsigned long val;
errno = 0;
val = strtoul(args[4], &endptr, 10);
if ((errno == ERANGE && val == ULONG_MAX) ||
(errno != 0 && val == 0) || endptr == args[4] ||
val > 0xffffffff) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Invalid key\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Allow showing and clearing by key of integer stick tables
2011-06-15 02:18:51 -04:00
return;
}
uint32_key = (uint32_t) val;
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
static_table_key->key = &uint32_key;
[MINOR] Allow showing and clearing by key of integer stick tables
2011-06-15 02:18:51 -04:00
break;
}
break;
MEDIUM: stick-tables: use the sample type names This patch removes the special stick tables types names and use the standard sample type names. This avoid the maintainance of two types and remove the switch/case for matching a sample type for each stick table type.
2015-07-24 02:46:42 -04:00
case SMP_T_STR:
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
static_table_key->key = args[4];
static_table_key->key_len = strlen(args[4]);
[MINOR] Allow showing and clearing by key of string stick tables
2011-06-15 02:18:52 -04:00
break;
[MINOR] Allow showing and clearing by key of ipv6 stick tables
2011-06-15 02:18:50 -04:00
default:
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
switch (action) {
case STAT_CLI_O_TAB:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Showing keys from tables of type other than ip, ipv6, string and integer is not supported\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
case STAT_CLI_O_CLR:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Removing keys from ip tables of type other than ip, ipv6, string and integer is not supported\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
default:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Unknown action\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
return;
}
/* check permissions */
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_OPER) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
return;
}
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
ts = stktable_lookup_key(&px->table, static_table_key);
[MINOR] Allow listing of stick table by key
2011-06-15 02:18:47 -04:00
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
switch (action) {
case STAT_CLI_O_TAB:
if (!ts)
return;
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_reset(&trash);
if (!stats_dump_table_head_to_buffer(&trash, si, px, px))
[MINOR] Allow listing of stick table by key
2011-06-15 02:18:47 -04:00
return;
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
stats_dump_table_entry_to_buffer(&trash, si, px, ts);
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
return;
[MINOR] Allow listing of stick table by key
2011-06-15 02:18:47 -04:00
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
case STAT_CLI_O_CLR:
if (!ts)
return;
if (ts->ref_cnt) {
/* don't delete an entry which is currently referenced */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Entry currently in use, cannot remove\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
return;
}
stksess_kill(&px->table, ts);
break;
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
case STAT_CLI_O_SET:
if (ts)
stktable_touch(&px->table, ts, 1);
else {
MEDIUM: stick-table: allocate the table key of size buffer size Keys are copied from samples to stick_table_key. If a key is larger than the stick_table_key, we have an overflow. In pratice it does not happen because it requires : 1) a configuration with tune.bufsize larger than BUFSIZE (common) 2) a stick-table configured with keys strictly larger than buffers 3) extraction of data larger than BUFSIZE (eg: using payload()) Points 2 and 3 don't make any sense for a real world configuration. That said the issue needs be fixed. The solution consists in allocating it the same size as the global buffer size, just like the samples. This fixes the issue.
2012-10-29 16:56:59 -04:00
ts = stksess_new(&px->table, static_table_key);
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
if (!ts) {
/* don't delete an entry which is currently referenced */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Unable to allocate a new entry\n";
appctx->st0 = STAT_CLI_PRINT;
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
return;
}
stktable_store(&px->table, ts, 1);
}
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
for (cur_arg = 5; *args[cur_arg]; cur_arg += 2) {
if (strncmp(args[cur_arg], "data.", 5) != 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "\"data.<type>\" followed by a value expected\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
return;
}
data_type = stktable_get_data_type(args[cur_arg] + 5);
if (data_type < 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Unknown data type\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
return;
}
if (!px->table.data_ofs[data_type]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Data type not stored in this table\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
return;
}
if (!*args[cur_arg+1] || strl2llrc(args[cur_arg+1], strlen(args[cur_arg+1]), &value) != 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Require a valid integer value to store\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: cli: make it possible to enter multiple values at once with "set table" The "set table" statement allows to create new entries with their respective values. Till now it was limited to a single data type per line, requiring as many "set table" statements as the desired data types to be set. Since this is only a parser limitation, this patch gets rid of it. It also allows the creation of a key with no data types (all reset to their default values).
2013-08-01 15:11:42 -04:00
return;
}
ptr = stktable_data_ptr(&px->table, ts, data_type);
switch (stktable_data_types[data_type].std_type) {
case STD_T_SINT:
stktable_data_cast(ptr, std_t_sint) = value;
break;
case STD_T_UINT:
stktable_data_cast(ptr, std_t_uint) = value;
break;
case STD_T_ULL:
stktable_data_cast(ptr, std_t_ull) = value;
break;
case STD_T_FRQP:
/* We set both the current and previous values. That way
* the reported frequency is stable during all the period
* then slowly fades out. This allows external tools to
* push measures without having to update them too often.
*/
frqp = &stktable_data_cast(ptr, std_t_frqp);
frqp->curr_tick = now_ms;
frqp->prev_ctr = 0;
frqp->curr_ctr = value;
break;
}
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
}
break;
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
default:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Unknown action\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
[MINOR] Break out processing of clear table This will allow the code to be reused for showing a table filtered by key
2011-06-15 02:18:46 -04:00
}
}
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
static void stats_sock_table_data_request(struct stream_interface *si, char **args, int action)
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
BUG/MINOR: cli: "clear table xx data.xx" does not work anymore Commit 654694e1 introduced in 1.5-dev12 broke the ability to clear some entries in a table by the value of their data fields.
2013-04-13 03:41:37 -04:00
if (action != STAT_CLI_O_TAB && action != STAT_CLI_O_CLR) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "content-based lookup is only supported with the \"show\" and \"clear\" actions";
appctx->st0 = STAT_CLI_PRINT;
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
return;
}
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
/* condition on stored data value */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.data_type = stktable_get_data_type(args[3] + 5);
if (appctx->ctx.table.data_type < 0) {
appctx->ctx.cli.msg = "Unknown data type\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
return;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!((struct proxy *)appctx->ctx.table.target)->table.data_ofs[appctx->ctx.table.data_type]) {
appctx->ctx.cli.msg = "Data type not stored in this table\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
return;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.data_op = get_std_op(args[4]);
if (appctx->ctx.table.data_op < 0) {
appctx->ctx.cli.msg = "Require and operator among \"eq\", \"ne\", \"le\", \"ge\", \"lt\", \"gt\"\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
return;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!*args[5] || strl2llrc(args[5], strlen(args[5]), &appctx->ctx.table.value) != 0) {
appctx->ctx.cli.msg = "Require a valid integer value to compare against\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
return;
}
}
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
static void stats_sock_table_request(struct stream_interface *si, char **args, int action)
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
appctx->ctx.table.data_type = -1;
appctx->st2 = STAT_ST_INIT;
appctx->ctx.table.target = NULL;
appctx->ctx.table.proxy = NULL;
appctx->ctx.table.entry = NULL;
appctx->st0 = action;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
if (*args[2]) {
MEDIUM: stick-table: remove the now duplicate find_stktable() function Since proxy_tbl_by_name() already does the same job, let's not keep duplicate functions and use this one only.
2015-05-26 06:08:07 -04:00
appctx->ctx.table.target = proxy_tbl_by_name(args[2]);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!appctx->ctx.table.target) {
appctx->ctx.cli.msg = "No such table\n";
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
return;
}
}
else {
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
if (action != STAT_CLI_O_TAB)
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
goto err_args;
return;
}
if (strcmp(args[3], "key") == 0)
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
stats_sock_table_key_request(si, args, action);
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
else if (strncmp(args[3], "data.", 5) == 0)
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
stats_sock_table_data_request(si, args, action);
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
else if (*args[3])
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
goto err_args;
return;
err_args:
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
switch (action) {
case STAT_CLI_O_TAB:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Optional argument only supports \"data.<store_data_type>\" <operator> <value> and key <key>\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
case STAT_CLI_O_CLR:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Required arguments: <table> \"data.<store_data_type>\" <operator> <value> or <table> key <key>\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
default:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Unknown action\n";
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
break;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MINOR] Break out all stick table socat command parsing This will allow reuse for clearing table entries other than by key
2011-06-15 02:18:48 -04:00
}
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
/* Expects to find a frontend named <arg> and returns it, otherwise displays various
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* adequate error messages and returns NULL. This function also expects the stream
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
* level to be admin.
*/
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
static struct proxy *expect_frontend_admin(struct stream *s, struct stream_interface *si, const char *arg)
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
struct proxy *px;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return NULL;
}
if (!*arg) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "A frontend name is expected.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return NULL;
}
CLEANUP: proxy: make the proxy lookup functions more user-friendly First, findproxy() was renamed proxy_find_by_name() so that its explicit that a name is required for the lookup. Second, we give this function the ability to search for tables if needed. Third we now provide inline wrappers to pass the appropriate PR_CAP_* flags and to explicitly look up a frontend, backend or table.
2015-05-26 05:24:42 -04:00
px = proxy_fe_by_name(arg);
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
if (!px) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "No such frontend.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return NULL;
}
return px;
}
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
/* Expects to find a backend and a server in <arg> under the form <backend>/<server>,
* and returns the pointer to the server. Otherwise, display adequate error messages
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* and returns NULL. This function also expects the stream level to be admin. Note:
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
* the <arg> is modified to remove the '/'.
*/
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
static struct server *expect_server_admin(struct stream *s, struct stream_interface *si, char *arg)
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
struct proxy *px;
struct server *sv;
char *line;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
return NULL;
}
/* split "backend/server" and make <line> point to server */
for (line = arg; *line; line++)
if (*line == '/') {
*line++ = '\0';
break;
}
if (!*line || !*arg) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Require 'backend/server'.\n";
appctx->st0 = STAT_CLI_PRINT;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
return NULL;
}
if (!get_backend_server(arg, line, &px, &sv)) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = px ? "No such server.\n" : "No such backend.\n";
appctx->st0 = STAT_CLI_PRINT;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
return NULL;
}
if (px->state == PR_STSTOPPED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Proxy is disabled.\n";
appctx->st0 = STAT_CLI_PRINT;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
return NULL;
}
return sv;
}
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
/* This function is used with TLS ticket keys management. It permits to browse
* each reference. The variable <getnext> must contain the current node,
* <end> point to the root node.
*/
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
static inline
struct tls_keys_ref *tlskeys_list_get_next(struct tls_keys_ref *getnext, struct list *end)
{
struct tls_keys_ref *ref = getnext;
while (1) {
/* Get next list entry. */
ref = LIST_NEXT(&ref->list, struct tls_keys_ref *, list);
/* If the entry is the last of the list, return NULL. */
if (&ref->list == end)
return NULL;
return ref;
}
}
static inline
struct tls_keys_ref *tlskeys_ref_lookup_ref(const char *reference)
{
int id;
char *error;
/* If the reference starts by a '#', this is numeric id. */
if (reference[0] == '#') {
/* Try to convert the numeric id. If the conversion fails, the lookup fails. */
id = strtol(reference + 1, &error, 10);
if (*error != '\0')
return NULL;
/* Perform the unique id lookup. */
return tlskeys_ref_lookupid(id);
}
/* Perform the string lookup. */
return tlskeys_ref_lookup(reference);
}
#endif
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* This function is used with map and acl management. It permits to browse
* each reference. The variable <getnext> must contain the current node,
* <end> point to the root node and the <flags> permit to filter required
* nodes.
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
*/
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
static inline
struct pat_ref *pat_list_get_next(struct pat_ref *getnext, struct list *end,
unsigned int flags)
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
{
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
struct pat_ref *ref = getnext;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
while (1) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Get next list entry. */
ref = LIST_NEXT(&ref->list, struct pat_ref *, list);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* If the entry is the last of the list, return NULL. */
if (&ref->list == end)
return NULL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* If the entry match the flag, return it. */
if (ref->flags & flags)
return ref;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
}
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
static inline
struct pat_ref *pat_ref_lookup_ref(const char *reference)
{
int id;
char *error;
/* If the reference starts by a '#', this is numeric id. */
if (reference[0] == '#') {
/* Try to convert the numeric id. If the conversion fails, the lookup fails. */
id = strtol(reference + 1, &error, 10);
if (*error != '\0')
return NULL;
/* Perform the unique id lookup. */
return pat_ref_lookupid(id);
}
/* Perform the string lookup. */
return pat_ref_lookup(reference);
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* This function is used with map and acl management. It permits to browse
* each reference.
*/
static inline
struct pattern_expr *pat_expr_get_next(struct pattern_expr *getnext, struct list *end)
{
struct pattern_expr *expr;
MEDIUM: pattern: merge same pattern Sometimes the same pattern file is used with the same index, parse and parse_smp functions. If this two condition are true, these two pattern are identical and the same struct can be used.
2014-01-20 08:29:33 -05:00
expr = LIST_NEXT(&getnext->list, struct pattern_expr *, list);
if (&expr->list == end)
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
return NULL;
return expr;
}
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
/* Processes the stats interpreter on the statistics socket. This function is
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
* called from an applet running in a stream interface. The function returns 1
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
* if the request was understood, otherwise zero. It sets appctx->st0 to a value
[MINOR] stats: use a dedicated state to output static data It is a bit expensive and complex to use to call buffer_feed() directly from the request parser, and there are risks that some output messages are lost in case of buffer full. Since most of these messages are static, let's have a state dedicated to print these messages and store them in a specific area shared with the stats in the session. This both reduces code size and risks of losing output data.
2009-10-11 17:12:51 -04:00
* designating the function which will have to process the request, which can
* also be the print function to display the return message set into cli.msg.
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
*/
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static int stats_sock_parse_request(struct stream_interface *si, char *line)
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
{
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *s = si_strm(si);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
char *args[MAX_STATS_ARGS + 1];
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
struct cli_kw *kw;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
int arg;
MEDIUM: dumpstat: make the CLI parser understand the backslash as an escape char We'll need to pass patterns on the CLI for lookups. Till now there was no need for a backslash, so it's still time to support them just like in the config file.
2013-12-10 12:54:58 -05:00
int i, j;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
while (isspace((unsigned char)*line))
line++;
arg = 0;
args[arg] = line;
while (*line && arg < MAX_STATS_ARGS) {
MEDIUM: dumpstat: make the CLI parser understand the backslash as an escape char We'll need to pass patterns on the CLI for lookups. Till now there was no need for a backslash, so it's still time to support them just like in the config file.
2013-12-10 12:54:58 -05:00
if (*line == '\\') {
line++;
if (*line == '\0')
break;
}
else if (isspace((unsigned char)*line)) {
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
*line++ = '\0';
while (isspace((unsigned char)*line))
line++;
args[++arg] = line;
continue;
}
line++;
}
while (++arg <= MAX_STATS_ARGS)
args[arg] = line;
MEDIUM: dumpstat: make the CLI parser understand the backslash as an escape char We'll need to pass patterns on the CLI for lookups. Till now there was no need for a backslash, so it's still time to support them just like in the config file.
2013-12-10 12:54:58 -05:00
/* remove \ */
arg = 0;
while (*args[arg] != '\0') {
j = 0;
for (i=0; args[arg][i] != '\0'; i++) {
if (args[arg][i] == '\\')
continue;
args[arg][j] = args[arg][i];
j++;
}
args[arg][j] = '\0';
arg++;
}
BUG/MEDIUM: stats: properly initialize the scope before dumping stats Issuing a "show sess all" prior to a "show stat" on the CLI results in no proxy being dumped because the scope_len union member was not properly reinitialized. This fix must be backported into 1.5.
2015-05-04 12:07:56 -04:00
appctx->ctx.stats.scope_str = 0;
appctx->ctx.stats.scope_len = 0;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.stats.flags = 0;
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
if ((kw = cli_find_kw(args))) {
if (kw->parse) {
MINOR: cli: add private pointer and release function This pointer will be used for storing private context. With this, the same executed function can handle more than one keyword. This will be very useful for creation Lua cli bindings. The release function is called when the command is terminated (give back the hand to the prompt) or when the session is broken (timeout or client closed).
2016-11-12 04:51:33 -05:00
if (kw->parse(args, appctx, kw->private) == 0 && kw->io_handler) {
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
appctx->st0 = STAT_CLI_O_CUSTOM;
appctx->io_handler = kw->io_handler;
MINOR: cli: add private pointer and release function This pointer will be used for storing private context. With this, the same executed function can handle more than one keyword. This will be very useful for creation Lua cli bindings. The release function is called when the command is terminated (give back the hand to the prompt) or when the session is broken (timeout or client closed).
2016-11-12 04:51:33 -05:00
appctx->io_release = kw->io_release;
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
}
}
} else if (strcmp(args[0], "show") == 0) {
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
if (strcmp(args[1], "backend") == 0) {
BUG/MEDIUM: stats: show backend may show an empty or incomplete result This is the same issue as "show servers state", where the result is incorrect it the data can't fit in one buffer. The similar fix is applied, to restart the data processing where it stopped as buffers are sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:49 -04:00
appctx->ctx.be.px = NULL;
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_BACKEND;
}
MINOR: cli: add a new "show env" command Using environment variables in configuration files can make troubleshooting complicated because there's no easy way to verify that the variables are correct. This patch introduces a new "show env" command which displays the whole environment on the CLI, one variable per line. The socket must at least have level operator to display the environment.
2016-02-16 05:27:28 -05:00
else if (strcmp(args[1], "env") == 0) {
extern char **environ;
if (strm_li(s)->bind_conf->level < ACCESS_LVL_OPER) {
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
appctx->ctx.env.var = environ;
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_ENV; // stats_dump_env_to_buffer
if (*args[2]) {
int len = strlen(args[2]);
for (; *appctx->ctx.env.var; appctx->ctx.env.var++) {
if (strncmp(*appctx->ctx.env.var, args[2], len) == 0 &&
(*appctx->ctx.env.var)[len] == '=')
break;
}
if (!*appctx->ctx.env.var) {
appctx->ctx.cli.msg = "Variable not found\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
appctx->st2 = STAT_ST_END;
}
}
else if (strcmp(args[1], "stat") == 0) {
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
if (strcmp(args[2], "resolvers") == 0) {
struct dns_resolvers *presolvers;
MINOR: cli: Dump all resolvers stats if no resolver section is given This commit adds support for dumping all resolver stats. Specifically if a command 'show stats resolvers' is issued withOUT a resolver section id, we dump all known resolver sections. If none are configured, a message is displayed indicating that.
2015-10-02 16:33:01 -04:00
if (*args[3]) {
appctx->ctx.resolvers.ptr = NULL;
list_for_each_entry(presolvers, &dns_resolvers, list) {
if (strcmp(presolvers->id, args[3]) == 0) {
appctx->ctx.resolvers.ptr = presolvers;
break;
}
}
if (appctx->ctx.resolvers.ptr == NULL) {
appctx->ctx.cli.msg = "Can't find that resolvers section\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
}
}
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_RESOLVERS;
return 1;
}
else if (*args[2] && *args[3] && *args[4]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.stats.flags |= STAT_BOUND;
appctx->ctx.stats.iid = atoi(args[2]);
appctx->ctx.stats.type = atoi(args[3]);
appctx->ctx.stats.sid = atoi(args[4]);
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
if (strcmp(args[5], "typed") == 0)
appctx->ctx.stats.flags |= STAT_FMT_TYPED;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
else if (strcmp(args[2], "typed") == 0)
appctx->ctx.stats.flags |= STAT_FMT_TYPED;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_STAT; // stats_dump_stat_to_buffer
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
else if (strcmp(args[1], "info") == 0) {
MEDIUM: stats: support "show info typed" on the CLI This emits the field positions, names and types. It is more convenient than the default output for a parser that doesn't know all the fields. It simply relies on stats_emit_typed_data_field() and stats_emit_field_tags() added by previous patch for the output. A new stats format flag was added, STAT_FMT_TYPED, which is set when the "typed" keyword is specified on the CLI.
2016-01-11 14:08:42 -05:00
if (strcmp(args[2], "typed") == 0)
appctx->ctx.stats.flags |= STAT_FMT_TYPED;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_INFO; // stats_dump_info_to_buffer
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
else if (strcmp(args[1], "servers") == 0 && strcmp(args[2], "state") == 0) {
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
appctx->ctx.server_state.iid = 0;
appctx->ctx.server_state.px = NULL;
appctx->ctx.server_state.sv = NULL;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
/* check if a backend name has been provided */
if (*args[3]) {
/* read server state from local file */
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
appctx->ctx.server_state.px = proxy_be_by_name(args[3]);
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
if (!appctx->ctx.server_state.px) {
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
appctx->ctx.cli.msg = "Can't find backend.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
appctx->ctx.server_state.iid = appctx->ctx.server_state.px->uuid;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_SERVERS_STATE; // stats_dump_servers_state_to_buffer
return 1;
}
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
else if (strcmp(args[1], "pools") == 0) {
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_POOLS; // stats_dump_pools_to_buffer
}
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
else if (strcmp(args[1], "sess") == 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_INIT;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_OPER) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
return 1;
}
MINOR: cli: add support for the "show sess all" command Sometimes when debugging haproxy, it is important to take a full snapshot of all sessions and their respective states. Till now it was complicated to do because we had to use scripts and sessions would vanish between two runs. Now with this command we have the same output as "show sess $id" but for all sessions in the table. This is a debugging command only, it should only be used by developers as it is never guaranteed to perfectly work !
2012-11-25 19:16:39 -05:00
if (*args[2] && strcmp(args[2], "all") == 0)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.target = (void *)-1;
MINOR: cli: add support for the "show sess all" command Sometimes when debugging haproxy, it is important to take a full snapshot of all sessions and their respective states. Till now it was complicated to do because we had to use scripts and sessions would vanish between two runs. Now with this command we have the same output as "show sess $id" but for all sessions in the table. This is a debugging command only, it should only be used by developers as it is never guaranteed to perfectly work !
2012-11-25 19:16:39 -05:00
else if (*args[2])
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.target = (void *)strtoul(args[2], NULL, 0);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
else
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.target = NULL;
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
appctx->ctx.sess.section = 0; /* start with stream status */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.pos = 0;
appctx->st0 = STAT_CLI_O_SESS; // stats_dump_sess_to_buffer
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
else if (strcmp(args[1], "errors") == 0) {
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_OPER) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
return 1;
}
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
if (*args[2])
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.iid = atoi(args[2]);
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
else
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.iid = -1;
appctx->ctx.errors.px = NULL;
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_ERR; // stats_dump_errors_to_buffer
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
else if (strcmp(args[1], "table") == 0) {
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
stats_sock_table_request(si, args, STAT_CLI_O_TAB);
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
}
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
else if (strcmp(args[1], "tls-keys") == 0) {
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
appctx->ctx.tlskeys.dump_all = 0;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
/* no parameter, shows only file list */
if (!*args[2]) {
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
appctx->ctx.tlskeys.dump_all = 1;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_TLSK;
return 1;
}
if (args[2][0] == '*') {
/* list every TLS ticket keys */
appctx->ctx.tlskeys.ref = NULL;
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
appctx->ctx.tlskeys.dump_all = 1;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
} else {
appctx->ctx.tlskeys.ref = tlskeys_ref_lookup_ref(args[2]);
if(!appctx->ctx.tlskeys.ref) {
appctx->ctx.cli.msg = "'show tls-keys' unable to locate referenced filename\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
appctx->st2 = STAT_ST_INIT;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
appctx->st0 = STAT_CLI_O_TLSK_ENT;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#else
appctx->ctx.cli.msg = "HAProxy was compiled against a version of OpenSSL "
"that doesn't support specifying TLS ticket keys\n";
appctx->st0 = STAT_CLI_PRINT;
#endif
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else if (strcmp(args[1], "map") == 0 ||
strcmp(args[1], "acl") == 0) {
/* Set ACL or MAP flags. */
if (args[1][0] == 'm')
appctx->ctx.map.display_flags = PAT_REF_MAP;
else
appctx->ctx.map.display_flags = PAT_REF_ACL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MINOR: stats: fix typo in help messages The word "available" was mistakenly written "avalaible" in help messages and comments. This patch should be backported to 1.5 and 1.6
2016-05-06 06:18:50 -04:00
/* no parameter: display all map available */
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
if (!*args[2]) {
appctx->st2 = STAT_ST_INIT;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->st0 = STAT_CLI_O_PATS;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* lookup into the refs and check the map flag */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (!appctx->ctx.map.ref ||
!(appctx->ctx.map.ref->flags & appctx->ctx.map.display_flags)) {
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown ACL identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
appctx->st2 = STAT_ST_INIT;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->st0 = STAT_CLI_O_PAT;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
CLEANUP: Fix some minor typos
2012-04-02 21:57:54 -04:00
else { /* neither "stat" nor "info" nor "sess" nor "errors" nor "table" */
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
return 0;
}
}
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
else if (strcmp(args[0], "clear") == 0) {
if (strcmp(args[1], "counters") == 0) {
struct proxy *px;
struct server *sv;
[MEDIUM] Collect & provide separate statistics for sockets, v2 This patch allows to collect & provide separate statistics for each socket. It can be very useful if you would like to distinguish between traffic generate by local and remote users or between different types of remote clients (peerings, domestic, foreign). Currently no "Session rate" is supported, but adding it should be possible if we found it useful.
2009-10-04 09:43:17 -04:00
struct listener *li;
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
int clrall = 0;
if (strcmp(args[2], "all") == 0)
clrall = 1;
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
/* check permissions */
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_OPER ||
(clrall && strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN)) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] add access restrictions to the stats socket The stats socket can now run at 3 different levels : - user - operator (default one) - admin These levels are used to restrict access to some information and commands. Only the admin can clear all stats. A user cannot clear anything nor access sensible data such as sessions or errors.
2009-10-10 11:13:00 -04:00
return 1;
}
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
for (px = proxy; px; px = px->next) {
[MEDIUM] stats: split frontend and backend stats It's very annoying that frontend and backend stats are merged because we don't know what we're observing. For instance, if a "listen" instance makes use of a distinct backend, it's impossible to know what the bytes_out means. Some points take care of not updating counters twice if the backend points to the frontend, indicating a "listen" instance. The thing becomes more complex when we try to add support for server side keep-alive, because we have to maintain a pointer to the backend used for last request, and to update its stats. But we can't perform such comparisons anymore because the counters will not match anymore. So in order to get rid of this situation, let's have both frontend AND backend stats in the "struct proxy". We simply update the relevant ones during activity. Some of them are only accounted for in the backend, while others are just for frontend. Maybe we can improve a bit on that later, but the essential part is that those counters now reflect what they really mean.
2011-03-10 17:25:56 -05:00
if (clrall) {
memset(&px->be_counters, 0, sizeof(px->be_counters));
memset(&px->fe_counters, 0, sizeof(px->fe_counters));
}
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
else {
[MEDIUM] stats: split frontend and backend stats It's very annoying that frontend and backend stats are merged because we don't know what we're observing. For instance, if a "listen" instance makes use of a distinct backend, it's impossible to know what the bytes_out means. Some points take care of not updating counters twice if the backend points to the frontend, indicating a "listen" instance. The thing becomes more complex when we try to add support for server side keep-alive, because we have to maintain a pointer to the backend used for last request, and to update its stats. But we can't perform such comparisons anymore because the counters will not match anymore. So in order to get rid of this situation, let's have both frontend AND backend stats in the "struct proxy". We simply update the relevant ones during activity. Some of them are only accounted for in the backend, while others are just for frontend. Maybe we can improve a bit on that later, but the essential part is that those counters now reflect what they really mean.
2011-03-10 17:25:56 -05:00
px->be_counters.conn_max = 0;
px->be_counters.p.http.rps_max = 0;
px->be_counters.sps_max = 0;
px->be_counters.cps_max = 0;
px->be_counters.nbpend_max = 0;
px->fe_counters.conn_max = 0;
px->fe_counters.p.http.rps_max = 0;
px->fe_counters.sps_max = 0;
px->fe_counters.cps_max = 0;
px->fe_counters.nbpend_max = 0;
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
}
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
for (sv = px->srv; sv; sv = sv->next)
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
if (clrall)
memset(&sv->counters, 0, sizeof(sv->counters));
else {
sv->counters.cur_sess_max = 0;
sv->counters.nbpend_max = 0;
sv->counters.sps_max = 0;
}
[MEDIUM] Collect & provide separate statistics for sockets, v2 This patch allows to collect & provide separate statistics for each socket. It can be very useful if you would like to distinguish between traffic generate by local and remote users or between different types of remote clients (peerings, domestic, foreign). Currently no "Session rate" is supported, but adding it should be possible if we found it useful.
2009-10-04 09:43:17 -04:00
BUG: stats: fix regression introduced by commit 4348fad1 Recent commit 4348fad1 (listeners: use dual-linked lists to chain listeners with frontends) broke frontend lookup in stats sockets by using the wrong iterator in the listeners.
2012-09-26 15:03:11 -04:00
list_for_each_entry(li, &px->conf.listeners, by_fe)
[MINOR] stats: use 'clear counters all' to clear all values The most common use of "clear counters" should be to only clear max values without affecting cumulated values, for instance, after an incident. So we change "clear counters" to only clear max values, and add "clear counters all" to clear all counters.
2009-10-10 09:26:26 -04:00
if (li->counters) {
if (clrall)
memset(li->counters, 0, sizeof(*li->counters));
else
li->counters->conn_max = 0;
}
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
}
[MEDIUM] add support for global.maxconnrate to limit the per-process conn rate. This one enforces a per-process connection rate limit, regardless of what may be set per frontend. It can be a way to limit the CPU usage of a process being severely attacked. The side effect is that the global process connection rate is now measured for each incoming connection, so it will be possible to report it.
2011-09-07 09:17:21 -04:00
global.cps_max = 0;
MEDIUM: listener: add support for limiting the session rate in addition to the connection rate It's sometimes useful to be able to limit the connection rate on a machine running many haproxy instances (eg: per customer) but it removes the ability for that machine to defend itself against a DoS. Thus, better also provide a limit on the session rate, which does not include the connections rejected by "tcp-request connection" rules. This permits to have much higher limits on the connection rate without having to raise the session rate limit to insane values. The limit can be changed on the CLI using "set rate-limit sessions global", or in the global section using "maxsessrate".
2013-10-07 12:51:07 -04:00
global.sps_max = 0;
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
return 1;
}
[MEDIUM] stats: add "clear table <name> key <value>" to clear table entries This feature will be required at some point, when the stick tables are used to enforce security measures. For instance, some visitors may be incorrectly flagged as abusers and would ask the site admins to remove their entry from the table.
2010-07-13 07:48:00 -04:00
else if (strcmp(args[1], "table") == 0) {
MINOR: stats/cli: add plans to support more stick-table actions Right now we only support show/clear on a table. In order to introduce the "set" keyword we need to get rid of the "show" boolean arg. There is no functional change up to this commit.
2012-06-06 17:37:08 -04:00
stats_sock_table_request(si, args, STAT_CLI_O_CLR);
[MEDIUM] stats: add "clear table <name> key <value>" to clear table entries This feature will be required at some point, when the stick tables are used to enforce security measures. For instance, some visitors may be incorrectly flagged as abusers and would ask the site admins to remove their entry from the table.
2010-07-13 07:48:00 -04:00
/* end of processing */
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else if (strcmp(args[1], "map") == 0 || strcmp(args[1], "acl") == 0) {
/* Set ACL or MAP flags. */
if (args[1][0] == 'm')
appctx->ctx.map.display_flags = PAT_REF_MAP;
else
appctx->ctx.map.display_flags = PAT_REF_ACL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* no parameter */
if (!*args[2]) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
appctx->ctx.cli.msg = "Missing map identifier.\n";
else
appctx->ctx.cli.msg = "Missing ACL identifier.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* lookup into the refs and check the map flag */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (!appctx->ctx.map.ref ||
!(appctx->ctx.map.ref->flags & appctx->ctx.map.display_flags)) {
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown ACL identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Clear all. */
pat_ref_prune(appctx->ctx.map.ref);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* return response */
MINOR: map/acl/dumpstats: remove the "Done." message By convention, the HAProxy CLI doesn't return message if the opration is sucessfully done. The MAP and ACL returns the "Done." message, an its noise the output during big MAP or ACL injection.
2014-12-18 09:28:01 -05:00
appctx->st0 = STAT_CLI_PROMPT;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
return 1;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
else {
[MEDIUM] stats: add "clear table <name> key <value>" to clear table entries This feature will be required at some point, when the stick tables are used to enforce security measures. For instance, some visitors may be incorrectly flagged as abusers and would ask the site admins to remove their entry from the table.
2010-07-13 07:48:00 -04:00
/* unknown "clear" argument */
[MINOR] Add "clear counters" to clear statistics counters Now, when statistics counters are moved to separate structures, adding "clear counters" is extremely easy. [wt: updated the help message]
2009-10-04 09:02:46 -04:00
return 0;
}
}
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
else if (strcmp(args[0], "get") == 0) {
if (strcmp(args[1], "weight") == 0) {
struct proxy *px;
struct server *sv;
/* split "backend/server" and make <line> point to server */
for (line = args[2]; *line; line++)
if (*line == '/') {
*line++ = '\0';
break;
}
if (!*line) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Require 'backend/server'.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
return 1;
}
if (!get_backend_server(args[2], line, &px, &sv)) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = px ? "No such server.\n" : "No such backend.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
return 1;
}
/* return server's effective weight at the moment */
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
snprintf(trash.str, trash.size, "%d (initial %d)\n", sv->uweight, sv->iweight);
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putstr(si_ic(si), trash.str) == -1)
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else if (strcmp(args[1], "map") == 0 || strcmp(args[1], "acl") == 0) {
/* Set flags. */
if (args[1][0] == 'm')
appctx->ctx.map.display_flags = PAT_REF_MAP;
else
appctx->ctx.map.display_flags = PAT_REF_ACL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* No parameter. */
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
if (!*args[2] || !*args[3]) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
appctx->ctx.cli.msg = "Missing map identifier and/or key.\n";
else
appctx->ctx.cli.msg = "Missing ACL identifier and/or key.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* lookup into the maps */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
if (!appctx->ctx.map.ref) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown ACL identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* copy input string. The string must be allocated because
* it may be used over multiple iterations. It's released
* at the end and upon abort anyway.
*/
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->ctx.map.chunk.len = strlen(args[3]);
appctx->ctx.map.chunk.size = appctx->ctx.map.chunk.len + 1;
appctx->ctx.map.chunk.str = strdup(args[3]);
if (!appctx->ctx.map.chunk.str) {
appctx->ctx.cli.msg = "Out of memory error.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* prepare response */
appctx->st2 = STAT_ST_INIT;
appctx->st0 = STAT_CLI_O_MLOOK;
}
[MEDIUM] stats: add the "get weight" command to report a server's weight This command is unrestricted and simply reports a server's weight, as well as the weight initially configured, which at the moment are the sames.
2009-10-10 12:37:29 -04:00
else { /* not "get weight" */
return 0;
}
}
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
else if (strcmp(args[0], "set") == 0) {
if (strcmp(args[1], "weight") == 0) {
struct server *sv;
MEDIUM: server: Break out set weight processing code Break out set weight processing code. This is in preparation for reusing the code. Also, remove duplicate check in nested if clauses. {px->lbprm.algo & BE_LB_PROP_DYN) is checked by the immediate outer if clause, so there is no need to check it a second time. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-02-11 20:45:51 -05:00
const char *warning;
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
sv = expect_server_admin(s, si, args[2]);
if (!sv)
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
return 1;
MEDIUM: server: Break out set weight processing code Break out set weight processing code. This is in preparation for reusing the code. Also, remove duplicate check in nested if clauses. {px->lbprm.algo & BE_LB_PROP_DYN) is checked by the immediate outer if clause, so there is no need to check it a second time. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-02-11 20:45:51 -05:00
warning = server_parse_weight_change_request(sv, args[3]);
if (warning) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = warning;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
}
return 1;
}
MINOR: cli: introduce a new "set server" command This command supports "agent", "health", "state" and "weight" to adjust various server attributes as well as changing server health check statuses on the fly or setting the drain mode.
2014-05-22 12:42:35 -04:00
else if (strcmp(args[1], "server") == 0) {
struct server *sv;
const char *warning;
sv = expect_server_admin(s, si, args[2]);
if (!sv)
return 1;
if (strcmp(args[3], "weight") == 0) {
warning = server_parse_weight_change_request(sv, args[4]);
if (warning) {
appctx->ctx.cli.msg = warning;
appctx->st0 = STAT_CLI_PRINT;
}
}
else if (strcmp(args[3], "state") == 0) {
if (strcmp(args[4], "ready") == 0)
srv_adm_set_ready(sv);
else if (strcmp(args[4], "drain") == 0)
srv_adm_set_drain(sv);
else if (strcmp(args[4], "maint") == 0)
srv_adm_set_maint(sv);
else {
appctx->ctx.cli.msg = "'set server <srv> state' expects 'ready', 'drain' and 'maint'.\n";
appctx->st0 = STAT_CLI_PRINT;
}
}
else if (strcmp(args[3], "health") == 0) {
if (sv->track) {
appctx->ctx.cli.msg = "cannot change health on a tracking server.\n";
appctx->st0 = STAT_CLI_PRINT;
}
else if (strcmp(args[4], "up") == 0) {
sv->check.health = sv->check.rise + sv->check.fall - 1;
srv_set_running(sv, "changed from CLI");
}
else if (strcmp(args[4], "stopping") == 0) {
sv->check.health = sv->check.rise + sv->check.fall - 1;
srv_set_stopping(sv, "changed from CLI");
}
else if (strcmp(args[4], "down") == 0) {
sv->check.health = 0;
srv_set_stopped(sv, "changed from CLI");
}
else {
appctx->ctx.cli.msg = "'set server <srv> health' expects 'up', 'stopping', or 'down'.\n";
appctx->st0 = STAT_CLI_PRINT;
}
}
else if (strcmp(args[3], "agent") == 0) {
if (!(sv->agent.state & CHK_ST_ENABLED)) {
appctx->ctx.cli.msg = "agent checks are not enabled on this server.\n";
appctx->st0 = STAT_CLI_PRINT;
}
else if (strcmp(args[4], "up") == 0) {
sv->agent.health = sv->agent.rise + sv->agent.fall - 1;
srv_set_running(sv, "changed from CLI");
}
else if (strcmp(args[4], "down") == 0) {
sv->agent.health = 0;
srv_set_stopped(sv, "changed from CLI");
}
else {
appctx->ctx.cli.msg = "'set server <srv> agent' expects 'up' or 'down'.\n";
appctx->st0 = STAT_CLI_PRINT;
}
}
MINOR: cli: change a server health check port through the stats socket Introduction of a new CLI command "set server <srv> check-port <port>' to allow admins to change a server's health check port at run time. This changes the equivalent of the configuration server parameter called 'port'.
2016-08-31 17:26:29 -04:00
else if (strcmp(args[3], "check-port") == 0) {
int i = 0;
if (strl2irc(args[4], strlen(args[4]), &i) != 0) {
appctx->ctx.cli.msg = "'set server <srv> check-port' expects an integer as argument.\n";
appctx->st0 = STAT_CLI_PRINT;
}
if ((i < 0) || (i > 65535)) {
appctx->ctx.cli.msg = "provided port is not valid.\n";
appctx->st0 = STAT_CLI_PRINT;
}
/* prevent the update of port to 0 if MAPPORTS are in use */
if ((sv->flags & SRV_F_MAPPORTS) && (i == 0)) {
appctx->ctx.cli.msg = "can't unset 'port' since MAPPORTS is in use.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
sv->check.port = i;
appctx->ctx.cli.msg = "health check port updated.\n";
appctx->st0 = STAT_CLI_PRINT;
}
MEDIUM: server: change server ip address from stats socket New command available on the stats socket to change a server addr using the command "set server <backend>/<server> addr <ip4|ip6>"
2015-04-13 16:54:33 -04:00
else if (strcmp(args[3], "addr") == 0) {
MINOR: cli: ability to change a server's port Enrichment of the 'set server <b>/<s> addr' cli directive to allow changing now a server's port. The new syntax looks like: set server <b>/<s> addr [port <port>]
2016-08-03 16:34:12 -04:00
char *addr = NULL;
char *port = NULL;
if (strlen(args[4]) == 0) {
MEDIUM: cli: leave the RMAINT state when setting an IP address on the CLI The RMAINT state happens when a server doesn't get a valid DNS response past the hold time. If the address is forced on the CLI, we must use it and leave the RMAINT state.
2016-11-04 13:21:32 -04:00
appctx->ctx.cli.msg = "set server <b>/<s> addr requires an address and optionally a port.\n";
MINOR: cli: ability to change a server's port Enrichment of the 'set server <b>/<s> addr' cli directive to allow changing now a server's port. The new syntax looks like: set server <b>/<s> addr [port <port>]
2016-08-03 16:34:12 -04:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
else {
addr = args[4];
}
if (strcmp(args[5], "port") == 0) {
port = args[6];
}
warning = update_server_addr_port(sv, addr, port, "stats socket command");
MEDIUM: server: change server ip address from stats socket New command available on the stats socket to change a server addr using the command "set server <backend>/<server> addr <ip4|ip6>"
2015-04-13 16:54:33 -04:00
if (warning) {
appctx->ctx.cli.msg = warning;
appctx->st0 = STAT_CLI_PRINT;
}
MEDIUM: cli: leave the RMAINT state when setting an IP address on the CLI The RMAINT state happens when a server doesn't get a valid DNS response past the hold time. If the address is forced on the CLI, we must use it and leave the RMAINT state.
2016-11-04 13:21:32 -04:00
srv_clr_admin_flag(sv, SRV_ADMF_RMAINT);
MEDIUM: server: change server ip address from stats socket New command available on the stats socket to change a server addr using the command "set server <backend>/<server> addr <ip4|ip6>"
2015-04-13 16:54:33 -04:00
}
MINOR: cli: introduce a new "set server" command This command supports "agent", "health", "state" and "weight" to adjust various server attributes as well as changing server health check statuses on the fly or setting the drain mode.
2014-05-22 12:42:35 -04:00
else {
MINOR: cli: change a server health check port through the stats socket Introduction of a new CLI command "set server <srv> check-port <port>' to allow admins to change a server's health check port at run time. This changes the equivalent of the configuration server parameter called 'port'.
2016-08-31 17:26:29 -04:00
appctx->ctx.cli.msg = "'set server <srv>' only supports 'agent', 'health', 'state', 'weight', 'addr' and 'check-port'.\n";
MINOR: cli: introduce a new "set server" command This command supports "agent", "health", "state" and "weight" to adjust various server attributes as well as changing server health check statuses on the fly or setting the drain mode.
2014-05-22 12:42:35 -04:00
appctx->st0 = STAT_CLI_PRINT;
}
return 1;
}
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
else if (strcmp(args[1], "timeout") == 0) {
if (strcmp(args[2], "cli") == 0) {
unsigned timeout;
const char *res;
if (!*args[3]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Expects an integer value.\n";
appctx->st0 = STAT_CLI_PRINT;
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
return 1;
}
res = parse_time_err(args[3], &timeout, TIME_UNIT_S);
if (res || timeout < 1) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Invalid timeout value.\n";
appctx->st0 = STAT_CLI_PRINT;
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
return 1;
}
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
s->req.rto = s->res.wto = 1 + MS_TO_TICKS(timeout*1000);
BUG/MINOR: cli: wake up the CLI's task after a timeout update When the CLI's timeout is reduced, nothing was done to take the task up to update it. In the past it used to run inside process_stream() so it used to be refreshed. This is not the case anymore since we have the appctx so the task needs to be woken up in order to recompute the new expiration date. This fix needs to be backported to 1.6.
2016-11-24 09:35:16 -05:00
task_wakeup(s->task, TASK_WOKEN_MSG); // recompute timeouts
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
return 1;
}
else {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "'set timeout' only supports 'cli'.\n";
appctx->st0 = STAT_CLI_PRINT;
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
return 1;
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
}
}
else if (strcmp(args[1], "maxconn") == 0) {
if (strcmp(args[2], "frontend") == 0) {
struct proxy *px;
struct listener *l;
int v;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
px = expect_frontend_admin(s, si, args[3]);
if (!px)
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
return 1;
if (!*args[4]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Integer value expected.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
return 1;
}
v = atoi(args[4]);
MINOR: cli: allow to set frontend maxconn to zero It is sometimes useful to completely disable accepting new connections on a frontend during maintenance operations. By setting a frontend's maxconn to zero, connections are not accepted anymore until the limit is increased again.
2012-09-26 15:07:15 -04:00
if (v < 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Value out of range.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
return 1;
}
/* OK, the value is fine, so we assign it to the proxy and to all of
* its listeners. The blocked ones will be dequeued.
*/
px->maxconn = v;
BUG: stats: fix regression introduced by commit 4348fad1 Recent commit 4348fad1 (listeners: use dual-linked lists to chain listeners with frontends) broke frontend lookup in stats sockets by using the wrong iterator in the listeners.
2012-09-26 15:03:11 -04:00
list_for_each_entry(l, &px->conf.listeners, by_fe) {
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
l->maxconn = v;
if (l->state == LI_FULL)
resume_listener(l);
}
BUG/MINOR: cli: dequeue from the proxy when changing a maxconn The "set maxconn frontend" statement on the CLI tries to dequeue possibly pending requests, but due to a copy-paste error, they're dequeued on the CLI's frontend instead of the one being changed. The impact is very minor as it only means that possibly pending connections will still have to wait for a previous one to complete before being accepted when a limit is raised. This fix has to be backported to 1.6 and 1.5.
2016-11-24 09:25:39 -05:00
if (px->maxconn > px->feconn && !LIST_ISEMPTY(&px->listener_queue))
dequeue_all_listeners(&px->listener_queue);
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
return 1;
}
MINOR: cli: ability to set per-server maxconn This commit adds support for setting a per-server maxconn from the stats socket. The only really notable part of this commit is that we need to check if maxconn == minconn before changing things, as this indicates that we are NOT using dynamic maxconn. When we are not using dynamic maxconn, we should update maxconn/minconn in lockstep.
2015-10-27 17:46:25 -04:00
else if (strcmp(args[2], "server") == 0) {
struct server *sv;
CLEANUP: Use server_parse_maxconn_change_request for maxconn CLI updates
2016-04-24 17:10:07 -04:00
const char *warning;
MINOR: cli: ability to set per-server maxconn This commit adds support for setting a per-server maxconn from the stats socket. The only really notable part of this commit is that we need to check if maxconn == minconn before changing things, as this indicates that we are NOT using dynamic maxconn. When we are not using dynamic maxconn, we should update maxconn/minconn in lockstep.
2015-10-27 17:46:25 -04:00
sv = expect_server_admin(s, si, args[3]);
if (!sv)
return 1;
CLEANUP: Use server_parse_maxconn_change_request for maxconn CLI updates
2016-04-24 17:10:07 -04:00
warning = server_parse_maxconn_change_request(sv, args[4]);
if (warning) {
appctx->ctx.cli.msg = warning;
MINOR: cli: ability to set per-server maxconn This commit adds support for setting a per-server maxconn from the stats socket. The only really notable part of this commit is that we need to check if maxconn == minconn before changing things, as this indicates that we are NOT using dynamic maxconn. When we are not using dynamic maxconn, we should update maxconn/minconn in lockstep.
2015-10-27 17:46:25 -04:00
appctx->st0 = STAT_CLI_PRINT;
}
return 1;
}
[MEDIUM] stats: add the "set maxconn" setting to the command line interface This option permits to change the global maxconn setting within the limit that was set by the initial value, which is now reported as the hard maxconn value. This allows to immediately accept more concurrent connections or to stop accepting new ones until the value passes below the indicated setting. The main use of this option is on systems where many haproxy instances are loaded and admins need to re-adjust resource sharing at run time to regain a bit of fairness between processes.
2011-09-07 08:38:31 -04:00
else if (strcmp(args[2], "global") == 0) {
int v;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "set maxconn" setting to the command line interface This option permits to change the global maxconn setting within the limit that was set by the initial value, which is now reported as the hard maxconn value. This allows to immediately accept more concurrent connections or to stop accepting new ones until the value passes below the indicated setting. The main use of this option is on systems where many haproxy instances are loaded and admins need to re-adjust resource sharing at run time to regain a bit of fairness between processes.
2011-09-07 08:38:31 -04:00
return 1;
}
if (!*args[3]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Expects an integer value.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "set maxconn" setting to the command line interface This option permits to change the global maxconn setting within the limit that was set by the initial value, which is now reported as the hard maxconn value. This allows to immediately accept more concurrent connections or to stop accepting new ones until the value passes below the indicated setting. The main use of this option is on systems where many haproxy instances are loaded and admins need to re-adjust resource sharing at run time to regain a bit of fairness between processes.
2011-09-07 08:38:31 -04:00
return 1;
}
v = atoi(args[3]);
if (v > global.hardmaxconn) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Value out of range.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the "set maxconn" setting to the command line interface This option permits to change the global maxconn setting within the limit that was set by the initial value, which is now reported as the hard maxconn value. This allows to immediately accept more concurrent connections or to stop accepting new ones until the value passes below the indicated setting. The main use of this option is on systems where many haproxy instances are loaded and admins need to re-adjust resource sharing at run time to regain a bit of fairness between processes.
2011-09-07 08:38:31 -04:00
return 1;
}
/* check for unlimited values */
if (v <= 0)
v = global.hardmaxconn;
global.maxconn = v;
/* Dequeues all of the listeners waiting for a resource */
if (!LIST_ISEMPTY(&global_listener_queue))
dequeue_all_listeners(&global_listener_queue);
return 1;
}
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
else {
MINOR: cli: ability to set per-server maxconn This commit adds support for setting a per-server maxconn from the stats socket. The only really notable part of this commit is that we need to check if maxconn == minconn before changing things, as this indicates that we are NOT using dynamic maxconn. When we are not using dynamic maxconn, we should update maxconn/minconn in lockstep.
2015-10-27 17:46:25 -04:00
appctx->ctx.cli.msg = "'set maxconn' only supports 'frontend', 'server', and 'global'.\n";
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add support for changing frontend's maxconn at runtime The new "set maxconn frontend XXX" statement on the stats socket allows the admin to change a frontend's maxconn value. If some connections are queued, they will immediately be accepted up to the new limit. If the limit is lowered, new connections acceptation might be delayed. This can be used to temporarily reduce or increase the impact of a specific frontend's traffic on the whole process.
2011-08-02 05:49:05 -04:00
return 1;
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
}
}
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
else if (strcmp(args[1], "rate-limit") == 0) {
if (strcmp(args[2], "connections") == 0) {
if (strcmp(args[3], "global") == 0) {
int v;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
return 1;
}
if (!*args[4]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Expects an integer value.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
return 1;
}
v = atoi(args[4]);
if (v < 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Value out of range.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
return 1;
}
global.cps_lim = v;
/* Dequeues all of the listeners waiting for a resource */
if (!LIST_ISEMPTY(&global_listener_queue))
dequeue_all_listeners(&global_listener_queue);
return 1;
}
else {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "'set rate-limit connections' only supports 'global'.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
return 1;
}
}
MEDIUM: listener: add support for limiting the session rate in addition to the connection rate It's sometimes useful to be able to limit the connection rate on a machine running many haproxy instances (eg: per customer) but it removes the ability for that machine to defend itself against a DoS. Thus, better also provide a limit on the session rate, which does not include the connections rejected by "tcp-request connection" rules. This permits to have much higher limits on the connection rate without having to raise the session rate limit to insane values. The limit can be changed on the CLI using "set rate-limit sessions global", or in the global section using "maxsessrate".
2013-10-07 12:51:07 -04:00
else if (strcmp(args[2], "sessions") == 0) {
if (strcmp(args[3], "global") == 0) {
int v;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: listener: add support for limiting the session rate in addition to the connection rate It's sometimes useful to be able to limit the connection rate on a machine running many haproxy instances (eg: per customer) but it removes the ability for that machine to defend itself against a DoS. Thus, better also provide a limit on the session rate, which does not include the connections rejected by "tcp-request connection" rules. This permits to have much higher limits on the connection rate without having to raise the session rate limit to insane values. The limit can be changed on the CLI using "set rate-limit sessions global", or in the global section using "maxsessrate".
2013-10-07 12:51:07 -04:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
if (!*args[4]) {
appctx->ctx.cli.msg = "Expects an integer value.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
v = atoi(args[4]);
if (v < 0) {
appctx->ctx.cli.msg = "Value out of range.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
global.sps_lim = v;
/* Dequeues all of the listeners waiting for a resource */
if (!LIST_ISEMPTY(&global_listener_queue))
dequeue_all_listeners(&global_listener_queue);
return 1;
}
else {
appctx->ctx.cli.msg = "'set rate-limit sessions' only supports 'global'.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
MEDIUM: listener: apply a limit on the session rate submitted to SSL Just like the previous commit, we sometimes want to limit the rate of incoming SSL connections. While it can be done for a frontend, it was not possible for a whole process, which makes sense when multiple processes are running on a system to server multiple customers. The new global "maxsslrate" setting is usable to fix a limit on the session rate going to the SSL frontends. The limits applies before the SSL handshake and not after, so that it saves the SSL stack from expensive key computations that would finally be aborted before being accounted for. The same setting may be changed at run time on the CLI using "set rate-limit ssl-session global".
2013-10-07 14:01:52 -04:00
#ifdef USE_OPENSSL
else if (strcmp(args[2], "ssl-sessions") == 0) {
if (strcmp(args[3], "global") == 0) {
int v;
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: listener: apply a limit on the session rate submitted to SSL Just like the previous commit, we sometimes want to limit the rate of incoming SSL connections. While it can be done for a frontend, it was not possible for a whole process, which makes sense when multiple processes are running on a system to server multiple customers. The new global "maxsslrate" setting is usable to fix a limit on the session rate going to the SSL frontends. The limits applies before the SSL handshake and not after, so that it saves the SSL stack from expensive key computations that would finally be aborted before being accounted for. The same setting may be changed at run time on the CLI using "set rate-limit ssl-session global".
2013-10-07 14:01:52 -04:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
if (!*args[4]) {
appctx->ctx.cli.msg = "Expects an integer value.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
v = atoi(args[4]);
if (v < 0) {
appctx->ctx.cli.msg = "Value out of range.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
global.ssl_lim = v;
/* Dequeues all of the listeners waiting for a resource */
if (!LIST_ISEMPTY(&global_listener_queue))
dequeue_all_listeners(&global_listener_queue);
return 1;
}
else {
appctx->ctx.cli.msg = "'set rate-limit ssl-sessions' only supports 'global'.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
#endif
MINOR: compression: maximum compression rate limit This patch adds input and output rate calcutation on the HTTP compresion feature. Compression can be limited with a maximum rate value in kilobytes per second. The rate is set with the global 'maxcomprate' option. You can change this value dynamicaly with 'set rate-limit http-compression global' on the UNIX socket.
2012-11-09 11:05:39 -05:00
else if (strcmp(args[2], "http-compression") == 0) {
if (strcmp(args[3], "global") == 0) {
int v;
BUG/MEDIUM: cli: changing compression rate-limiting must require admin level Right now it's possible to change the global compression rate limiting without the CLI being at the admin level. This fix must be backported to 1.6 and 1.5.
2015-11-26 12:32:39 -05:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MINOR: cli: report an error message on missing argument to compression rate "set rate-limit http-compression global" needs an integer and must complain when it's not there.
2012-11-20 18:29:50 -05:00
if (!*args[4]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Expects a maximum input byte rate in kB/s.\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: cli: report an error message on missing argument to compression rate "set rate-limit http-compression global" needs an integer and must complain when it's not there.
2012-11-20 18:29:50 -05:00
return 1;
}
MINOR: compression: maximum compression rate limit This patch adds input and output rate calcutation on the HTTP compresion feature. Compression can be limited with a maximum rate value in kilobytes per second. The rate is set with the global 'maxcomprate' option. You can change this value dynamicaly with 'set rate-limit http-compression global' on the UNIX socket.
2012-11-09 11:05:39 -05:00
v = atoi(args[4]);
global.comp_rate_lim = v * 1024; /* Kilo to bytes. */
}
else {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "'set rate-limit http-compression' only supports 'global'.\n";
appctx->st0 = STAT_CLI_PRINT;
MINOR: compression: maximum compression rate limit This patch adds input and output rate calcutation on the HTTP compresion feature. Compression can be limited with a maximum rate value in kilobytes per second. The rate is set with the global 'maxcomprate' option. You can change this value dynamicaly with 'set rate-limit http-compression global' on the UNIX socket.
2012-11-09 11:05:39 -05:00
return 1;
}
}
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
else {
MEDIUM: listener: apply a limit on the session rate submitted to SSL Just like the previous commit, we sometimes want to limit the rate of incoming SSL connections. While it can be done for a frontend, it was not possible for a whole process, which makes sense when multiple processes are running on a system to server multiple customers. The new global "maxsslrate" setting is usable to fix a limit on the session rate going to the SSL frontends. The limits applies before the SSL handshake and not after, so that it saves the SSL stack from expensive key computations that would finally be aborted before being accounted for. The same setting may be changed at run time on the CLI using "set rate-limit ssl-session global".
2013-10-07 14:01:52 -04:00
appctx->ctx.cli.msg = "'set rate-limit' supports 'connections', 'sessions', 'ssl-sessions', and 'http-compression'.\n";
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to adjust the global maxconnrate Using "set rate-limit connections global <xxx>" on the CLI, we can now adjust the per-process connection rate limiting (equal to global.maxconnrate).
2011-09-07 10:13:44 -04:00
return 1;
}
}
MEDIUM: stats/cli: add support for "set table key" to enter values This is used to enter values for stick tables. The most likely usage is to set gpc0 for a specific IP address in order to block traffic for abusers without having to reload. Since all data types are supported, other usages are possible (eg: replace a users's assigned server).
2012-06-06 19:03:16 -04:00
else if (strcmp(args[1], "table") == 0) {
stats_sock_table_request(si, args, STAT_CLI_O_SET);
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
else if (strcmp(args[1], "map") == 0) {
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
char *err;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Set flags. */
appctx->ctx.map.display_flags = PAT_REF_MAP;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* Expect three parameters: map name, key and new value. */
if (!*args[2] || !*args[3] || !*args[4]) {
MINOR: dumpstats: change map inline sentences The errors and messages used in the cli are sometimes impossibkle to understand. This patch changes all these messages.
2014-03-11 08:52:44 -04:00
appctx->ctx.cli.msg = "'set map' expects three parameters: map identifier, key and value.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* Lookup the reference in the maps. */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
if (!appctx->ctx.map.ref) {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
/* If the entry identifier start with a '#', it is considered as
* pointer id
*/
if (args[3][0] == '#' && args[3][1] == '0' && args[3][2] == 'x') {
struct pat_ref_elt *ref;
long long int conv;
char *error;
/* Convert argument to integer value. */
conv = strtoll(&args[3][1], &error, 16);
if (*error != '\0') {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Malformed identifier. Please use #<id> or <file>.\n";
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* Convert and check integer to pointer. */
ref = (struct pat_ref_elt *)(long)conv;
if ((long long int)(long)ref != conv) {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Malformed identifier. Please use #<id> or <file>.\n";
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* Try to delete the entry. */
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
err = NULL;
if (!pat_ref_set_by_id(appctx->ctx.map.ref, ref, args[4], &err)) {
if (err)
memprintf(&err, "%s.\n", err);
appctx->ctx.cli.err = err;
appctx->st0 = STAT_CLI_PRINT_FREE;
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
return 1;
}
}
else {
/* Else, use the entry identifier as pattern
* string, and update the value.
*/
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
err = NULL;
if (!pat_ref_set(appctx->ctx.map.ref, args[3], args[4], &err)) {
if (err)
memprintf(&err, "%s.\n", err);
appctx->ctx.cli.err = err;
appctx->st0 = STAT_CLI_PRINT_FREE;
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
return 1;
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
/* The set is done, send message. */
MINOR: map/acl/dumpstats: remove the "Done." message By convention, the HAProxy CLI doesn't return message if the opration is sucessfully done. The MAP and ACL returns the "Done." message, an its noise the output during big MAP or ACL injection.
2014-12-18 09:28:01 -05:00
appctx->st0 = STAT_CLI_PROMPT;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 1;
}
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
#ifdef USE_OPENSSL
else if (strcmp(args[1], "ssl") == 0) {
if (strcmp(args[2], "ocsp-response") == 0) {
BUILD: ssl: use OPENSSL_NO_OCSP to detect OCSP support Since commit 656c5fa7e859 ("BUILD: ssl: disable OCSP when using boringssl) the OCSP code is bypassed when OPENSSL_IS_BORINGSSL is defined. The correct thing to do here is to use OPENSSL_NO_OCSP instead, which is defined for this exact purpose in openssl/opensslfeatures.h. This makes haproxy forward compatible if boringssl ever introduces full OCSP support with the additional benefit that it links fine against a OCSP-disabled openssl. Signed-off-by: Lukas Tribus <luky-37@hotmail.com>
2014-12-09 10:32:51 -05:00
#if (defined SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB && !defined OPENSSL_NO_OCSP)
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
char *err = NULL;
MINOR: ssl/cli: Fix unapropriate comment in code on 'set ssl ocsp-response'
2014-06-19 08:10:45 -04:00
/* Expect one parameter: the new response in base64 encoding */
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
if (!*args[3]) {
appctx->ctx.cli.msg = "'set ssl ocsp-response' expects response in base64 encoding.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
trash.len = base64dec(args[3], strlen(args[3]), trash.str, trash.size);
if (trash.len < 0) {
appctx->ctx.cli.msg = "'set ssl ocsp-response' received invalid base64 encoded response.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
if (ssl_sock_update_ocsp_response(&trash, &err)) {
if (err) {
memprintf(&err, "%s.\n", err);
appctx->ctx.cli.err = err;
appctx->st0 = STAT_CLI_PRINT_FREE;
}
return 1;
}
appctx->ctx.cli.msg = "OCSP Response updated!";
appctx->st0 = STAT_CLI_PRINT;
return 1;
#else
appctx->ctx.cli.msg = "HAProxy was compiled against a version of OpenSSL that doesn't support OCSP stapling.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#endif
}
else if (strcmp(args[2], "tls-key") == 0) {
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
/* Expect two parameters: the filename and the new new TLS key in encoding */
if (!*args[3] || !*args[4]) {
appctx->ctx.cli.msg = "'set ssl tls-key' expects a filename and the new TLS key in base64 encoding.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
appctx->ctx.tlskeys.ref = tlskeys_ref_lookup_ref(args[3]);
if(!appctx->ctx.tlskeys.ref) {
appctx->ctx.cli.msg = "'set ssl tls-key' unable to locate referenced filename\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
trash.len = base64dec(args[4], strlen(args[4]), trash.str, trash.size);
if (trash.len != sizeof(struct tls_sess_key)) {
appctx->ctx.cli.msg = "'set ssl tls-key' received invalid base64 encoded TLS key.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
BUG/MINOR: ssl: TLS Ticket Key rotation broken via socket command It seems haproxy was doing wrong pointer arithmetic to update the ticket ring correctly.
2015-08-20 08:55:17 -04:00
memcpy(appctx->ctx.tlskeys.ref->tlskeys + ((appctx->ctx.tlskeys.ref->tls_ticket_enc_index + 2) % TLS_TICKETS_NO), trash.str, trash.len);
appctx->ctx.tlskeys.ref->tls_ticket_enc_index = (appctx->ctx.tlskeys.ref->tls_ticket_enc_index + 1) % TLS_TICKETS_NO;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
appctx->ctx.cli.msg = "TLS ticket key updated!";
appctx->st0 = STAT_CLI_PRINT;
return 1;
#else
appctx->ctx.cli.msg = "HAProxy was compiled against a version of OpenSSL "
"that doesn't support specifying TLS ticket keys\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
MEDIUM: ssl: basic OCSP stapling support. The support is all based on static responses. This doesn't add any request / response logic to HAProxy, but allows a way to update information through the socket interface. Currently certificates specified using "crt" or "crt-list" on "bind" lines are loaded as PEM files. For each PEM file, haproxy checks for the presence of file at the same path suffixed by ".ocsp". If such file is found, support for the TLS Certificate Status Request extension (also known as "OCSP stapling") is automatically enabled. The content of this file is optional. If not empty, it must contain a valid OCSP Response in DER format. In order to be valid an OCSP Response must comply with the following rules: it has to indicate a good status, it has to be a single response for the certificate of the PEM file, and it has to be valid at the moment of addition. If these rules are not respected the OCSP Response is ignored and a warning is emitted. In order to identify which certificate an OCSP Response applies to, the issuer's certificate is necessary. If the issuer's certificate is not found in the PEM file, it will be loaded from a file at the same path as the PEM file suffixed by ".issuer" if it exists otherwise it will fail with an error. It is possible to update an OCSP Response from the unix socket using: set ssl ocsp-response <response> This command is used to update an OCSP Response for a certificate (see "crt" on "bind" lines). Same controls are performed as during the initial loading of the response. The <response> must be passed as a base64 encoded string of the DER encoded response from the OCSP server. Example: openssl ocsp -issuer issuer.pem -cert server.pem \ -host ocsp.issuer.com:80 -respout resp.der echo "set ssl ocsp-response $(base64 -w 10000 resp.der)" | \ socat stdio /var/run/haproxy.stat This feature is automatically enabled on openssl 0.9.8h and above. This work was performed jointly by Dirkjan Bussink of GitHub and Emeric Brun of HAProxy Technologies.
2014-06-16 12:36:30 -04:00
#endif
}
else {
appctx->ctx.cli.msg = "'set ssl' only supports 'ocsp-response'.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
#endif
[STATS] make it possible to change a CLI connection timeout Sometimes it helps to be able to change an interactive CLI connection timeout. Now we just have to enter "set timeout cli <value>" to do that.
2010-01-26 04:59:06 -05:00
else { /* unknown "set" parameter */
[MEDIUM] stats: add the "set weight" command It is now possible to change a server's weight from the stats socket. Just use "set weight <back>/<serv> <weight>".
2009-10-10 13:30:08 -04:00
return 0;
}
}
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
else if (strcmp(args[0], "enable") == 0) {
MEDIUM: Add enable and disable agent unix socket commands The syntax of this new commands are: enable agent <backend>/<server> disable agent <backend>/<server> These commands allow temporarily stopping and subsequently re-starting an auxiliary agent check. The effect of this is as follows: New checks are only initialised when the agent is in the enabled. Thus, disable agent will prevent any new agent checks from begin initiated until the agent re-enabled using enable agent. When an agent is disabled the processing of an auxiliary agent check that was initiated while the agent was set as enabled is as follows: All results that would alter the weight, specifically "drain" or a weight returned by the agent, are ignored. The processing of agent check is otherwise unchanged. The motivation for this feature is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-11-24 20:46:39 -05:00
if (strcmp(args[1], "agent") == 0) {
struct server *sv;
sv = expect_server_admin(s, si, args[2]);
if (!sv)
return 1;
MINOR: checks: replace state DISABLED with CONFIGURED and ENABLED At the moment, health checks and agent checks are tied : no agent check is emitted if no health check is enabled. Other parameters are considered in the condition for letting checks run. It will help us selectively enable checks (agent and regular checks) to be know whether they're enabled/disabled and configured or not. Now we can already emit an error when trying to enable an unconfigured agent.
2013-12-11 14:11:55 -05:00
if (!(sv->agent.state & CHK_ST_CONFIGURED)) {
appctx->ctx.cli.msg = "Agent was not configured on this server, cannot enable.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
sv->agent.state |= CHK_ST_ENABLED;
MEDIUM: Add enable and disable agent unix socket commands The syntax of this new commands are: enable agent <backend>/<server> disable agent <backend>/<server> These commands allow temporarily stopping and subsequently re-starting an auxiliary agent check. The effect of this is as follows: New checks are only initialised when the agent is in the enabled. Thus, disable agent will prevent any new agent checks from begin initiated until the agent re-enabled using enable agent. When an agent is disabled the processing of an auxiliary agent check that was initiated while the agent was set as enabled is as follows: All results that would alter the weight, specifically "drain" or a weight returned by the agent, are ignored. The processing of agent check is otherwise unchanged. The motivation for this feature is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-11-24 20:46:39 -05:00
return 1;
}
MEDIUM: cli: add support for enabling/disabling health checks. "enable health" and "disable health" are introduced to manipulate the health check subsystem.
2014-05-23 05:53:10 -04:00
else if (strcmp(args[1], "health") == 0) {
struct server *sv;
sv = expect_server_admin(s, si, args[2]);
if (!sv)
return 1;
if (!(sv->check.state & CHK_ST_CONFIGURED)) {
appctx->ctx.cli.msg = "Health checks are not configured on this server, cannot enable.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
sv->check.state |= CHK_ST_ENABLED;
return 1;
}
else if (strcmp(args[1], "server") == 0) {
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
struct server *sv;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
sv = expect_server_admin(s, si, args[2]);
if (!sv)
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
return 1;
[BUG] stats: admin commands must check the proxy state As reported by Bryan Talbot, enabling and disabling a server in a disabled proxy causes a segfault. Changing the weight can also cause a similar segfault.
2011-03-03 14:49:04 -05:00
MAJOR: checks: add support for a new "drain" administrative mode This patch adds support for a new "drain" mode. So now we have 3 admin modes for a server : - READY - DRAIN - MAINT The drain mode disables load balancing but leaves the server up. It can coexist with maint, except that maint has precedence. It is also inherited from tracked servers, so just like maint, it's represented with 2 bits. New functions were designed to set/clear each flag and to propagate the changes to tracking servers when relevant, and to log the changes. Existing functions srv_set_adm_maint() and srv_set_adm_ready() were replaced to make use of the new functions. Currently the drain mode is not yet used, however the whole logic was tested with all combinations of set/clear of both flags in various orders to catch all corner cases.
2014-05-22 10:14:34 -04:00
srv_adm_set_ready(sv);
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
return 1;
}
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
else if (strcmp(args[1], "frontend") == 0) {
struct proxy *px;
px = expect_frontend_admin(s, si, args[2]);
if (!px)
return 1;
if (px->state == PR_STSTOPPED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Frontend was previously shut down, cannot enable.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
if (px->state != PR_STPAUSED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Frontend is already enabled.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
if (!resume_proxy(px)) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Failed to resume frontend, check logs for precise cause (port conflict?).\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
return 1;
}
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
else { /* unknown "enable" parameter */
MEDIUM: cli: add support for enabling/disabling health checks. "enable health" and "disable health" are introduced to manipulate the health check subsystem.
2014-05-23 05:53:10 -04:00
appctx->ctx.cli.msg = "'enable' only supports 'agent', 'frontend', 'health', and 'server'.\n";
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
}
}
else if (strcmp(args[0], "disable") == 0) {
MEDIUM: Add enable and disable agent unix socket commands The syntax of this new commands are: enable agent <backend>/<server> disable agent <backend>/<server> These commands allow temporarily stopping and subsequently re-starting an auxiliary agent check. The effect of this is as follows: New checks are only initialised when the agent is in the enabled. Thus, disable agent will prevent any new agent checks from begin initiated until the agent re-enabled using enable agent. When an agent is disabled the processing of an auxiliary agent check that was initiated while the agent was set as enabled is as follows: All results that would alter the weight, specifically "drain" or a weight returned by the agent, are ignored. The processing of agent check is otherwise unchanged. The motivation for this feature is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-11-24 20:46:39 -05:00
if (strcmp(args[1], "agent") == 0) {
struct server *sv;
sv = expect_server_admin(s, si, args[2]);
if (!sv)
return 1;
MINOR: checks: replace state DISABLED with CONFIGURED and ENABLED At the moment, health checks and agent checks are tied : no agent check is emitted if no health check is enabled. Other parameters are considered in the condition for letting checks run. It will help us selectively enable checks (agent and regular checks) to be know whether they're enabled/disabled and configured or not. Now we can already emit an error when trying to enable an unconfigured agent.
2013-12-11 14:11:55 -05:00
sv->agent.state &= ~CHK_ST_ENABLED;
MEDIUM: Add enable and disable agent unix socket commands The syntax of this new commands are: enable agent <backend>/<server> disable agent <backend>/<server> These commands allow temporarily stopping and subsequently re-starting an auxiliary agent check. The effect of this is as follows: New checks are only initialised when the agent is in the enabled. Thus, disable agent will prevent any new agent checks from begin initiated until the agent re-enabled using enable agent. When an agent is disabled the processing of an auxiliary agent check that was initiated while the agent was set as enabled is as follows: All results that would alter the weight, specifically "drain" or a weight returned by the agent, are ignored. The processing of agent check is otherwise unchanged. The motivation for this feature is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-11-24 20:46:39 -05:00
return 1;
}
MEDIUM: cli: add support for enabling/disabling health checks. "enable health" and "disable health" are introduced to manipulate the health check subsystem.
2014-05-23 05:53:10 -04:00
else if (strcmp(args[1], "health") == 0) {
struct server *sv;
sv = expect_server_admin(s, si, args[2]);
if (!sv)
return 1;
sv->check.state &= ~CHK_ST_ENABLED;
return 1;
}
MEDIUM: Add enable and disable agent unix socket commands The syntax of this new commands are: enable agent <backend>/<server> disable agent <backend>/<server> These commands allow temporarily stopping and subsequently re-starting an auxiliary agent check. The effect of this is as follows: New checks are only initialised when the agent is in the enabled. Thus, disable agent will prevent any new agent checks from begin initiated until the agent re-enabled using enable agent. When an agent is disabled the processing of an auxiliary agent check that was initiated while the agent was set as enabled is as follows: All results that would alter the weight, specifically "drain" or a weight returned by the agent, are ignored. The processing of agent check is otherwise unchanged. The motivation for this feature is to allow the weight changing effects of the agent checks to be paused to allow the weight of a server to be configured using set weight without being overridden by the agent. Signed-off-by: Simon Horman <horms@verge.net.au>
2013-11-24 20:46:39 -05:00
else if (strcmp(args[1], "server") == 0) {
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
struct server *sv;
[CLEANUP] stats: centralize tests for backend/server inputs on the CLI The tests were repeated many times. Let's put them at one single place.
2011-09-07 17:41:01 -04:00
sv = expect_server_admin(s, si, args[2]);
if (!sv)
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
return 1;
[BUG] stats: admin commands must check the proxy state As reported by Bryan Talbot, enabling and disabling a server in a disabled proxy causes a segfault. Changing the weight can also cause a similar segfault.
2011-03-03 14:49:04 -05:00
MAJOR: checks: add support for a new "drain" administrative mode This patch adds support for a new "drain" mode. So now we have 3 admin modes for a server : - READY - DRAIN - MAINT The drain mode disables load balancing but leaves the server up. It can coexist with maint, except that maint has precedence. It is also inherited from tracked servers, so just like maint, it's represented with 2 bits. New functions were designed to set/clear each flag and to propagate the changes to tracking servers when relevant, and to log the changes. Existing functions srv_set_adm_maint() and srv_set_adm_ready() were replaced to make use of the new functions. Currently the drain mode is not yet used, however the whole logic was tested with all combinations of set/clear of both flags in various orders to catch all corner cases.
2014-05-22 10:14:34 -04:00
srv_adm_set_maint(sv);
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
return 1;
}
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
else if (strcmp(args[1], "frontend") == 0) {
struct proxy *px;
px = expect_frontend_admin(s, si, args[2]);
if (!px)
return 1;
if (px->state == PR_STSTOPPED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Frontend was previously shut down, cannot disable.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
if (px->state == PR_STPAUSED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Frontend is already disabled.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
if (!pause_proxy(px)) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Failed to pause frontend, check logs for precise cause.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
return 1;
}
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
else { /* unknown "disable" parameter */
MEDIUM: cli: add support for enabling/disabling health checks. "enable health" and "disable health" are introduced to manipulate the health check subsystem.
2014-05-23 05:53:10 -04:00
appctx->ctx.cli.msg = "'disable' only supports 'agent', 'frontend', 'health', and 'server'.\n";
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
}
else if (strcmp(args[0], "shutdown") == 0) {
if (strcmp(args[1], "frontend") == 0) {
struct proxy *px;
px = expect_frontend_admin(s, si, args[2]);
if (!px)
return 1;
if (px->state == PR_STSTOPPED) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Frontend was already shut down.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
}
Warning("Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n",
px->id, px->fe_counters.cum_conn, px->be_counters.cum_conn);
send_log(px, LOG_WARNING, "Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n",
px->id, px->fe_counters.cum_conn, px->be_counters.cum_conn);
stop_proxy(px);
return 1;
}
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
else if (strcmp(args[1], "session") == 0) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *sess, *ptr;
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
if (strm_li(s)->bind_conf->level < ACCESS_LVL_ADMIN) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = stats_permission_denied_msg;
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
return 1;
}
if (!*args[2]) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "Session pointer expected (use 'show sess').\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
return 1;
}
ptr = (void *)strtoul(args[2], NULL, 0);
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* first, look for the requested stream in the stream table */
list_for_each_entry(sess, &streams, list) {
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
if (sess == ptr)
break;
}
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* do we have the stream ? */
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
if (sess != ptr) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "No such session (use 'show sess').\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
return 1;
}
REORG/MEDIUM: stream: rename stream flags from SN_* to SF_* This is in order to keep things consistent.
2015-04-02 19:14:29 -04:00
stream_shutdown(sess, SF_ERR_KILLED);
[MEDIUM] stats: offer the possibility to kill a session from the CLI It's now possible to issue "shutdown session 0xXXXXXXXX" and have this session immediately killed. Useful for long-running fantoms.
2011-09-07 17:21:03 -04:00
return 1;
}
[MEDIUM] stats: offer the possibility to kill sessions by server It's now possible to issue "shutdown sessions server <back/srv>" and have all this server's sessions immediately killed.
2011-09-07 17:48:48 -04:00
else if (strcmp(args[1], "sessions") == 0) {
if (strcmp(args[2], "server") == 0) {
struct server *sv;
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *sess, *sess_bck;
[MEDIUM] stats: offer the possibility to kill sessions by server It's now possible to issue "shutdown sessions server <back/srv>" and have all this server's sessions immediately killed.
2011-09-07 17:48:48 -04:00
sv = expect_server_admin(s, si, args[3]);
if (!sv)
return 1;
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* kill all the stream that are on this server */
[MEDIUM] stats: offer the possibility to kill sessions by server It's now possible to issue "shutdown sessions server <back/srv>" and have all this server's sessions immediately killed.
2011-09-07 17:48:48 -04:00
list_for_each_entry_safe(sess, sess_bck, &sv->actconns, by_srv)
if (sess->srv_conn == sv)
REORG/MEDIUM: stream: rename stream flags from SN_* to SF_* This is in order to keep things consistent.
2015-04-02 19:14:29 -04:00
stream_shutdown(sess, SF_ERR_KILLED);
[MEDIUM] stats: offer the possibility to kill sessions by server It's now possible to issue "shutdown sessions server <back/srv>" and have all this server's sessions immediately killed.
2011-09-07 17:48:48 -04:00
return 1;
}
else {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "'shutdown sessions' only supports 'server'.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: offer the possibility to kill sessions by server It's now possible to issue "shutdown sessions server <back/srv>" and have all this server's sessions immediately killed.
2011-09-07 17:48:48 -04:00
return 1;
}
}
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
else { /* unknown "disable" parameter */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.cli.msg = "'shutdown' only supports 'frontend', 'session' and 'sessions'.\n";
appctx->st0 = STAT_CLI_PRINT;
[MEDIUM] stats: add the ability to enable/disable/shutdown a frontend at runtime The stats socket now allows the admin to disable, enable or shutdown a frontend. This can be used when a bug is discovered in a configuration and it's desirable to fix it but the rules in place don't allow to change a running config. Thus it becomes possible to kill the frontend to release the port and start a new one in a separate process. This can also be used to temporarily make haproxy return TCP resets to incoming requests to pretend the service is not bound. For instance, this may be useful to quickly flush a very deep SYN backlog. The frontend check and lookup code was factored with the "set maxconn" usage.
2011-09-07 16:37:44 -04:00
return 1;
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
}
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
else if (strcmp(args[0], "del") == 0) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (strcmp(args[1], "map") == 0 || strcmp(args[1], "acl") == 0) {
if (args[1][0] == 'm')
appctx->ctx.map.display_flags = PAT_REF_MAP;
else
appctx->ctx.map.display_flags = PAT_REF_ACL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* Expect two parameters: map name and key. */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (!*args[2] || !*args[3]) {
appctx->ctx.cli.msg = "This command expects two parameters: map identifier and key.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
else {
if (!*args[2] || !*args[3]) {
appctx->ctx.cli.msg = "This command expects two parameters: ACL identifier and key.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
/* Lookup the reference in the maps. */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (!appctx->ctx.map.ref ||
!(appctx->ctx.map.ref->flags & appctx->ctx.map.display_flags)) {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
/* If the entry identifier start with a '#', it is considered as
* pointer id
*/
if (args[3][0] == '#' && args[3][1] == '0' && args[3][2] == 'x') {
struct pat_ref_elt *ref;
long long int conv;
char *error;
/* Convert argument to integer value. */
conv = strtoll(&args[3][1], &error, 16);
if (*error != '\0') {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Malformed identifier. Please use #<id> or <file>.\n";
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* Convert and check integer to pointer. */
ref = (struct pat_ref_elt *)(long)conv;
if ((long long int)(long)ref != conv) {
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Malformed identifier. Please use #<id> or <file>.\n";
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
/* Try to delete the entry. */
if (!pat_ref_delete_by_id(appctx->ctx.map.ref, ref)) {
/* The entry is not found, send message. */
appctx->ctx.cli.msg = "Key not found.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
else {
/* Else, use the entry identifier as pattern
* string and try to delete the entry.
*/
if (!pat_ref_delete(appctx->ctx.map.ref, args[3])) {
/* The entry is not found, send message. */
appctx->ctx.cli.msg = "Key not found.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
/* The deletion is done, send message. */
MINOR: map/acl/dumpstats: remove the "Done." message By convention, the HAProxy CLI doesn't return message if the opration is sucessfully done. The MAP and ACL returns the "Done." message, an its noise the output during big MAP or ACL injection.
2014-12-18 09:28:01 -05:00
appctx->st0 = STAT_CLI_PROMPT;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 1;
}
else { /* unknown "del" parameter */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.cli.msg = "'del' only supports 'map' or 'acl'.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
else if (strcmp(args[0], "add") == 0) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (strcmp(args[1], "map") == 0 ||
strcmp(args[1], "acl") == 0) {
int ret;
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
char *err;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Set flags. */
if (args[1][0] == 'm')
appctx->ctx.map.display_flags = PAT_REF_MAP;
else
appctx->ctx.map.display_flags = PAT_REF_ACL;
/* If the keywork is "map", we expect three parameters, if it
* is "acl", we expect only two parameters
*/
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (!*args[2] || !*args[3] || !*args[4]) {
appctx->ctx.cli.msg = "'add map' expects three parameters: map identifier, key and value.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
else {
if (!*args[2] || !*args[3]) {
appctx->ctx.cli.msg = "'add acl' expects two parameters: ACL identifier and pattern.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Lookup for the reference. */
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
appctx->ctx.map.ref = pat_ref_lookup_ref(args[2]);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
if (!appctx->ctx.map.ref) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown map identifier. Please use #<id> or <file>.\n";
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
appctx->ctx.cli.msg = "Unknown ACL identifier. Please use #<id> or <file>.\n";
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MINOR: cli: Block the usage of the command "acl add" in many cases. If acl is shared with a map, the "add acl" command must be blocked because it not take a sample on his parameters. The absense of this parameter can cause error with corresponding maps.
2014-01-29 14:02:36 -05:00
/* The command "add acl" is prohibited if the reference
* use samples.
*/
if ((appctx->ctx.map.display_flags & PAT_REF_ACL) &&
(appctx->ctx.map.ref->flags & PAT_REF_SMP)) {
appctx->ctx.cli.msg = "This ACL is shared with a map containing samples. "
"You must use the command 'add map' to add values.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Add value. */
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
err = NULL;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
BUG/MEDIUM: patterns: last fix was still not enough Last fix did address the issue for inlined patterns, but it was not enough because the flags are lost as well when updating patterns dynamically over the CLI. Also if the same file was used once with -i and another time without -i, their references would have been merged and both would have used the same matching method. It's appear that the patterns have two types of flags. The first ones are relative to the pattern matching, and the second are relative to the pattern storage. The pattern matching flags are the same for all the patterns of one expression. Now they are stored in the expression. The storage flags are information returned by the pattern mathing function. This information is relative to each entry and is stored in the "struct pattern". Now, the expression matching flags are forwarded to the parse and index functions. These flags are stored during the configuration parsing, and they are used during the parse and index actions. This issue was introduced in dev23 with the major pattern rework, and is a continuation of commit a631fc8 ("BUG/MAJOR: patterns: -i and -n are ignored for inlined patterns"). No backport is needed.
2014-04-28 05:18:57 -04:00
ret = pat_ref_add(appctx->ctx.map.ref, args[3], args[4], &err);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
BUG/MEDIUM: patterns: last fix was still not enough Last fix did address the issue for inlined patterns, but it was not enough because the flags are lost as well when updating patterns dynamically over the CLI. Also if the same file was used once with -i and another time without -i, their references would have been merged and both would have used the same matching method. It's appear that the patterns have two types of flags. The first ones are relative to the pattern matching, and the second are relative to the pattern storage. The pattern matching flags are the same for all the patterns of one expression. Now they are stored in the expression. The storage flags are information returned by the pattern mathing function. This information is relative to each entry and is stored in the "struct pattern". Now, the expression matching flags are forwarded to the parse and index functions. These flags are stored during the configuration parsing, and they are used during the parse and index actions. This issue was introduced in dev23 with the major pattern rework, and is a continuation of commit a631fc8 ("BUG/MAJOR: patterns: -i and -n are ignored for inlined patterns"). No backport is needed.
2014-04-28 05:18:57 -04:00
ret = pat_ref_add(appctx->ctx.map.ref, args[3], NULL, &err);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (!ret) {
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
if (err)
memprintf(&err, "%s.\n", err);
appctx->ctx.cli.err = err;
appctx->st0 = STAT_CLI_PRINT_FREE;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 1;
}
/* The add is done, send message. */
MINOR: map/acl/dumpstats: remove the "Done." message By convention, the HAProxy CLI doesn't return message if the opration is sucessfully done. The MAP and ACL returns the "Done." message, an its noise the output during big MAP or ACL injection.
2014-12-18 09:28:01 -05:00
appctx->st0 = STAT_CLI_PROMPT;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 1;
}
else { /* unknown "del" parameter */
appctx->ctx.cli.msg = "'add' only supports 'map'.\n";
appctx->st0 = STAT_CLI_PRINT;
return 1;
}
}
[MEDIUM] add a maintenance mode to servers This is a first attempt to add a maintenance mode on servers, using the stat socket (in admin level). It can be done with the following command : - disable server <backend>/<server> - enable server <backend>/<server> In this mode, no more checks will be performed on the server and it will be marked as a special DOWN state (MAINT). If some servers were tracking it, they'll go DOWN until the server leaves the maintenance mode. The stats page and the CSV export also display this special state. This can be used to disable the server in haproxy before doing some operations on this server itself. This is a good complement to the "http-check disable-on-404" keyword and works in TCP mode.
2010-01-31 16:34:03 -05:00
else { /* not "show" nor "clear" nor "get" nor "set" nor "enable" nor "disable" */
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
return 0;
}
return 1;
}
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
/* This I/O handler runs as an applet embedded in a stream interface. It is
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
* used to processes I/O from/to the stats unix socket. The system relies on a
* state machine handling requests and various responses. We read a request,
* then we process it and send the response, and we possibly display a prompt.
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
* Then we can read again. The state is stored in appctx->st0 and is one of the
* STAT_CLI_* constants. appctx->st1 is used to indicate whether prompt is enabled
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
* or not.
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
*/
MEDIUM: applet: make the applet not depend on a stream interface anymore Now that applet's functions only take an appctx in argument, not a stream interface. This slightly simplifies the code and will be needed to take the appctx out of the stream interface.
2015-04-13 06:05:19 -04:00
static void cli_io_handler(struct appctx *appctx)
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
{
MEDIUM: applet: make the applet not depend on a stream interface anymore Now that applet's functions only take an appctx in argument, not a stream interface. This slightly simplifies the code and will be needed to take the appctx out of the stream interface.
2015-04-13 06:05:19 -04:00
struct stream_interface *si = appctx->owner;
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
struct channel *req = si_oc(si);
struct channel *res = si_ic(si);
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
int reql;
int len;
if (unlikely(si->state == SI_ST_DIS || si->state == SI_ST_CLO))
goto out;
while (1) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st0 == STAT_CLI_INIT) {
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
/* Stats output not initialized yet */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
memset(&appctx->ctx.stats, 0, sizeof(appctx->ctx.stats));
appctx->st0 = STAT_CLI_GETREQ;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
else if (appctx->st0 == STAT_CLI_END) {
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
/* Let's close for real now. We just close the request
* side, the conditions below will complete if needed.
*/
MINOR: stream_interface: introduce a new "struct connection" type We start to move everything needed to manage a connection to a special entity "struct connection". We have the data layer operations and the control operations there. We'll also have more info in the future such as file descriptors and applet contexts, so that in the end it becomes detachable from the stream interface, which will allow connections to be reused between sessions. For now on, we start with minimal changes.
2012-05-21 10:31:45 -04:00
si_shutw(si);
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
break;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
else if (appctx->st0 == STAT_CLI_GETREQ) {
[OPTIM] stats: check free space before trying to print This alone makes a typical HTML stats dump consume 10% CPU less, because we avoid doing complex printf calls to drop them later. Only a few common cases have been checked, those which are very likely to run for nothing.
2009-10-11 17:35:10 -04:00
/* ensure we have some output room left in the event we
* would want to return some info right after parsing.
*/
CLEANUP: stream-int: add si_ib/si_ob to dereference the buffers This makes the code cleaner and is more intuitive to use.
2014-11-28 06:18:45 -05:00
if (buffer_almost_full(si_ib(si))) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[OPTIM] stats: check free space before trying to print This alone makes a typical HTML stats dump consume 10% CPU less, because we avoid doing complex printf calls to drop them later. Only a few common cases have been checked, those which are very likely to run for nothing.
2009-10-11 17:35:10 -04:00
break;
MAJOR: channel: add a new flag CF_WAKE_WRITE to notify the task of writes Since commit 6b66f3e ([MAJOR] implement autonomous inter-socket forwarding) introduced in 1.3.16-rc1, we've been relying on a stupid mechanism to wake up the task after a write, which was an exact copy-paste of the reader side. The principle was that if we empty a buffer and there's no forwarding scheduled or if the *producer* is not in a connected state, then we wake the task up. That does not make any sense. It happens to wake up too late sometimes (eg, when the request analyser waits for some room in the buffer to start to work), and leads to unneeded wakeups in client-side keep-alive, because the task is woken up when the response is sent, while the analysers are simply waiting for a new request. In order to fix this, we introduce a new channel flag : CF_WAKE_WRITE. It is designed so that an analyser can explicitly request being notified when some data were written. It is used only when the HTTP request or response analysers need to wait for more room in the buffers. It is automatically cleared upon wake up. The flag is also automatically set by the functions which try to write into a buffer from an applet when they fail (bi_putblk() etc...). That allows us to remove the stupid condition above and avoid some wakeups. In http-server-close and in http-keep-alive modes, this reduces from 4 to 3 the average number of wakeups per request, and increases the overall performance by about 1.5%.
2013-12-31 11:26:25 -05:00
}
[OPTIM] stats: check free space before trying to print This alone makes a typical HTML stats dump consume 10% CPU less, because we avoid doing complex printf calls to drop them later. Only a few common cases have been checked, those which are very likely to run for nothing.
2009-10-11 17:35:10 -04:00
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
reql = bo_getline(si_oc(si), trash.str, trash.size);
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
if (reql <= 0) { /* closed or EOL not found */
if (reql == 0)
break;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_END;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
continue;
}
MINOR: cli: allow the semi-colon to be escaped on the CLI Today I was working on an auto-update script for some ACLs, and found that I couldn't load ACL entries with a semi-colon in them no matter how I tried to escape it. As such, I wrote this patch (this one is for 1.7dev, but it applies to 1.5 the same with just line numbers changed), which seems to allow me to execute a command such as "add acl /etc/foo.lst foo\;bar" over the socket. It's worth noting that stats_sock_parse_request() already uses the backslash to escape spaces in words so it makes sense to use it as well to escape the semi-colon.
2016-05-26 16:42:25 -04:00
/* seek for a possible unescaped semi-colon. If we find
* one, we replace it with an LF and skip only this part.
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
*/
MINOR: cli: allow the semi-colon to be escaped on the CLI Today I was working on an auto-update script for some ACLs, and found that I couldn't load ACL entries with a semi-colon in them no matter how I tried to escape it. As such, I wrote this patch (this one is for 1.7dev, but it applies to 1.5 the same with just line numbers changed), which seems to allow me to execute a command such as "add acl /etc/foo.lst foo\;bar" over the socket. It's worth noting that stats_sock_parse_request() already uses the backslash to escape spaces in words so it makes sense to use it as well to escape the semi-colon.
2016-05-26 16:42:25 -04:00
for (len = 0; len < reql; len++) {
if (trash.str[len] == '\\') {
len++;
continue;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
if (trash.str[len] == ';') {
trash.str[len] = '\n';
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
reql = len + 1;
break;
}
MINOR: cli: allow the semi-colon to be escaped on the CLI Today I was working on an auto-update script for some ACLs, and found that I couldn't load ACL entries with a semi-colon in them no matter how I tried to escape it. As such, I wrote this patch (this one is for 1.7dev, but it applies to 1.5 the same with just line numbers changed), which seems to allow me to execute a command such as "add acl /etc/foo.lst foo\;bar" over the socket. It's worth noting that stats_sock_parse_request() already uses the backslash to escape spaces in words so it makes sense to use it as well to escape the semi-colon.
2016-05-26 16:42:25 -04:00
}
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
[MINOR] stats: strip CR and LF from the input command line commands sent from certain tools (eg: telnet) will be terminated by CRLF and not only LF. So we must suppress CR too.
2009-10-04 01:36:58 -04:00
/* now it is time to check that we have a full line,
* remove the trailing \n and possibly \r, then cut the
* line.
*/
len = reql - 1;
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
if (trash.str[len] != '\n') {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_END;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
continue;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
if (len && trash.str[len-1] == '\r')
[MINOR] stats: strip CR and LF from the input command line commands sent from certain tools (eg: telnet) will be terminated by CRLF and not only LF. So we must suppress CR too.
2009-10-04 01:36:58 -04:00
len--;
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
trash.str[len] = '\0';
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
if (len) {
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
if (strcmp(trash.str, "quit") == 0) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_END;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
continue;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
else if (strcmp(trash.str, "prompt") == 0)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st1 = !appctx->st1;
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
else if (strcmp(trash.str, "help") == 0 ||
!stats_sock_parse_request(si, trash.str)) {
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
cli_gen_usage_msg();
if (dynamic_usage_msg)
appctx->ctx.cli.msg = dynamic_usage_msg;
else
appctx->ctx.cli.msg = stats_sock_usage_msg;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[MINOR] stats: use a dedicated state to output static data It is a bit expensive and complex to use to call buffer_feed() directly from the request parser, and there are risks that some output messages are lost in case of buffer full. Since most of these messages are static, let's have a state dedicated to print these messages and store them in a specific area shared with the stats in the session. This both reduces code size and risks of losing output data.
2009-10-11 17:12:51 -04:00
}
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
/* NB: stats_sock_parse_request() may have put
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
* another STAT_CLI_O_* into appctx->st0.
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
*/
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
else if (!appctx->st1) {
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
/* if prompt is disabled, print help on empty lines,
* so that the user at least knows how to enable
* prompt and find help.
*/
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
cli_gen_usage_msg();
if (dynamic_usage_msg)
appctx->ctx.cli.msg = dynamic_usage_msg;
else
appctx->ctx.cli.msg = stats_sock_usage_msg;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PRINT;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
/* re-adjust req buffer */
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
bo_skip(si_oc(si), reql);
CLEANUP: channel: usr CF_/CHN_ prefixes instead of BF_/BUF_ Get rid of these confusing BF_* flags. Now channel naming should clearly be used everywhere appropriate. No code was changed, only a renaming was performed. The comments about channel operations was updated.
2012-08-27 17:14:58 -04:00
req->flags |= CF_READ_DONTWAIT; /* we plan to read small requests */
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
BUG/MINOR: stats: do not call cli_release_handler 3 times If an error happens during a dump on the CLI, an explicit call to cli_release_handler() is performed. This is not needed anymore since we introduced ->release() in the applet which is called upon error. Let's remove this confusing call which can even be risky in some situations.
2015-09-25 13:21:19 -04:00
else { /* output functions */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
switch (appctx->st0) {
BUG/MINOR: Handle interactive mode in cli handler A previous commit broke the interactive stats cli prompt. Specifically, it was not clear that we could be in STAT_CLI_PROMPT when we get to the output functions for the cli handler, and the switch statement did not handle this case. We would then fall through to the default statement, which was recently changed to set error flags on the socket. This in turn causes the socket to be closed, which is not what we wanted in this specific case. To fix, we add a case for STAT_CLI_PROMPT, and simply break out of the switch statement. Testing: - Connected to unix stats socket, issued 'prompt', observed that I could issue multiple consecutive commands. - Connected to unix stats socket, issued 'prompt', observed that socket timed out after inactivity expired. - Connected to unix stats socket, issued 'prompt' then 'set timeout cli 5', observed that socket timed out after 5 seconds expired. - Connected to unix stats socket, issued invalid commands, received usage output. - Connected to unix stats socket, issued 'show info', received info output and socket disconnected. - Connected to unix stats socket, issued 'show stat', received stats output and socket disconnected. - Repeated above tests with TCP stats socket. [wt: no backport needed, this was introduced during the applet rework in 1.6]
2015-10-02 11:08:10 -04:00
case STAT_CLI_PROMPT:
break;
[MINOR] stats: use a dedicated state to output static data It is a bit expensive and complex to use to call buffer_feed() directly from the request parser, and there are risks that some output messages are lost in case of buffer full. Since most of these messages are static, let's have a state dedicated to print these messages and store them in a specific area shared with the stats in the session. This both reduces code size and risks of losing output data.
2009-10-11 17:12:51 -04:00
case STAT_CLI_PRINT:
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putstr(si_ic(si), appctx->ctx.cli.msg) != -1)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
else
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
case STAT_CLI_PRINT_FREE:
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putstr(si_ic(si), appctx->ctx.cli.err) != -1) {
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
free(appctx->ctx.cli.err);
appctx->st0 = STAT_CLI_PROMPT;
}
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
else
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
break;
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
case STAT_CLI_O_BACKEND:
if (stats_dump_backend_to_buffer(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
case STAT_CLI_O_INFO:
REORG: stats: functions are now HTTP/CLI agnostic All the functions that were called "http" or "raw" have been cleaned up to support either only HTML and use that word in their name, or support both HTML and CSV and be usable both from the HTTP and the CLI entry points. stats_http_dump() now explicitly checks for HTML mode before adding HTML-specific headers/trailers, and has been renamed since it's now used by both entry points. Some more duplicated code could be removed. The patch looks big but it's mostly due to re-indents resulting from the moves or comments updates. The calling sequences now look like this : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_info_to_buffer() // "show info" -> stats_dump_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy_to_buffer() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() http_stats_io_handler() -> stats_dump_stat_to_buffer() // same as above, but used for CSV or HTML -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_html_head() // emits the HTML headers -> stats_dump_html_info() // emits the equivalent of "show info" at the top -> stats_dump_proxy_to_buffer() // same as above, valid for CSV and HTML -> stats_dump_html_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_html_px_end() -> stats_dump_html_end() // emits HTML trailer
2012-12-22 17:20:30 -05:00
if (stats_dump_info_to_buffer(si))
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
break;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
case STAT_CLI_O_SERVERS_STATE:
if (stats_dump_servers_state_to_buffer(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
case STAT_CLI_O_STAT:
REORG: stats: functions are now HTTP/CLI agnostic All the functions that were called "http" or "raw" have been cleaned up to support either only HTML and use that word in their name, or support both HTML and CSV and be usable both from the HTTP and the CLI entry points. stats_http_dump() now explicitly checks for HTML mode before adding HTML-specific headers/trailers, and has been renamed since it's now used by both entry points. Some more duplicated code could be removed. The patch looks big but it's mostly due to re-indents resulting from the moves or comments updates. The calling sequences now look like this : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_info_to_buffer() // "show info" -> stats_dump_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy_to_buffer() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() http_stats_io_handler() -> stats_dump_stat_to_buffer() // same as above, but used for CSV or HTML -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_html_head() // emits the HTML headers -> stats_dump_html_info() // emits the equivalent of "show info" at the top -> stats_dump_proxy_to_buffer() // same as above, valid for CSV and HTML -> stats_dump_html_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_html_px_end() -> stats_dump_html_end() // emits HTML trailer
2012-12-22 17:20:30 -05:00
if (stats_dump_stat_to_buffer(si, NULL))
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
case STAT_CLI_O_RESOLVERS:
if (stats_dump_resolvers_to_buffer(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
case STAT_CLI_O_SESS:
[CLEANUP] stats: make all dump functions only rely on the stream interface This will be needed to move the applet-specific data out of the session.
2011-02-13 09:27:22 -05:00
if (stats_dump_sess_to_buffer(si))
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
case STAT_CLI_O_ERR: /* errors dump */
[CLEANUP] stats: make all dump functions only rely on the stream interface This will be needed to move the applet-specific data out of the session.
2011-02-13 09:27:22 -05:00
if (stats_dump_errors_to_buffer(si))
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_PROMPT;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
case STAT_CLI_O_TAB:
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
case STAT_CLI_O_CLR:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (stats_table_request(si, appctx->st0))
appctx->st0 = STAT_CLI_PROMPT;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
case STAT_CLI_O_PATS:
if (stats_pats_list(si))
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PROMPT;
break;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
case STAT_CLI_O_PAT:
if (stats_pat_list(si))
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st0 = STAT_CLI_PROMPT;
break;
case STAT_CLI_O_MLOOK:
if (stats_map_lookup(si))
appctx->st0 = STAT_CLI_PROMPT;
BUG/MINOR: cli: fix missing break in command line parser Yesterday's commit 12833bb ("MINOR: cli: add the new "show pools" command") missed a "break" statement causing trouble to the "show map" command. Spotted by Thierry Fournier.
2014-01-29 06:13:39 -05:00
break;
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
case STAT_CLI_O_POOLS:
if (stats_dump_pools_to_buffer(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
case STAT_CLI_O_TLSK:
if (stats_tlskeys_list(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
case STAT_CLI_O_TLSK_ENT:
if (stats_tlskeys_list(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#endif
MINOR: cli: add a new "show env" command Using environment variables in configuration files can make troubleshooting complicated because there's no easy way to verify that the variables are correct. This patch introduces a new "show env" command which displays the whole environment on the CLI, one variable per line. The socket must at least have level operator to display the environment.
2016-02-16 05:27:28 -05:00
case STAT_CLI_O_ENV: /* environment dump */
if (stats_dump_env_to_buffer(si))
appctx->st0 = STAT_CLI_PROMPT;
break;
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
case STAT_CLI_O_CUSTOM: /* use custom pointer */
if (appctx->io_handler)
MINOR: cli: add private pointer and release function This pointer will be used for storing private context. With this, the same executed function can handle more than one keyword. This will be very useful for creation Lua cli bindings. The release function is called when the command is terminated (give back the hand to the prompt) or when the session is broken (timeout or client closed).
2016-11-12 04:51:33 -05:00
if (appctx->io_handler(appctx)) {
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
appctx->st0 = STAT_CLI_PROMPT;
MINOR: cli: add private pointer and release function This pointer will be used for storing private context. With this, the same executed function can handle more than one keyword. This will be very useful for creation Lua cli bindings. The release function is called when the command is terminated (give back the hand to the prompt) or when the session is broken (timeout or client closed).
2016-11-12 04:51:33 -05:00
if (appctx->io_release) {
appctx->io_release(appctx);
appctx->io_release = NULL;
}
}
MEDIUM: cli: register CLI keywords with cli_register_kw() To register a new cli keyword, you need to declare a cli_kw_list structure in your source file: static struct cli_kw_list cli_kws = {{ },{ { { "test", "list", NULL }, "test list : do some tests on the cli", test_parsing, NULL }, { { NULL }, NULL, NULL, NULL, NULL } }}; And then register it: cli_register_kw(&cli_kws); The first field is an array of 5 elements, where you declare the keywords combination which will match, it must be ended by a NULL element. The second field is used as a usage message, it will appear in the help of the cli, you can set it to NULL if you don't want to show it, it's a good idea if you want to overwrite some existing keywords. The two last fields are callbacks. The first one is used at parsing time, you can use it to parse the arguments of your keywords and print small messages. The function must return 1 in case of a failure, otherwise 0: #include <proto/dumpstats.h> static int test_parsing(char **args, struct appctx *appctx) { struct chunk out; if (!*args[2]) { appctx->ctx.cli.msg = "Error: the 3rd argument is mandatory !"; appctx->st0 = STAT_CLI_PRINT; return 1; } chunk_reset(&trash); chunk_printf(&trash, "arg[3]: %s\n", args[2]); chunk_init(&out, NULL, 0); chunk_dup(&out, &trash); appctx->ctx.cli.err = out.str; appctx->st0 = STAT_CLI_PRINT_FREE; /* print and free in the default cli_io_handler */ return 0; } The last field is the IO handler callback, it can be set to NULL if you want to use the default cli_io_handler() otherwise you can write your own. You can use the private pointer in the appctx if you need to store a context or some data. stats_dump_sess_to_buffer() is a good example of IO handler, IO handlers often use the appctx->st2 variable for the state machine. The handler must return 0 in case it have to be recall later otherwise 1.
2016-10-13 11:57:55 -04:00
break;
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
default: /* abnormal state */
MINOR: cli: do not call the release handler on internal error. It's dangerous to call this on internal state error, because it risks to perform a double-free. This can only happen when a state is not handled. Note that the switch/case currently doesn't offer any option for missed states since they're all declared. Better fix this anyway. The fix was tested by commenting out some entries in the switch/case.
2015-09-25 14:08:51 -04:00
si->flags |= SI_FL_ERR;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
}
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
/* The post-command prompt is either LF alone or LF + '> ' in interactive mode */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st0 == STAT_CLI_PROMPT) {
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putstr(si_ic(si), appctx->st1 ? "\n> " : "\n") != -1)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_GETREQ;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
else
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
/* If the output functions are still there, it means they require more room. */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st0 >= STAT_CLI_OUTPUT)
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
break;
/* Now we close the output if one of the writers did so,
* or if we're not in interactive mode and the request
* buffer is empty. This still allows pipelined requests
* to be sent in non-interactive mode.
*/
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if ((res->flags & (CF_SHUTW|CF_SHUTW_NOW)) || (!appctx->st1 && !req->buf->o)) {
appctx->st0 = STAT_CLI_END;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
continue;
}
[MEDIUM] stats: don't use s->ana_state anymore The stats handler used to store internal states in s->ana_state. Now we only rely on si->st0 in which we can store as many states as we have possible outputs. This cleans up the stats code a lot and makes it more maintainable. It has also reduced code size by a few hundred bytes.
2009-10-04 08:22:18 -04:00
/* switch state back to GETREQ to read next requests */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st0 = STAT_CLI_GETREQ;
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
BUG/MEDIUM: cli: properly handle closed output Due to the code inherited from the early CLI mode with the non-interactive code, the SHUTR status was only considered while waiting for a request, which prevents the connection from properly being closed during a dump, and the connection used to remain established. This issue didn't happen in 1.5 because while this part was missed, the resynchronization performed in process_session() would detect the situation and handle the cleanup. No backport is needed.
2015-09-25 14:06:08 -04:00
if ((res->flags & CF_SHUTR) && (si->state == SI_ST_EST)) {
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
DPRINTF(stderr, "%s@%d: si to buf closed. req=%08x, res=%08x, st=%d\n",
__FUNCTION__, __LINE__, req->flags, res->flags, si->state);
CLEANUP: Fix some minor typos
2012-04-02 21:57:54 -04:00
/* Other side has closed, let's abort if we have no more processing to do
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
* and nothing more to consume. This is comparable to a broken pipe, so
* we forward the close to the request side so that it flows upstream to
* the client.
*/
MINOR: stream_interface: introduce a new "struct connection" type We start to move everything needed to manage a connection to a special entity "struct connection". We have the data layer operations and the control operations there. We'll also have more info in the future such as file descriptors and applet contexts, so that in the end it becomes detachable from the stream interface, which will allow connections to be reused between sessions. For now on, we start with minimal changes.
2012-05-21 10:31:45 -04:00
si_shutw(si);
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if ((req->flags & CF_SHUTW) && (si->state == SI_ST_EST) && (appctx->st0 < STAT_CLI_OUTPUT)) {
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
DPRINTF(stderr, "%s@%d: buf to si closed. req=%08x, res=%08x, st=%d\n",
__FUNCTION__, __LINE__, req->flags, res->flags, si->state);
/* We have no more processing to do, and nothing more to send, and
* the client side has closed. So we'll forward this state downstream
* on the response buffer.
*/
MINOR: stream_interface: introduce a new "struct connection" type We start to move everything needed to manage a connection to a special entity "struct connection". We have the data layer operations and the control operations there. We'll also have more info in the future such as file descriptors and applet contexts, so that in the end it becomes detachable from the stream interface, which will allow connections to be reused between sessions. For now on, we start with minimal changes.
2012-05-21 10:31:45 -04:00
si_shutr(si);
CLEANUP: channel: usr CF_/CHN_ prefixes instead of BF_/BUF_ Get rid of these confusing BF_* flags. Now channel naming should clearly be used everywhere appropriate. No code was changed, only a renaming was performed. The comments about channel operations was updated.
2012-08-27 17:14:58 -04:00
res->flags |= CF_READ_NULL;
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
}
MAJOR: applet: now call si_applet_done() instead of si_update() in I/O handlers The applet I/O handlers now rely on si_applet_done() which itself decides to wake up or sleep the appctx. Now it becomes critical that applte handlers properly call this on every exit path so that the appctx is removed from the active list after I/O have been handled. One such call was added to the Lua socket handler. It used to work without it probably because the main task is woken up by the parent task but now it's needed.
2015-04-19 11:20:03 -04:00
out:
MAJOR: buffer: replace buf->l with buf->{o+i} We don't have buf->l anymore. We have buf->i for pending data and the total length is retrieved by adding buf->o. Some computation already become simpler. Despite extreme care, bugs are not excluded. It's worth noting that msg->err_pos as set by HTTP request/response analysers becomes relative to pending data and not to the beginning of the buffer. This has not been completed yet so differences might occur when outgoing data are left in the buffer.
2012-03-01 12:19:58 -05:00
DPRINTF(stderr, "%s@%d: st=%d, rqf=%x, rpf=%x, rqh=%d, rqs=%d, rh=%d, rs=%d\n",
[MEDIUM] stats: replace the stats socket analyser with an SI applet We can get rid of the stats analyser by moving all the stats code to a stream interface applet. Above being cleaner, it provides new advantages such as the ability to process requests and responses from the same function and work only with simple state machines. There's no need for any hijack hack anymore. The direct advantage for the user are the interactive mode and the ability to chain several commands delimited by a semi-colon. Now if the user types "prompt", he gets a prompt from which he can send as many requests as he wants. All outputs are terminated by a blank line followed by a new prompt, so this can be used from external tools too. The code is not very clean, it needs some rework, but some part of the dirty parts are due to the remnants of the hijack mode used in the old functions we call. The old AN_REQ_STATS_SOCK analyser flag is now unused and has been removed.
2009-09-22 13:31:03 -04:00
__FUNCTION__, __LINE__,
MAJOR: channel: replace the struct buffer with a pointer to a buffer With this commit, we now separate the channel from the buffer. This will allow us to replace buffers on the fly without touching the channel. Since nobody is supposed to keep a reference to a buffer anymore, doing so is not a problem and will also permit some copy-less data manipulation. Interestingly, these changes have shown a 2% performance increase on some workloads, probably due to a better cache placement of data.
2012-10-12 17:49:43 -04:00
si->state, req->flags, res->flags, req->buf->i, req->buf->o, res->buf->i, res->buf->o);
[CLEANUP] move remaining stats sockets code to dumpstats The remains of the stats socket code has nothing to do in proto_uxst anymore and must move to dumpstats. The code is much cleaner and more structured. It was also an opportunity to rename AN_REQ_UNIX_STATS as AN_REQ_STATS_SOCK as the stats socket is no longer unix-specific either. The last item refering to stats in proto_uxst is the setting of the task's nice value which should in fact come from the listener.
2009-08-16 13:06:42 -04:00
}
MINOR: stats: add stats_dump_info_fields() to dump one field per line This function dumps non-empty fields, one per line with their name and values, in the same format as is currently used by "show info". It relies on previously added stats_emit_raw_data_field().
2016-01-11 12:27:29 -05:00
/* Dump all fields from <info> into <out> using the "show info" format (name: value) */
static int stats_dump_info_fields(struct chunk *out, const struct field *info)
{
int field;
for (field = 0; field < INF_TOTAL_FIELDS; field++) {
if (!field_format(info, field))
continue;
if (!chunk_appendf(out, "%s: ", info_field_names[field]))
return 0;
if (!stats_emit_raw_data_field(out, &info[field]))
return 0;
if (!chunk_strcat(out, "\n"))
return 0;
}
return 1;
}
MEDIUM: stats: support "show info typed" on the CLI This emits the field positions, names and types. It is more convenient than the default output for a parser that doesn't know all the fields. It simply relies on stats_emit_typed_data_field() and stats_emit_field_tags() added by previous patch for the output. A new stats format flag was added, STAT_FMT_TYPED, which is set when the "typed" keyword is specified on the CLI.
2016-01-11 14:08:42 -05:00
/* Dump all fields from <info> into <out> using the "show info typed" format */
static int stats_dump_typed_info_fields(struct chunk *out, const struct field *info)
{
int field;
for (field = 0; field < INF_TOTAL_FIELDS; field++) {
if (!field_format(info, field))
continue;
if (!chunk_appendf(out, "%d.%s.%u:", field, info_field_names[field], info[INF_PROCESS_NUM].u.u32))
return 0;
if (!stats_emit_field_tags(out, &info[field], ':'))
return 0;
if (!stats_emit_typed_data_field(out, &info[field]))
return 0;
if (!chunk_strcat(out, "\n"))
return 0;
}
return 1;
}
MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts This patch splits the function stats_dump_info_to_buffer() in two parts. The extracted part is called stats_fill_info(), and just fill the stats buffer. This split allows the usage of preformated stats in other parts of HAProxy like the Lua.
2016-03-25 03:19:23 -04:00
/* Fill <info> with HAProxy global info. <info> is preallocated
* array of length <len>. The length of the aray must be
* INF_TOTAL_FIELDS. If this length is less then this value, the
* function returns 0, otherwise, it returns 1.
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
*/
MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts This patch splits the function stats_dump_info_to_buffer() in two parts. The extracted part is called stats_fill_info(), and just fill the stats buffer. This split allows the usage of preformated stats in other parts of HAProxy like the Lua.
2016-03-25 03:19:23 -04:00
int stats_fill_info(struct field *info, int len)
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
{
unsigned int up = (now.tv_sec - start_date.tv_sec);
MEDIUM: stats: fill all the show info elements prior to displaying them The table is completely filled with all relevant information. Only the fields that should appear are presented. The description field is now properly omitted if not set, instead of being reported as empty.
2016-01-11 12:17:07 -05:00
struct chunk *out = get_trash_chunk();
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
MINOR: stats: report SSL key computations per second It's commonly needed to know how many SSL asymmetric keys are computed per second on either side (frontend or backend), and to know the SSL session reuse ratio. Now we compute these values and report them in "show info".
2014-05-28 06:28:58 -04:00
#ifdef USE_OPENSSL
int ssl_sess_rate = read_freq_ctr(&global.ssl_per_sec);
int ssl_key_rate = read_freq_ctr(&global.ssl_fe_keys_per_sec);
int ssl_reuse = 0;
if (ssl_key_rate < ssl_sess_rate) {
/* count the ssl reuse ratio and avoid overflows in both directions */
ssl_reuse = 100 - (100 * ssl_key_rate + (ssl_sess_rate - 1) / 2) / ssl_sess_rate;
}
#endif
MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts This patch splits the function stats_dump_info_to_buffer() in two parts. The extracted part is called stats_fill_info(), and just fill the stats buffer. This split allows the usage of preformated stats in other parts of HAProxy like the Lua.
2016-03-25 03:19:23 -04:00
if (len < INF_TOTAL_FIELDS)
return 0;
MEDIUM: stats: fill all the show info elements prior to displaying them The table is completely filled with all relevant information. Only the fields that should appear are presented. The description field is now properly omitted if not set, instead of being reported as empty.
2016-01-11 12:17:07 -05:00
chunk_reset(out);
MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts This patch splits the function stats_dump_info_to_buffer() in two parts. The extracted part is called stats_fill_info(), and just fill the stats buffer. This split allows the usage of preformated stats in other parts of HAProxy like the Lua.
2016-03-25 03:19:23 -04:00
memset(info, 0, sizeof(*info) * len);
MEDIUM: stats: fill all the show info elements prior to displaying them The table is completely filled with all relevant information. Only the fields that should appear are presented. The description field is now properly omitted if not set, instead of being reported as empty.
2016-01-11 12:17:07 -05:00
info[INF_NAME] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, PRODUCT_NAME);
info[INF_VERSION] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, HAPROXY_VERSION);
info[INF_RELEASE_DATE] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, HAPROXY_DATE);
info[INF_NBPROC] = mkf_u32(FO_CONFIG|FS_SERVICE, global.nbproc);
info[INF_PROCESS_NUM] = mkf_u32(FO_KEY, relative_pid);
info[INF_PID] = mkf_u32(FO_STATUS, pid);
info[INF_UPTIME] = mkf_str(FN_DURATION, chunk_newstr(out));
chunk_appendf(out, "%ud %uh%02um%02us", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
info[INF_UPTIME_SEC] = mkf_u32(FN_DURATION, up);
info[INF_MEMMAX_MB] = mkf_u32(FO_CONFIG|FN_LIMIT, global.rlimit_memmax);
info[INF_POOL_ALLOC_MB] = mkf_u32(0, (unsigned)(pool_total_allocated() / 1048576L));
info[INF_POOL_USED_MB] = mkf_u32(0, (unsigned)(pool_total_used() / 1048576L));
info[INF_POOL_FAILED] = mkf_u32(FN_COUNTER, pool_total_failures());
info[INF_ULIMIT_N] = mkf_u32(FO_CONFIG|FN_LIMIT, global.rlimit_nofile);
info[INF_MAXSOCK] = mkf_u32(FO_CONFIG|FN_LIMIT, global.maxsock);
info[INF_MAXCONN] = mkf_u32(FO_CONFIG|FN_LIMIT, global.maxconn);
info[INF_HARD_MAXCONN] = mkf_u32(FO_CONFIG|FN_LIMIT, global.hardmaxconn);
info[INF_CURR_CONN] = mkf_u32(0, actconn);
info[INF_CUM_CONN] = mkf_u32(FN_COUNTER, totalconn);
info[INF_CUM_REQ] = mkf_u32(FN_COUNTER, global.req_count);
#ifdef USE_OPENSSL
info[INF_MAX_SSL_CONNS] = mkf_u32(FN_MAX, global.maxsslconn);
info[INF_CURR_SSL_CONNS] = mkf_u32(0, sslconns);
info[INF_CUM_SSL_CONNS] = mkf_u32(FN_COUNTER, totalsslconns);
#endif
info[INF_MAXPIPES] = mkf_u32(FO_CONFIG|FN_LIMIT, global.maxpipes);
info[INF_PIPES_USED] = mkf_u32(0, pipes_used);
info[INF_PIPES_FREE] = mkf_u32(0, pipes_free);
info[INF_CONN_RATE] = mkf_u32(FN_RATE, read_freq_ctr(&global.conn_per_sec));
info[INF_CONN_RATE_LIMIT] = mkf_u32(FO_CONFIG|FN_LIMIT, global.cps_lim);
info[INF_MAX_CONN_RATE] = mkf_u32(FN_MAX, global.cps_max);
info[INF_SESS_RATE] = mkf_u32(FN_RATE, read_freq_ctr(&global.sess_per_sec));
info[INF_SESS_RATE_LIMIT] = mkf_u32(FO_CONFIG|FN_LIMIT, global.sps_lim);
info[INF_MAX_SESS_RATE] = mkf_u32(FN_RATE, global.sps_max);
#ifdef USE_OPENSSL
info[INF_SSL_RATE] = mkf_u32(FN_RATE, ssl_sess_rate);
info[INF_SSL_RATE_LIMIT] = mkf_u32(FO_CONFIG|FN_LIMIT, global.ssl_lim);
info[INF_MAX_SSL_RATE] = mkf_u32(FN_MAX, global.ssl_max);
info[INF_SSL_FRONTEND_KEY_RATE] = mkf_u32(0, ssl_key_rate);
info[INF_SSL_FRONTEND_MAX_KEY_RATE] = mkf_u32(FN_MAX, global.ssl_fe_keys_max);
info[INF_SSL_FRONTEND_SESSION_REUSE_PCT] = mkf_u32(0, ssl_reuse);
info[INF_SSL_BACKEND_KEY_RATE] = mkf_u32(FN_RATE, read_freq_ctr(&global.ssl_be_keys_per_sec));
info[INF_SSL_BACKEND_MAX_KEY_RATE] = mkf_u32(FN_MAX, global.ssl_be_keys_max);
info[INF_SSL_CACHE_LOOKUPS] = mkf_u32(FN_COUNTER, global.shctx_lookups);
info[INF_SSL_CACHE_MISSES] = mkf_u32(FN_COUNTER, global.shctx_misses);
#endif
info[INF_COMPRESS_BPS_IN] = mkf_u32(FN_RATE, read_freq_ctr(&global.comp_bps_in));
info[INF_COMPRESS_BPS_OUT] = mkf_u32(FN_RATE, read_freq_ctr(&global.comp_bps_out));
info[INF_COMPRESS_BPS_RATE_LIM] = mkf_u32(FO_CONFIG|FN_LIMIT, global.comp_rate_lim);
#ifdef USE_ZLIB
info[INF_ZLIB_MEM_USAGE] = mkf_u32(0, zlib_used_memory);
info[INF_MAX_ZLIB_MEM_USAGE] = mkf_u32(FO_CONFIG|FN_LIMIT, global.maxzlibmem);
#endif
info[INF_TASKS] = mkf_u32(0, nb_tasks_cur);
info[INF_RUN_QUEUE] = mkf_u32(0, run_queue_cur);
info[INF_IDLE_PCT] = mkf_u32(FN_AVG, idle_pct);
info[INF_NODE] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.node);
if (global.desc)
info[INF_DESCRIPTION] = mkf_str(FO_CONFIG|FN_OUTPUT|FS_SERVICE, global.desc);
MINOR: dumpstats: split stats_dump_info_to_buffer() in two parts This patch splits the function stats_dump_info_to_buffer() in two parts. The extracted part is called stats_fill_info(), and just fill the stats buffer. This split allows the usage of preformated stats in other parts of HAProxy like the Lua.
2016-03-25 03:19:23 -04:00
return 1;
}
/* This function dumps information onto the stream interface's read buffer.
* It returns 0 as long as it does not complete, non-zero upon completion.
* No state is used.
*/
static int stats_dump_info_to_buffer(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);
if (!stats_fill_info(info, INF_TOTAL_FIELDS))
return 0;
MEDIUM: stats: make use of stats_dump_info_fields() for "show info" Now we can get rid of the huge chunk_printf() and use this new function instead.
2016-01-11 12:29:04 -05:00
chunk_reset(&trash);
MEDIUM: stats: support "show info typed" on the CLI This emits the field positions, names and types. It is more convenient than the default output for a parser that doesn't know all the fields. It simply relies on stats_emit_typed_data_field() and stats_emit_field_tags() added by previous patch for the output. A new stats format flag was added, STAT_FMT_TYPED, which is set when the "typed" keyword is specified on the CLI.
2016-01-11 14:08:42 -05:00
if (appctx->ctx.stats.flags & STAT_FMT_TYPED)
stats_dump_typed_info_fields(&trash, info);
else
stats_dump_info_fields(&trash, info);
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
return 1;
}
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
/* dumps server state information into <buf> for all the servers found in <backend>
* These information are all the parameters which may change during HAProxy runtime.
* By default, we only export to the last known server state file format.
* These information can be used at next startup to recover same level of server state.
*/
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
static int dump_servers_state(struct stream_interface *si, struct chunk *buf)
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
{
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
struct appctx *appctx = __objt_appctx(si->end);
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
struct server *srv;
char srv_addr[INET6_ADDRSTRLEN + 1];
time_t srv_time_since_last_change;
int bk_f_forced_id, srv_f_forced_id;
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
/* we don't want to report any state if the backend is not enabled on this process */
if (appctx->ctx.server_state.px->bind_proc && !(appctx->ctx.server_state.px->bind_proc & (1UL << (relative_pid - 1))))
return 1;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
BUG/MEDIUM: stats: show servers state may show an servers from another backend Olivier Doucet reported that "show servers state" was producing an invalid output with some configurations where nbproc > 1. Indeed, commit 76a99784f4 fixed some issues but unfortunately introduced a regression when a backend bound to the same process as the stats socket and a previous backend is bound to another one. For example : global daemon nbproc 2 stats socket /var/run/haproxy-1.sock process 1 stats socket /var/run/haproxy-2.sock process 2 listen proc1 bind 127.0.0.1:9001 bind-process 1 server WRONG 127.0.0.1:80 listen proc2 bind 127.0.0.1:9002 bind-process 2 server RIGHT 127.0.0.1:80 Requesting "show servers state" on /var/run/haproxy-2.sock was producing a line like : 3 proc2 1 WRONG 127.0.0.1 2 0 1 1 4 1 0 2 0 0 0 0 whereas the line below was awaited : 3 proc2 1 RIGHT 127.0.0.1 2 0 1 1 5 1 0 2 0 0 0 0 This was caused by the initialization of the server loop too early, before the bind_proc filtering whereas it should be done after. This fix should be backported to 1.6, where the regression has unfortunately been backported.
2016-05-26 18:06:45 -04:00
if (!appctx->ctx.server_state.sv)
appctx->ctx.server_state.sv = appctx->ctx.server_state.px->srv;
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
for (; appctx->ctx.server_state.sv != NULL; appctx->ctx.server_state.sv = srv->next) {
srv = appctx->ctx.server_state.sv;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
srv_addr[0] = '\0';
switch (srv->addr.ss_family) {
case AF_INET:
inet_ntop(srv->addr.ss_family, &((struct sockaddr_in *)&srv->addr)->sin_addr,
srv_addr, INET_ADDRSTRLEN + 1);
break;
case AF_INET6:
inet_ntop(srv->addr.ss_family, &((struct sockaddr_in6 *)&srv->addr)->sin6_addr,
srv_addr, INET6_ADDRSTRLEN + 1);
break;
}
srv_time_since_last_change = now.tv_sec - srv->last_change;
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
bk_f_forced_id = appctx->ctx.server_state.px->options & PR_O_FORCED_ID ? 1 : 0;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
srv_f_forced_id = srv->flags & SRV_F_FORCED_ID ? 1 : 0;
chunk_appendf(buf,
"%d %s "
"%d %s %s "
"%d %d %d %d %ld "
"%d %d %d %d %d "
"%d %d"
"\n",
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
appctx->ctx.server_state.px->uuid, appctx->ctx.server_state.px->id,
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
srv->puid, srv->id, srv_addr,
BUILD: dumpstats: silencing warning for printf format specifier / time_t time_t is not necesseraly a long int (spotted in OpenBSD), so just an explicit cast to avoid the compiler warning. should be safe enough.
2015-11-18 01:10:22 -05:00
srv->state, srv->admin, srv->uweight, srv->iweight, (long int)srv_time_since_last_change,
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
srv->check.status, srv->check.result, srv->check.health, srv->check.state, srv->agent.state,
bk_f_forced_id, srv_f_forced_id);
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
return 1;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
/* Parses backend list and simply report backend names */
static int stats_dump_backend_to_buffer(struct stream_interface *si)
{
BUG/MEDIUM: stats: show backend may show an empty or incomplete result This is the same issue as "show servers state", where the result is incorrect it the data can't fit in one buffer. The similar fix is applied, to restart the data processing where it stopped as buffers are sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:49 -04:00
struct appctx *appctx = __objt_appctx(si->end);
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
extern struct proxy *proxy;
struct proxy *curproxy;
chunk_reset(&trash);
BUG/MEDIUM: stats: show backend may show an empty or incomplete result This is the same issue as "show servers state", where the result is incorrect it the data can't fit in one buffer. The similar fix is applied, to restart the data processing where it stopped as buffers are sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:49 -04:00
if (!appctx->ctx.be.px) {
chunk_printf(&trash, "# name\n");
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
appctx->ctx.be.px = proxy;
}
for (; appctx->ctx.be.px != NULL; appctx->ctx.be.px = curproxy->next) {
curproxy = appctx->ctx.be.px;
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
/* looking for backends only */
if (!(curproxy->cap & PR_CAP_BE))
continue;
/* we don't want to list a backend which is bound to this process */
if (curproxy->bind_proc && !(curproxy->bind_proc & (1UL << (relative_pid - 1))))
continue;
chunk_appendf(&trash, "%s\n", curproxy->id);
BUG/MEDIUM: stats: show backend may show an empty or incomplete result This is the same issue as "show servers state", where the result is incorrect it the data can't fit in one buffer. The similar fix is applied, to restart the data processing where it stopped as buffers are sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:49 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
MINOR: cli: new stats socket command: show backend new stats socket command which displays only the list of backends available in the current process. For now only the backend name is displayed.
2015-09-18 08:49:12 -04:00
}
return 1;
}
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
/* Parses backend list or simply use backend name provided by the user to return
* states of servers to stdout.
*/
static int stats_dump_servers_state_to_buffer(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);
extern struct proxy *proxy;
struct proxy *curproxy;
chunk_reset(&trash);
BUG/MINOR: srv-state: fix incorrect output of state file Eric Webster reported that the state file wouldn't reload in 1.6.5 while it used to work in 1.6.4. The issue is that headers are now missing from the output when a specific backend is dumped since commit 4c1544d ("BUG/MEDIUM: stats: show servers state may show an empty or incomplete result"). This patch fixes this by introducing a dump state. It must be backported to 1.6.
2016-06-22 08:51:40 -04:00
if (appctx->st2 == STAT_ST_INIT) {
if (!appctx->ctx.server_state.px)
appctx->ctx.server_state.px = proxy;
appctx->st2 = STAT_ST_HEAD;
}
if (appctx->st2 == STAT_ST_HEAD) {
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
chunk_printf(&trash, "%d\n# %s\n", SRV_STATE_FILE_VERSION, SRV_STATE_FILE_FIELD_NAMES);
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
BUG/MINOR: srv-state: fix incorrect output of state file Eric Webster reported that the state file wouldn't reload in 1.6.5 while it used to work in 1.6.4. The issue is that headers are now missing from the output when a specific backend is dumped since commit 4c1544d ("BUG/MEDIUM: stats: show servers state may show an empty or incomplete result"). This patch fixes this by introducing a dump state. It must be backported to 1.6.
2016-06-22 08:51:40 -04:00
appctx->st2 = STAT_ST_INFO;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
BUG/MINOR: srv-state: fix incorrect output of state file Eric Webster reported that the state file wouldn't reload in 1.6.5 while it used to work in 1.6.4. The issue is that headers are now missing from the output when a specific backend is dumped since commit 4c1544d ("BUG/MEDIUM: stats: show servers state may show an empty or incomplete result"). This patch fixes this by introducing a dump state. It must be backported to 1.6.
2016-06-22 08:51:40 -04:00
/* STAT_ST_INFO */
BUG/MEDIUM: stats: show servers state may show an empty or incomplete result It was reported that the unix socket command "show servers state" returned an empty response while "show servers state <backend>" worked. In fact, both cases can reproduce the issue. It happens when the response can't fit in one buffer. The fix consists in processing the response in several steps, as it is done in some others commands, by restarting where it was stopped after the buffer is sent to the client. This fix should be backported to haproxy 1.6
2016-05-06 06:18:48 -04:00
for (; appctx->ctx.server_state.px != NULL; appctx->ctx.server_state.px = curproxy->next) {
curproxy = appctx->ctx.server_state.px;
/* servers are only in backends */
if (curproxy->cap & PR_CAP_BE) {
if (!dump_servers_state(si, &trash))
return 0;
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
}
/* only the selected proxy is dumped */
if (appctx->ctx.server_state.iid)
break;
MINOR: cli: new stats socket command: show servers state new command 'show servers state' which dumps all variable parameters of a server during an HAProxy process life. Purpose is to dump current server state at current run time in order to read them right after the reload. The format of the output is versionned and we support version 1 for now.
2015-07-03 02:01:20 -04:00
}
return 1;
}
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
/* This function dumps memory usage information onto the stream interface's
* read buffer. It returns 0 as long as it does not complete, non-zero upon
* completion. No state is used.
*/
static int stats_dump_pools_to_buffer(struct stream_interface *si)
{
dump_pools_to_trash();
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
MINOR: cli: add the new "show pools" command show pools Dump the status of internal memory pools. This is useful to track memory usage when suspecting a memory leak for example. It does exactly the same as the SIGQUIT when running in foreground except that it does not flush the pools.
2014-01-28 10:49:56 -05:00
return 1;
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static inline const char *get_conn_ctrl_name(const struct connection *conn)
MINOR: stats: create stats fields storage and CSV dump function The new function stats_dump_fields_csv() currenty walks over all CSV fields and prints all non-empty ones as one line. Strings are csv-encoded on the fly.
2016-01-04 13:04:18 -05:00
{
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (!conn_ctrl_ready(conn))
return "NONE";
return conn->ctrl->name;
MINOR: stats: create stats fields storage and CSV dump function The new function stats_dump_fields_csv() currenty walks over all CSV fields and prints all non-empty ones as one line. Strings are csv-encoded on the fly.
2016-01-04 13:04:18 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static inline const char *get_conn_xprt_name(const struct connection *conn)
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
{
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static char ptr[19];
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (!conn_xprt_ready(conn))
return "NONE";
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (conn->xprt == &raw_sock)
return "RAW";
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
#ifdef USE_OPENSSL
if (conn->xprt == &ssl_sock)
return "SSL";
#endif
snprintf(ptr, sizeof(ptr), "%p", conn->xprt);
return ptr;
MEDIUM: stats: implement a typed output format for stats The output for each field is : field:<origin><nature><scope>:type:value where field reminds the type of the object being dumped as well as its position (pid, iid, sid), field number and field name. This way a monitoring utility may very well report all available information without knowing new fields in advance. This format is also supported in the HTTP version of the stats by adding ";typed" after the URI, instead of ";csv" for the CSV format. The doc was not updated yet.
2016-01-11 12:57:53 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static inline const char *get_conn_data_name(const struct connection *conn)
[MEDIUM] enable/disable servers from the stats web interface Based on a patch provided by Judd Montgomery, it is now possible to enable/disable servers from the stats web interface. This allows to select several servers in a backend and apply the action to them at the same time. Currently, there are 2 known limitations : - The POST data are limited to one packet (don't alter too many servers at a time). - Expect: 100-continue is not supported. (cherry picked from commit 7693948766cb5647ac03b48e782cfee2b1f14491)
2010-10-11 18:14:35 -04:00
{
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
static char ptr[19];
[MEDIUM] enable/disable servers from the stats web interface Based on a patch provided by Judd Montgomery, it is now possible to enable/disable servers from the stats web interface. This allows to select several servers in a backend and apply the action to them at the same time. Currently, there are 2 known limitations : - The POST data are limited to one packet (don't alter too many servers at a time). - Expect: 100-continue is not supported. (cherry picked from commit 7693948766cb5647ac03b48e782cfee2b1f14491)
2010-10-11 18:14:35 -04:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (!conn->data)
return "NONE";
REORG: stats: massive code reorg and cleanup The dumpstats code looks like a spaghetti plate. Several functions are supposed to be able to do several things but rely on complex states to dispatch the work to independant functions. Most of the HTML output is performed within the switch/case statements of the whole state machine. Let's clean this up by adding new functions to emit the data and have a few more iterators to avoid relying on so complex states. The new stats dump sequence looks like this for CLI and for HTTP : cli_io_handler() -> stats_dump_sess_to_buffer() // "show sess" -> stats_dump_errors_to_buffer() // "show errors" -> stats_dump_raw_info_to_buffer() // "show info" -> stats_dump_raw_info() -> stats_dump_raw_stat_to_buffer() // "show stat" -> stats_dump_csv_header() -> stats_dump_proxy() -> stats_dump_px_hdr() -> stats_dump_fe_stats() -> stats_dump_li_stats() -> stats_dump_sv_stats() -> stats_dump_be_stats() -> stats_dump_px_end() http_stats_io_handler() -> stats_http_redir() -> stats_dump_http() // also emits the HTTP headers -> stats_dump_html_head() // emits the HTML headers -> stats_dump_csv_header() // emits the CSV headers (same as above) -> stats_dump_http_info() // note: ignores non-HTML output -> stats_dump_proxy() // same as above -> stats_dump_http_end() // emits HTML trailer
2012-12-22 14:31:10 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (conn->data == &sess_conn_cb)
return "SESS";
REORG: stats: dump the socket stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:20:51 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (conn->data == &si_conn_cb)
return "STRM";
REORG: stats: dump the socket stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:20:51 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (conn->data == &check_conn_cb)
return "CHCK";
REORG: stats: dump the frontend's HTML stats via a generic function This new function stats_dump_fields_html() checks the type of the object being dumped from the stats table, and emits it in HTML format. It uses an argument indicating if the HTML page is also used as an admin page, and for now still takes the proxy in argument as a few entries still need it. The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:15:39 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
snprintf(ptr, sizeof(ptr), "%p", conn->data);
return ptr;
}
REORG: stats: dump the frontend's HTML stats via a generic function This new function stats_dump_fields_html() checks the type of the object being dumped from the stats table, and emits it in HTML format. It uses an argument indicating if the HTML page is also used as an admin page, and for now still takes the proxy in argument as a few entries still need it. The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:15:39 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
/* This function dumps a complete stream state onto the stream interface's
* read buffer. The stream has to be set in sess->target. It returns
* 0 if the output buffer is full and it needs to be called again, otherwise
* non-zero. It is designed to be called from stats_dump_sess_to_buffer() below.
*/
static int stats_dump_full_sess_to_buffer(struct stream_interface *si, struct stream *sess)
{
struct appctx *appctx = __objt_appctx(si->end);
struct tm tm;
extern const char *monthname[12];
char pn[INET6_ADDRSTRLEN];
struct connection *conn;
struct appctx *tmpctx;
[MEDIUM] enable/disable servers from the stats web interface Based on a patch provided by Judd Montgomery, it is now possible to enable/disable servers from the stats web interface. This allows to select several servers in a backend and apply the action to them at the same time. Currently, there are 2 known limitations : - The POST data are limited to one packet (don't alter too many servers at a time). - Expect: 100-continue is not supported. (cherry picked from commit 7693948766cb5647ac03b48e782cfee2b1f14491)
2010-10-11 18:14:35 -04:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_reset(&trash);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (appctx->ctx.sess.section > 0 && appctx->ctx.sess.uid != sess->uniq_id) {
/* stream changed, no need to go any further */
chunk_appendf(&trash, " *** session terminated while we were watching it ***\n");
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
MEDIUM: stats: report the listeners' address in the CSV output It's the same principle as for the server dump, and we use this field for the HTML dump of course.
2016-01-08 10:59:56 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
appctx->ctx.sess.uid = 0;
appctx->ctx.sess.section = 0;
return 1;
}
MEDIUM: stats: report the listeners' address in the CSV output It's the same principle as for the server dump, and we use this field for the HTML dump of course.
2016-01-08 10:59:56 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
switch (appctx->ctx.sess.section) {
case 0: /* main status of the stream */
appctx->ctx.sess.uid = sess->uniq_id;
appctx->ctx.sess.section = 1;
/* fall through */
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
case 1:
get_localtime(sess->logs.accept_date.tv_sec, &tm);
chunk_appendf(&trash,
"%p: [%02d/%s/%04d:%02d:%02d:%02d.%06d] id=%u proto=%s",
sess,
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(sess->logs.accept_date.tv_usec),
sess->uniq_id,
strm_li(sess) ? strm_li(sess)->proto->name : "?");
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
conn = objt_conn(strm_orig(sess));
switch (conn ? addr_to_str(&conn->addr.from, pn, sizeof(pn)) : AF_UNSPEC) {
case AF_INET:
case AF_INET6:
chunk_appendf(&trash, " source=%s:%d\n",
pn, get_host_port(&conn->addr.from));
break;
case AF_UNIX:
chunk_appendf(&trash, " source=unix:%d\n", strm_li(sess)->luid);
break;
default:
/* no more information to print right now */
chunk_appendf(&trash, "\n");
break;
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_appendf(&trash,
" flags=0x%x, conn_retries=%d, srv_conn=%p, pend_pos=%p\n",
sess->flags, sess->si[1].conn_retries, sess->srv_conn, sess->pend_pos);
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_appendf(&trash,
" frontend=%s (id=%u mode=%s), listener=%s (id=%u)",
strm_fe(sess)->id, strm_fe(sess)->uuid, strm_fe(sess)->mode ? "http" : "tcp",
strm_li(sess) ? strm_li(sess)->name ? strm_li(sess)->name : "?" : "?",
strm_li(sess) ? strm_li(sess)->luid : 0);
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (conn)
conn_get_to_addr(conn);
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
switch (conn ? addr_to_str(&conn->addr.to, pn, sizeof(pn)) : AF_UNSPEC) {
case AF_INET:
case AF_INET6:
chunk_appendf(&trash, " addr=%s:%d\n",
pn, get_host_port(&conn->addr.to));
break;
case AF_UNIX:
chunk_appendf(&trash, " addr=unix:%d\n", strm_li(sess)->luid);
break;
default:
/* no more information to print right now */
chunk_appendf(&trash, "\n");
break;
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (sess->be->cap & PR_CAP_BE)
chunk_appendf(&trash,
" backend=%s (id=%u mode=%s)",
sess->be->id,
sess->be->uuid, sess->be->mode ? "http" : "tcp");
else
chunk_appendf(&trash, " backend=<NONE> (id=-1 mode=-)");
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
conn = objt_conn(sess->si[1].end);
if (conn)
conn_get_from_addr(conn);
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
switch (conn ? addr_to_str(&conn->addr.from, pn, sizeof(pn)) : AF_UNSPEC) {
case AF_INET:
case AF_INET6:
chunk_appendf(&trash, " addr=%s:%d\n",
pn, get_host_port(&conn->addr.from));
break;
case AF_UNIX:
chunk_appendf(&trash, " addr=unix\n");
break;
default:
/* no more information to print right now */
chunk_appendf(&trash, "\n");
break;
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
if (sess->be->cap & PR_CAP_BE)
chunk_appendf(&trash,
" server=%s (id=%u)",
objt_server(sess->target) ? objt_server(sess->target)->id : "<none>",
objt_server(sess->target) ? objt_server(sess->target)->puid : 0);
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
else
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_appendf(&trash, " server=<NONE> (id=-1)");
if (conn)
conn_get_to_addr(conn);
REORG: stats: dump the backend stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:25:50 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
switch (conn ? addr_to_str(&conn->addr.to, pn, sizeof(pn)) : AF_UNSPEC) {
case AF_INET:
case AF_INET6:
chunk_appendf(&trash, " addr=%s:%d\n",
pn, get_host_port(&conn->addr.to));
break;
case AF_UNIX:
chunk_appendf(&trash, " addr=unix\n");
break;
default:
/* no more information to print right now */
chunk_appendf(&trash, "\n");
break;
REORG: stats: dump the backend stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:25:50 -05:00
}
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_appendf(&trash,
" task=%p (state=0x%02x nice=%d calls=%d exp=%s%s",
sess->task,
sess->task->state,
sess->task->nice, sess->task->calls,
sess->task->expire ?
tick_is_expired(sess->task->expire, now_ms) ? "<PAST>" :
human_time(TICKS_TO_MS(sess->task->expire - now_ms),
TICKS_TO_MS(1000)) : "<NEVER>",
task_in_rq(sess->task) ? ", running" : "");
REORG: stats: dump the server stats via the generic function The code was simply moved as-is to the new function. There's no functional change.
2016-01-08 11:23:28 -05:00
REORG: cli: split dumpstats.c in src/cli.c and src/stats.c dumpstats.c was containing either the stats code and the CLI code. The cli code has been moved to cli.c and the stats code to stats.c
2016-11-21 11:18:36 -05:00
chunk_appendf(&trash,
" age=%s)\n",
human_time(now.tv_sec - sess->logs.accept_date.tv_sec, 1));
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MAJOR: http: move http_txn out of struct stream Now this one is dynamically allocated. It means that 280 bytes of memory are saved per TCP stream, but more importantly that it will become possible to remove the l7 pointer from fetches and converters since it will be deduced from the stream and will support being null. A lot of care was taken because it's easy to forget a test somewhere, and the previous code used to always trust s->txn for being valid, but all places seem to have been visited. All HTTP fetch functions check the txn first so we shouldn't have any issue there even when called from TCP. When branching from a TCP frontend to an HTTP backend, the txn is properly allocated at the same time as the hdr_idx.
2015-04-03 17:46:31 -04:00
if (sess->txn)
chunk_appendf(&trash,
MINOR: stats: report a "waiting" flags for sessions This flag indicates if the session is still waiting for some memory.
2014-11-26 12:05:38 -05:00
" txn=%p flags=0x%x meth=%d status=%d req.st=%s rsp.st=%s waiting=%d\n",
MAJOR: http: move http_txn out of struct stream Now this one is dynamically allocated. It means that 280 bytes of memory are saved per TCP stream, but more importantly that it will become possible to remove the l7 pointer from fetches and converters since it will be deduced from the stream and will support being null. A lot of care was taken because it's easy to forget a test somewhere, and the previous code used to always trust s->txn for being valid, but all places seem to have been visited. All HTTP fetch functions check the txn first so we shouldn't have any issue there even when called from TCP. When branching from a TCP frontend to an HTTP backend, the txn is properly allocated at the same time as the hdr_idx.
2015-04-03 17:46:31 -04:00
sess->txn, sess->txn->flags, sess->txn->meth, sess->txn->status,
http_msg_state_str(sess->txn->req.msg_state), http_msg_state_str(sess->txn->rsp.msg_state), !LIST_ISEMPTY(&sess->buffer_wait));
MINOR: stats: add a few more information on session dump We also report fd.spec_p, fd.updt and a few names instead of the values.
2012-12-08 11:48:47 -05:00
chunk_appendf(&trash,
MAJOR: stream interface: dynamically allocate the outgoing connection The outgoing connection is now allocated dynamically upon the first attempt to touch the connection's source or destination address. If this allocation fails, we fail on SN_ERR_RESOURCE. As we didn't use si->conn anymore, it was removed. The endpoints are released upon session_free(), on the error path, and upon a new transaction. That way we are able to carry the existing server's address across retries. The stream interfaces are not initialized anymore before session_complete(), so we could even think about allocating them dynamically as well, though that would not provide much savings. The session initialization now makes use of conn_new()/conn_free(). This slightly simplifies the code and makes it more logical. The connection initialization code is now shorter by about 120 bytes because it's done at once, allowing the compiler to remove all redundant initializations. The si_attach_applet() function now takes care of first detaching the existing endpoint, and it is called from stream_int_register_handler(), so we can safely remove the calls to si_release_endpoint() in the application code around this call. A call to si_detach() was made upon stream_int_unregister_handler() to ensure we always free the allocated connection if one was allocated in parallel to setting an applet (eg: detect HTTP proxy while proceeding with stats maybe).
2013-10-11 13:34:20 -04:00
" si[0]=%p (state=%s flags=0x%02x endp0=%s:%p exp=%s, et=0x%03x)\n",
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
&sess->si[0],
MINOR: stats: add a few more information on session dump We also report fd.spec_p, fd.updt and a few names instead of the values.
2012-12-08 11:48:47 -05:00
si_state_str(sess->si[0].state),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
sess->si[0].flags,
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
obj_type_name(sess->si[0].end),
obj_base_ptr(sess->si[0].end),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
sess->si[0].exp ?
tick_is_expired(sess->si[0].exp, now_ms) ? "<PAST>" :
human_time(TICKS_TO_MS(sess->si[0].exp - now_ms),
TICKS_TO_MS(1000)) : "<NEVER>",
sess->si[0].err_type);
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MAJOR: stream interface: dynamically allocate the outgoing connection The outgoing connection is now allocated dynamically upon the first attempt to touch the connection's source or destination address. If this allocation fails, we fail on SN_ERR_RESOURCE. As we didn't use si->conn anymore, it was removed. The endpoints are released upon session_free(), on the error path, and upon a new transaction. That way we are able to carry the existing server's address across retries. The stream interfaces are not initialized anymore before session_complete(), so we could even think about allocating them dynamically as well, though that would not provide much savings. The session initialization now makes use of conn_new()/conn_free(). This slightly simplifies the code and makes it more logical. The connection initialization code is now shorter by about 120 bytes because it's done at once, allowing the compiler to remove all redundant initializations. The si_attach_applet() function now takes care of first detaching the existing endpoint, and it is called from stream_int_register_handler(), so we can safely remove the calls to si_release_endpoint() in the application code around this call. A call to si_detach() was made upon stream_int_unregister_handler() to ensure we always free the allocated connection if one was allocated in parallel to setting an applet (eg: detect HTTP proxy while proceeding with stats maybe).
2013-10-11 13:34:20 -04:00
" si[1]=%p (state=%s flags=0x%02x endp1=%s:%p exp=%s, et=0x%03x)\n",
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
&sess->si[1],
MINOR: stats: add a few more information on session dump We also report fd.spec_p, fd.updt and a few names instead of the values.
2012-12-08 11:48:47 -05:00
si_state_str(sess->si[1].state),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
sess->si[1].flags,
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
obj_type_name(sess->si[1].end),
obj_base_ptr(sess->si[1].end),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
sess->si[1].exp ?
tick_is_expired(sess->si[1].exp, now_ms) ? "<PAST>" :
human_time(TICKS_TO_MS(sess->si[1].exp - now_ms),
TICKS_TO_MS(1000)) : "<NEVER>",
sess->si[1].err_type);
MINOR: stats: provide some appctx information in "show sess all" When dumping a session, it can be useful to know what applet it is connected to instead of having just the appctx pointer. We also report st0/st1/st2 to help debugging.
2013-12-01 14:45:00 -05:00
if ((conn = objt_conn(sess->si[0].end)) != NULL) {
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
chunk_appendf(&trash,
" co0=%p ctrl=%s xprt=%s data=%s target=%s:%p\n",
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
conn,
get_conn_ctrl_name(conn),
get_conn_xprt_name(conn),
get_conn_data_name(conn),
obj_type_name(conn->target),
obj_base_ptr(conn->target));
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
DEBUG: connection: mark the closed FDs with a value that is easier to detect Setting an FD to -1 when closed isn't the most easily noticeable thing to do when we're chasing accidental reuse of a stale file descriptor. Instead set it to that large a negative value that it will overflow the fdtab and provide an analysable core at the moment the issue happens. Care was taken to ensure it doesn't overflow nor change sign on 32-bit machines when multiplied by fdtab, and that it also remains negative for the various checks that exist. The value equals 0xFDDEADFD which happens to be easily spotted in a debugger.
2016-11-17 08:22:52 -05:00
chunk_appendf(&trash, " flags=0x%08x", conn->flags);
if (conn->t.sock.fd >= 0) {
chunk_appendf(&trash, " fd=%d fd.state=%02x fd.cache=%d updt=%d\n",
conn->t.sock.fd, fdtab[conn->t.sock.fd].state,
fdtab[conn->t.sock.fd].cache, fdtab[conn->t.sock.fd].updated);
}
else
chunk_appendf(&trash, " fd=<dead>\n");
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
}
MINOR: stats: provide some appctx information in "show sess all" When dumping a session, it can be useful to know what applet it is connected to instead of having just the appctx pointer. We also report st0/st1/st2 to help debugging.
2013-12-01 14:45:00 -05:00
else if ((tmpctx = objt_appctx(sess->si[0].end)) != NULL) {
chunk_appendf(&trash,
" app0=%p st0=%d st1=%d st2=%d applet=%s\n",
tmpctx,
tmpctx->st0,
tmpctx->st1,
tmpctx->st2,
tmpctx->applet->name);
}
MINOR: cli: report connection status in "show sess xxx" Connection flags, targets and transport layers are now reported in "show sess $PTR", as it is an absolute requirement in debugging.
2012-11-19 10:10:32 -05:00
MINOR: stats: provide some appctx information in "show sess all" When dumping a session, it can be useful to know what applet it is connected to instead of having just the appctx pointer. We also report st0/st1/st2 to help debugging.
2013-12-01 14:45:00 -05:00
if ((conn = objt_conn(sess->si[1].end)) != NULL) {
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
chunk_appendf(&trash,
" co1=%p ctrl=%s xprt=%s data=%s target=%s:%p\n",
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
conn,
get_conn_ctrl_name(conn),
get_conn_xprt_name(conn),
get_conn_data_name(conn),
obj_type_name(conn->target),
obj_base_ptr(conn->target));
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
DEBUG: connection: mark the closed FDs with a value that is easier to detect Setting an FD to -1 when closed isn't the most easily noticeable thing to do when we're chasing accidental reuse of a stale file descriptor. Instead set it to that large a negative value that it will overflow the fdtab and provide an analysable core at the moment the issue happens. Care was taken to ensure it doesn't overflow nor change sign on 32-bit machines when multiplied by fdtab, and that it also remains negative for the various checks that exist. The value equals 0xFDDEADFD which happens to be easily spotted in a debugger.
2016-11-17 08:22:52 -05:00
chunk_appendf(&trash, " flags=0x%08x", conn->flags);
if (conn->t.sock.fd >= 0) {
chunk_appendf(&trash, " fd=%d fd.state=%02x fd.cache=%d updt=%d\n",
conn->t.sock.fd, fdtab[conn->t.sock.fd].state,
fdtab[conn->t.sock.fd].cache, fdtab[conn->t.sock.fd].updated);
}
else
chunk_appendf(&trash, " fd=<dead>\n");
MEDIUM: stream-int: make ->end point to the connection or the appctx The long-term goal is to have a context for applets as an alternative to the connection and not as a complement. At the moment, the context is still stored into the stream interface, and we only put a pointer to the applet's context in si->end, initialize the context with object type OBJ_TYPE_APPCTX, and this allows us not to allocate an entry when deciding to switch to an applet. A special care is taken to never dereference si->conn anymore when dealing with an applet. That's why it's important that si->end is always set to the proper type : si->end == NULL => not connected to anything *si->end == OBJ_TYPE_APPCTX => connected to an applet *si->end == OBJ_TYPE_CONN => real connection (server, proxy, ...) The session management code used to check the applet from the connection's target. Now it uses the stream interface's end point and does not touch the connection at all. Similarly, we stop checking the connection's addresses and file descriptors when reporting the applet's status in the stats dump.
2013-09-29 11:19:56 -04:00
}
MINOR: stats: provide some appctx information in "show sess all" When dumping a session, it can be useful to know what applet it is connected to instead of having just the appctx pointer. We also report st0/st1/st2 to help debugging.
2013-12-01 14:45:00 -05:00
else if ((tmpctx = objt_appctx(sess->si[1].end)) != NULL) {
chunk_appendf(&trash,
" app1=%p st0=%d st1=%d st2=%d applet=%s\n",
tmpctx,
tmpctx->st0,
tmpctx->st1,
tmpctx->st2,
tmpctx->applet->name);
}
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
" req=%p (f=0x%06x an=0x%x pipe=%d tofwd=%d total=%lld)\n"
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" an_exp=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
&sess->req,
sess->req.flags, sess->req.analysers,
sess->req.pipe ? sess->req.pipe->data : 0,
sess->req.to_forward, sess->req.total,
sess->req.analyse_exp ?
human_time(TICKS_TO_MS(sess->req.analyse_exp - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" rex=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->req.rex ?
human_time(TICKS_TO_MS(sess->req.rex - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" wex=%s\n"
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
" buf=%p data=%p o=%d p=%d req.next=%d i=%d size=%d\n",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->req.wex ?
human_time(TICKS_TO_MS(sess->req.wex - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->req.buf,
sess->req.buf->data, sess->req.buf->o,
(int)(sess->req.buf->p - sess->req.buf->data),
MAJOR: http: move http_txn out of struct stream Now this one is dynamically allocated. It means that 280 bytes of memory are saved per TCP stream, but more importantly that it will become possible to remove the l7 pointer from fetches and converters since it will be deduced from the stream and will support being null. A lot of care was taken because it's easy to forget a test somewhere, and the previous code used to always trust s->txn for being valid, but all places seem to have been visited. All HTTP fetch functions check the txn first so we shouldn't have any issue there even when called from TCP. When branching from a TCP frontend to an HTTP backend, the txn is properly allocated at the same time as the hdr_idx.
2015-04-03 17:46:31 -04:00
sess->txn ? sess->txn->req.next : 0, sess->req.buf->i,
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->req.buf->size);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
" res=%p (f=0x%06x an=0x%x pipe=%d tofwd=%d total=%lld)\n"
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" an_exp=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
&sess->res,
sess->res.flags, sess->res.analysers,
sess->res.pipe ? sess->res.pipe->data : 0,
sess->res.to_forward, sess->res.total,
sess->res.analyse_exp ?
human_time(TICKS_TO_MS(sess->res.analyse_exp - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" rex=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->res.rex ?
human_time(TICKS_TO_MS(sess->res.rex - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
" wex=%s\n"
MINOR: cli: improve output format for show sess $ptr This change removes pointers for known types (stream_interface, ...), adds buffer pointers and sizes, and moves buffer information to their own line. The output is cleaner with shorter lines and slightly more lines.
2012-11-25 21:04:41 -05:00
" buf=%p data=%p o=%d p=%d rsp.next=%d i=%d size=%d\n",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->res.wex ?
human_time(TICKS_TO_MS(sess->res.wex - now_ms),
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
TICKS_TO_MS(1000)) : "<NEVER>",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->res.buf,
sess->res.buf->data, sess->res.buf->o,
(int)(sess->res.buf->p - sess->res.buf->data),
MAJOR: http: move http_txn out of struct stream Now this one is dynamically allocated. It means that 280 bytes of memory are saved per TCP stream, but more importantly that it will become possible to remove the l7 pointer from fetches and converters since it will be deduced from the stream and will support being null. A lot of care was taken because it's easy to forget a test somewhere, and the previous code used to always trust s->txn for being valid, but all places seem to have been visited. All HTTP fetch functions check the txn first so we shouldn't have any issue there even when called from TCP. When branching from a TCP frontend to an HTTP backend, the txn is properly allocated at the same time as the hdr_idx.
2015-04-03 17:46:31 -04:00
sess->txn ? sess->txn->rsp.next : 0, sess->res.buf->i,
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
sess->res.buf->size);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
/* use other states to dump the contents */
}
/* end of dump */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.uid = 0;
appctx->ctx.sess.section = 0;
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
return 1;
}
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
#if (defined SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB && TLS_TICKETS_NO > 0)
static int stats_tlskeys_list(struct stream_interface *si) {
struct appctx *appctx = __objt_appctx(si->end);
switch (appctx->st2) {
case STAT_ST_INIT:
/* Display the column headers. If the message cannot be sent,
* quit the fucntion with returning 0. The function is called
* later and restart at the state "STAT_ST_INIT".
*/
chunk_reset(&trash);
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
if (appctx->st0 == STAT_CLI_O_TLSK_ENT)
chunk_appendf(&trash, "# id secret\n");
else
chunk_appendf(&trash, "# id (file)\n");
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
appctx->ctx.tlskeys.dump_keys_index = 0;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
/* Now, we start the browsing of the references lists.
* Note that the following call to LIST_ELEM return bad pointer. The only
MINOR: stats: fix typo in help messages The word "available" was mistakenly written "avalaible" in help messages and comments. This patch should be backported to 1.5 and 1.6
2016-05-06 06:18:50 -04:00
* available field of this pointer is <list>. It is used with the function
* tlskeys_list_get_next() for retruning the first available entry
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
*/
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
if (appctx->ctx.tlskeys.ref == NULL) {
appctx->ctx.tlskeys.ref = LIST_ELEM(&tlskeys_reference, struct tls_keys_ref *, list);
appctx->ctx.tlskeys.ref = tlskeys_list_get_next(appctx->ctx.tlskeys.ref, &tlskeys_reference);
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
}
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
appctx->st2 = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
while (appctx->ctx.tlskeys.ref) {
int head = appctx->ctx.tlskeys.ref->tls_ticket_enc_index;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
chunk_reset(&trash);
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
if (appctx->st0 == STAT_CLI_O_TLSK_ENT && appctx->ctx.tlskeys.dump_keys_index == 0)
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
chunk_appendf(&trash, "# ");
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
if (appctx->ctx.tlskeys.dump_keys_index == 0)
chunk_appendf(&trash, "%d (%s)\n", appctx->ctx.tlskeys.ref->unique_id,
appctx->ctx.tlskeys.ref->filename);
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
if (appctx->st0 == STAT_CLI_O_TLSK_ENT) {
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
while (appctx->ctx.tlskeys.dump_keys_index < TLS_TICKETS_NO) {
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
struct chunk *t2 = get_trash_chunk();
chunk_reset(t2);
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
/* should never fail here because we dump only a key in the t2 buffer */
t2->len = a2base64((char *)(appctx->ctx.tlskeys.ref->tlskeys + (head + 2 + appctx->ctx.tlskeys.dump_keys_index) % TLS_TICKETS_NO),
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
sizeof(struct tls_sess_key), t2->str, t2->size);
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
chunk_appendf(&trash, "%d.%d %s\n", appctx->ctx.tlskeys.ref->unique_id, appctx->ctx.tlskeys.dump_keys_index, t2->str);
if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
si_applet_cant_put(si);
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
return 0;
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
}
appctx->ctx.tlskeys.dump_keys_index++;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
}
MEDIUM: dumpstats: make stats_tlskeys_list() yield-aware during tls-keys dump The previous dump algorithm was not trying to yield when the buffer is full, it's not a problem with the TLS_TICKETS_NO which is 3 by default but it can become one if the buffer size is lowered and if the TLS_TICKETS_NO is increased. The index of the latest ticket dumped is now stored to ensure we can resume the dump after a yield.
2016-06-14 12:58:55 -04:00
appctx->ctx.tlskeys.dump_keys_index = 0;
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
}
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
*/
si_applet_cant_put(si);
return 0;
}
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
if (appctx->ctx.tlskeys.dump_all == 0) /* don't display everything if not necessary */
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
break;
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
/* get next list entry and check the end of the list */
BUG/MEDIUM: dumpstats: undefined behavior in stats_tlskeys_list() The function stats_tlskeys_list() can meet an undefined behavior when called with appctx->st2 == STAT_ST_LIST, indeed the ref pointer is used uninitialized. However this function was using NULL in appctx->ctx.tlskeys.ref as a flag to dump every tickets from every references. A real flag appctx->ctx.tlskeys.dump_all is now used for this behavior. This patch delete the 'ref' variable and use appctx->ctx.tlskeys.ref directly.
2016-06-14 11:45:18 -04:00
appctx->ctx.tlskeys.ref = tlskeys_list_get_next(appctx->ctx.tlskeys.ref, &tlskeys_reference);
MEDIUM: dumpstats: 'show tls-keys' is now able to show secrets You can now dump the tls-tickets-keys from the unix socket using the file ID prefixed by an '#' or using a '*' to dump everything.
2016-05-20 11:40:26 -04:00
MEDIUM: Add support for updating TLS ticket keys via socket Until now, HAproxy needed to be restarted to change the TLS ticket keys. With this patch, the TLS keys can be updated on a per-file basis using the admin socket. Two new socket commands have been introduced: "show tls-keys" and "set ssl tls-keys". Signed-off-by: Nenad Merdanovic <nmerdan@anine.io>
2015-05-09 02:46:01 -04:00
}
appctx->st2 = STAT_ST_FIN;
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
}
return 0;
}
#endif
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
static int stats_pats_list(struct stream_interface *si)
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
{
struct appctx *appctx = __objt_appctx(si->end);
switch (appctx->st2) {
case STAT_ST_INIT:
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
/* Display the column headers. If the message cannot be sent,
* quit the fucntion with returning 0. The function is called
* later and restart at the state "STAT_ST_INIT".
*/
chunk_reset(&trash);
MINOR: pattern/cli: Update used terms in documentation and cli This patch replace the word <name> by the word <file>. This word defines the (string) returned by show "map/acl". This patch also update documentation to explain how is composed the map or acl identifier.
2014-03-20 06:42:45 -04:00
chunk_appendf(&trash, "# id (file) description\n");
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Now, we start the browsing of the references lists.
* Note that the following call to LIST_ELEM return bad pointer. The only
MINOR: stats: fix typo in help messages The word "available" was mistakenly written "avalaible" in help messages and comments. This patch should be backported to 1.5 and 1.6
2016-05-06 06:18:50 -04:00
* available field of this pointer is <list>. It is used with the function
* pat_list_get_next() for retruning the first available entry
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
*/
appctx->ctx.map.ref = LIST_ELEM(&pattern_reference, struct pat_ref *, list);
appctx->ctx.map.ref = pat_list_get_next(appctx->ctx.map.ref, &pattern_reference,
appctx->ctx.map.display_flags);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st2 = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
while (appctx->ctx.map.ref) {
chunk_reset(&trash);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Build messages. If the reference is used by another category than
* the listed categorie, display the information in the massage.
*/
MINOR: cli: remove information about acl or map owner. The string <display> contain all the owners of the displayed pattern. The message " - also used by an ACL/map" is useless.
2014-03-20 06:45:47 -04:00
chunk_appendf(&trash, "%d (%s) %s\n", appctx->ctx.map.ref->unique_id,
MINOR: pattern: store configuration reference for each acl or map pattern. This patch permit to add reference for each pattern reference. This is useful to identify the acl listed.
2014-02-10 21:31:34 -05:00
appctx->ctx.map.ref->reference ? appctx->ctx.map.ref->reference : "",
appctx->ctx.map.ref->display);
MINOR: pattern: Each pattern is identified by unique id. The pattern reference are stored with two identifiers: the unique_id and the reference. The reference identify a file. Each file with the same name point to the same reference. We can register many times one file. If the file is modified, all his dependencies are also modified. The reference can be used with map or acl. The unique_id identify inline acl. The unique id is unique for each acl. You cannot force the same id in the configuration file, because this repport an error. The format of the acl and map listing through the "socket" has changed for displaying these new ids.
2014-03-11 09:29:22 -04:00
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
*/
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 0;
}
/* get next list entry and check the end of the list */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.map.ref = pat_list_get_next(appctx->ctx.map.ref, &pattern_reference,
appctx->ctx.map.display_flags);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
appctx->st2 = STAT_ST_FIN;
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
return 0;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
static int stats_map_lookup(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);
struct sample sample;
struct pattern *pat;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
int match_method;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
switch (appctx->st2) {
case STAT_ST_INIT:
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
/* Init to the first entry. The list cannot be change */
MEDIUM: pattern: merge same pattern Sometimes the same pattern file is used with the same index, parse and parse_smp functions. If this two condition are true, these two pattern are identical and the same struct can be used.
2014-01-20 08:29:33 -05:00
appctx->ctx.map.expr = LIST_ELEM(&appctx->ctx.map.ref->pat, struct pattern_expr *, list);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.map.expr = pat_expr_get_next(appctx->ctx.map.expr, &appctx->ctx.map.ref->pat);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st2 = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
/* for each lookup type */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
while (appctx->ctx.map.expr) {
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* initialise chunk to build new message */
chunk_reset(&trash);
/* execute pattern matching */
MEDIUM: samples: Use the "struct sample_data" in the "struct sample" This patch remove the struct information stored both in the struct sample_data and in the striuct sample. Now, only thestruct sample_data contains data, and the struct sample use the struct sample_data for storing his own data.
2015-08-19 03:00:18 -04:00
sample.data.type = SMP_T_STR;
CLEANUP: stats: Avoid computation with uninitialized bits. stats_map_lookup() sets bit SMP_F_CONST in the uninitialized member flags of a stack-allocated sample, leaving the other bits uninitialized. All code paths that can access the struct only ever check for this specific flag, so there is no risk of unintended behavior. Nevertheless fix it as it triggers warnings in static code analysis tools and might become a problem on future revisions of the code. Problem found in version 1.5.
2016-03-03 13:32:25 -05:00
sample.flags = SMP_F_CONST;
MINOR: samples: rename union from "data" to "u" The union name "data" is a little bit heavy while we read the source code because we can read "data.data.sint". The rename from "data" to "u" makes the read easiest like "data.u.sint".
2015-08-19 03:07:19 -04:00
sample.data.u.str.len = appctx->ctx.map.chunk.len;
sample.data.u.str.str = appctx->ctx.map.chunk.str;
MEDIUM: pattern: The expected type is stored in the pattern head, and conversion is executed once. This patch extract the expect_type variable from the "struct pattern" to "struct pattern_head". This variable is set during the declaration of ACL and MAP. With this change, the function "pat_parse_len()" become useless and can be replaced by "pat_parse_int()". Implicit ACLs by default rely on the fetch's output type, so let's simply do the same for all other ones. It has been verified that they all match.
2014-01-27 08:19:53 -05:00
if (appctx->ctx.map.expr->pat_head->match &&
sample_convert(&sample, appctx->ctx.map.expr->pat_head->expect_type))
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
pat = appctx->ctx.map.expr->pat_head->match(&sample, appctx->ctx.map.expr, 1);
else
pat = NULL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* build return message: set type of match */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
for (match_method=0; match_method<PAT_MATCH_NUM; match_method++)
if (appctx->ctx.map.expr->pat_head->match == pat_match_fcts[match_method])
break;
if (match_method >= PAT_MATCH_NUM)
chunk_appendf(&trash, "type=unknown(%p)", appctx->ctx.map.expr->pat_head->match);
else
chunk_appendf(&trash, "type=%s", pat_match_names[match_method]);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
BUG/MEDIUM: patterns: last fix was still not enough Last fix did address the issue for inlined patterns, but it was not enough because the flags are lost as well when updating patterns dynamically over the CLI. Also if the same file was used once with -i and another time without -i, their references would have been merged and both would have used the same matching method. It's appear that the patterns have two types of flags. The first ones are relative to the pattern matching, and the second are relative to the pattern storage. The pattern matching flags are the same for all the patterns of one expression. Now they are stored in the expression. The storage flags are information returned by the pattern mathing function. This information is relative to each entry and is stored in the "struct pattern". Now, the expression matching flags are forwarded to the parse and index functions. These flags are stored during the configuration parsing, and they are used during the parse and index actions. This issue was introduced in dev23 with the major pattern rework, and is a continuation of commit a631fc8 ("BUG/MAJOR: patterns: -i and -n are ignored for inlined patterns"). No backport is needed.
2014-04-28 05:18:57 -04:00
/* case sensitive */
if (appctx->ctx.map.expr->mflags & PAT_MF_IGNORE_CASE)
chunk_appendf(&trash, ", case=insensitive");
else
chunk_appendf(&trash, ", case=sensitive");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* Display no match, and set default value */
MEDIUM: pattern: The function pattern_exec_match() returns "struct pattern" if the patten match. Before this commit, the pattern_exec_match() function returns the associate sample, the associate struct pattern or the associate struct pattern_tree. This is complex to use, because we can check the type of information returned. Now the function return always a "struct pattern". If <fill> is not set, only the value of the pointer can be used as boolean (NULL or other). If <fill> is set, you can use the <smp> pointer and the pattern information. If information must be duplicated, it is stored in trash buffer. Otherwise, the pattern can point on existing strings.
2014-01-17 09:25:13 -05:00
if (!pat) {
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
chunk_appendf(&trash, ", found=no");
else
chunk_appendf(&trash, ", match=no");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
/* Display match and match info */
else {
/* display match */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.display_flags == PAT_REF_MAP)
chunk_appendf(&trash, ", found=yes");
else
chunk_appendf(&trash, ", match=yes");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MEDIUM: pattern: The function pattern_exec_match() returns "struct pattern" if the patten match. Before this commit, the pattern_exec_match() function returns the associate sample, the associate struct pattern or the associate struct pattern_tree. This is complex to use, because we can check the type of information returned. Now the function return always a "struct pattern". If <fill> is not set, only the value of the pointer can be used as boolean (NULL or other). If <fill> is set, you can use the <smp> pointer and the pattern information. If information must be duplicated, it is stored in trash buffer. Otherwise, the pattern can point on existing strings.
2014-01-17 09:25:13 -05:00
/* display index mode */
BUG/MEDIUM: patterns: last fix was still not enough Last fix did address the issue for inlined patterns, but it was not enough because the flags are lost as well when updating patterns dynamically over the CLI. Also if the same file was used once with -i and another time without -i, their references would have been merged and both would have used the same matching method. It's appear that the patterns have two types of flags. The first ones are relative to the pattern matching, and the second are relative to the pattern storage. The pattern matching flags are the same for all the patterns of one expression. Now they are stored in the expression. The storage flags are information returned by the pattern mathing function. This information is relative to each entry and is stored in the "struct pattern". Now, the expression matching flags are forwarded to the parse and index functions. These flags are stored during the configuration parsing, and they are used during the parse and index actions. This issue was introduced in dev23 with the major pattern rework, and is a continuation of commit a631fc8 ("BUG/MAJOR: patterns: -i and -n are ignored for inlined patterns"). No backport is needed.
2014-04-28 05:18:57 -04:00
if (pat->sflags & PAT_SF_TREE)
MINOR: dumpstats: change the "get map" display management The original get map display function set the comma separator after each word displayed. This is not efficient because we cannot knew if the displayed word is the last. This new system set the comma separator before the displayed word, and independant "\n" is set a the end of the function.
2014-03-11 13:48:17 -04:00
chunk_appendf(&trash, ", idx=tree");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
else
MINOR: dumpstats: change the "get map" display management The original get map display function set the comma separator after each word displayed. This is not efficient because we cannot knew if the displayed word is the last. This new system set the comma separator before the displayed word, and independant "\n" is set a the end of the function.
2014-03-11 13:48:17 -04:00
chunk_appendf(&trash, ", idx=list");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
MINOR: dumpstats: display the reference for th key/pattern and value. Before this patch, the "get map/acl" function try to convert and display the sample. This behavior is not efficient because some type like the regex cannot be reversed and displayed as string. This patch display the original stored reference.
2014-03-11 13:37:58 -04:00
/* display pattern */
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
if (pat->ref && pat->ref->pattern)
chunk_appendf(&trash, ", key=\"%s\"", pat->ref->pattern);
else
chunk_appendf(&trash, ", key=unknown");
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
}
else {
MINOR: dumpstats: display the reference for th key/pattern and value. Before this patch, the "get map/acl" function try to convert and display the sample. This behavior is not efficient because some type like the regex cannot be reversed and displayed as string. This patch display the original stored reference.
2014-03-11 13:37:58 -04:00
if (pat->ref && pat->ref->pattern)
chunk_appendf(&trash, ", pattern=\"%s\"", pat->ref->pattern);
else
chunk_appendf(&trash, ", pattern=unknown");
}
/* display return value */
if (appctx->ctx.map.display_flags == PAT_REF_MAP) {
MINOR: samples: rename some struct member from "smp" to "data" This members contains data and not sample.
2015-08-19 02:35:43 -04:00
if (pat->data && pat->ref && pat->ref->sample)
MEDIUM: cli: rely on the map's output type instead of the sample type Next patch will remove sample_storage->type, and the only user is the "show map" feature on the CLI which can use the map's output type instead. Let's do that first.
2015-07-23 12:33:41 -04:00
chunk_appendf(&trash, ", value=\"%s\", type=\"%s\"", pat->ref->sample,
MEDIUM: pattern/map: Maps can returns various types A map can store and return various types as output. The only one example is the IPv4 and IPv6 types. The previous patch remove the type from the sample storage struct and use the conoverter output type, expecting that all entries of the map have the same type. This will be wrong when the maps will support both IPv4 and IPv6 as output.
2015-08-19 03:05:25 -04:00
smp_to_type[pat->data->type]);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MINOR: dumpstats: display the reference for th key/pattern and value. Before this patch, the "get map/acl" function try to convert and display the sample. This behavior is not efficient because some type like the regex cannot be reversed and displayed as string. This patch display the original stored reference.
2014-03-11 13:37:58 -04:00
chunk_appendf(&trash, ", value=none");
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
}
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
MINOR: dumpstats: change the "get map" display management The original get map display function set the comma separator after each word displayed. This is not efficient because we cannot knew if the displayed word is the last. This new system set the comma separator before the displayed word, and independant "\n" is set a the end of the function.
2014-03-11 13:48:17 -04:00
chunk_appendf(&trash, "\n");
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
/* display response */
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
*/
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 0;
}
/* get next entry */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.map.expr = pat_expr_get_next(appctx->ctx.map.expr,
&appctx->ctx.map.ref->pat);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
}
appctx->st2 = STAT_ST_FIN;
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
free(appctx->ctx.map.chunk.str);
return 1;
}
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
static int stats_pat_list(struct stream_interface *si)
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
{
struct appctx *appctx = __objt_appctx(si->end);
switch (appctx->st2) {
case STAT_ST_INIT:
/* Init to the first entry. The list cannot be change */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.map.elt = LIST_NEXT(&appctx->ctx.map.ref->head,
struct pat_ref_elt *, list);
if (&appctx->ctx.map.elt->list == &appctx->ctx.map.ref->head)
appctx->ctx.map.elt = NULL;
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
appctx->st2 = STAT_ST_LIST;
/* fall through */
case STAT_ST_LIST:
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
while (appctx->ctx.map.elt) {
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
chunk_reset(&trash);
/* build messages */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
if (appctx->ctx.map.elt->sample)
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
chunk_appendf(&trash, "%p %s %s\n",
appctx->ctx.map.elt, appctx->ctx.map.elt->pattern,
appctx->ctx.map.elt->sample);
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else
MEDIUM: dumpstats/pattern: display and use each pointer of each pattern dumped Each pattern displayed is associated to the value of his pattern reference. This value can be used for deleting the entry. It is useful with complex regex: the users are not forced to write the regex with all the amiguous chars and escaped chars on the CLI.
2014-01-28 09:55:37 -05:00
chunk_appendf(&trash, "%p %s\n",
appctx->ctx.map.elt, appctx->ctx.map.elt->pattern);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
*/
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
return 0;
}
/* get next list entry and check the end of the list */
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
appctx->ctx.map.elt = LIST_NEXT(&appctx->ctx.map.elt->list,
struct pat_ref_elt *, list);
if (&appctx->ctx.map.elt->list == &appctx->ctx.map.ref->head)
MEDIUM: map: dynamic manipulation of maps This patch adds map manipulation commands to the socket interface. add map <map> <key> <value> Add the value <value> in the map <map>, at the entry corresponding to the key <key>. This command does not verify if the entry already exists. clear map <map> Remove entries from the map <map> del map <map> <key> Delete all the map entries corresponding to the <key> value in the map <map>. set map <map> <key> <value> Modify the value corresponding to each key <key> in a map <map>. The new value is <value>. show map [<map>] Dump info about map converters. Without argument, the list of all available maps are returned. If a <map> is specified, is content is dumped.
2013-12-11 10:55:52 -05:00
break;
}
appctx->st2 = STAT_ST_FIN;
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
}
}
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* This function dumps all streams' states onto the stream interface's
MEDIUM: stats: don't use conn->xprt_ctx anymore This field was used by dumpstats to retrieve a pointer to the current session, which may already be found from ->owner. With this change, the stats code doesn't need the connection at all anymore.
2013-07-08 09:53:06 -04:00
* read buffer. It returns 0 if the output buffer is full and it needs
[CLEANUP] stats: make all dump functions only rely on the stream interface This will be needed to move the applet-specific data out of the session.
2011-02-13 09:27:22 -05:00
* to be called again, otherwise non-zero. It is designed to be called
* from stats_dump_sess_to_buffer() below.
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
*/
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static int stats_dump_sess_to_buffer(struct stream_interface *si)
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
struct connection *conn;
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW))) {
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
/* If we're forced to shut down, we might have to remove our
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* reference to the last stream being dumped.
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
*/
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st2 == STAT_ST_LIST) {
if (!LIST_ISEMPTY(&appctx->ctx.sess.bref.users)) {
LIST_DEL(&appctx->ctx.sess.bref.users);
LIST_INIT(&appctx->ctx.sess.bref.users);
[BUG] fix random memory corruption using "show sess" Commit 8a5c626e73bac905d150185e45110525588d7b4c introduced the sessions dump on the unix socket. This implementation is buggy because it may try to link to the sessions list's head after the last session is removed with a backref. Also, for the LIST_ISEMPTY test to succeed, we have to proceed with LIST_INIT after LIST_DEL.
2009-02-22 09:17:24 -05:00
}
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
}
[MINOR] stats_dump_sess_to_buffer: use buffer_feed_chunk() same as previous patch for this function.
2009-10-03 17:55:14 -04:00
return 1;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_reset(&trash);
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
switch (appctx->st2) {
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_INIT:
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
/* the function had not been called yet, let's prepare the
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* buffer for a response. We initialize the current stream
[BUG] fix random memory corruption using "show sess" Commit 8a5c626e73bac905d150185e45110525588d7b4c introduced the sessions dump on the unix socket. This implementation is buggy because it may try to link to the sessions list's head after the last session is removed with a backref. Also, for the LIST_ISEMPTY test to succeed, we have to proceed with LIST_INIT after LIST_DEL.
2009-02-22 09:17:24 -05:00
* pointer to the first in the global list. When a target
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* stream is being destroyed, it is responsible for updating
[BUG] fix random memory corruption using "show sess" Commit 8a5c626e73bac905d150185e45110525588d7b4c introduced the sessions dump on the unix socket. This implementation is buggy because it may try to link to the sessions list's head after the last session is removed with a backref. Also, for the LIST_ISEMPTY test to succeed, we have to proceed with LIST_INIT after LIST_DEL.
2009-02-22 09:17:24 -05:00
* this pointer. We know we have reached the end when this
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* pointer points back to the head of the streams list.
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
*/
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
LIST_INIT(&appctx->ctx.sess.bref.users);
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
appctx->ctx.sess.bref.ref = streams.n;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_LIST;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
/* fall through */
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_LIST:
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* first, let's detach the back-ref from a possible previous stream */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!LIST_ISEMPTY(&appctx->ctx.sess.bref.users)) {
LIST_DEL(&appctx->ctx.sess.bref.users);
LIST_INIT(&appctx->ctx.sess.bref.users);
[BUG] fix random memory corruption using "show sess" Commit 8a5c626e73bac905d150185e45110525588d7b4c introduced the sessions dump on the unix socket. This implementation is buggy because it may try to link to the sessions list's head after the last session is removed with a backref. Also, for the LIST_ISEMPTY test to succeed, we have to proceed with LIST_INIT after LIST_DEL.
2009-02-22 09:17:24 -05:00
}
/* and start from where we stopped */
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
while (appctx->ctx.sess.bref.ref != &streams) {
[CLEANUP] Remove unneeded chars allocation Some arrays used to log addresses add some more bytes for ports but this space is never used.
2010-11-01 14:26:02 -04:00
char pn[INET6_ADDRSTRLEN];
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *curr_sess;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
curr_sess = LIST_ELEM(appctx->ctx.sess.bref.ref, struct stream *, list);
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.sess.target) {
if (appctx->ctx.sess.target != (void *)-1 && appctx->ctx.sess.target != curr_sess)
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
goto next_sess;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
LIST_ADDQ(&curr_sess->back_refs, &appctx->ctx.sess.bref.users);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
/* call the proper dump() function and return if we're missing space */
MINOR: cli: add support for the "show sess all" command Sometimes when debugging haproxy, it is important to take a full snapshot of all sessions and their respective states. Till now it was complicated to do because we had to use scripts and sessions would vanish between two runs. Now with this command we have the same output as "show sess $id" but for all sessions in the table. This is a debugging command only, it should only be used by developers as it is never guaranteed to perfectly work !
2012-11-25 19:16:39 -05:00
if (!stats_dump_full_sess_to_buffer(si, curr_sess))
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
return 0;
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* stream dump complete */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
LIST_DEL(&appctx->ctx.sess.bref.users);
LIST_INIT(&appctx->ctx.sess.bref.users);
if (appctx->ctx.sess.target != (void *)-1) {
appctx->ctx.sess.target = NULL;
MINOR: cli: add support for the "show sess all" command Sometimes when debugging haproxy, it is important to take a full snapshot of all sessions and their respective states. Till now it was complicated to do because we had to use scripts and sessions would vanish between two runs. Now with this command we have the same output as "show sess $id" but for all sessions in the table. This is a debugging command only, it should only be used by developers as it is never guaranteed to perfectly work !
2012-11-25 19:16:39 -05:00
break;
}
else
goto next_sess;
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
"%p: proto=%s",
curr_sess,
BUG/MAJOR: cli: do not dereference strm_li()->proto->name Or it will crash when dumping streams instanciated by an applet, like Lua's cosockets.
2015-09-23 06:16:43 -04:00
strm_li(curr_sess) ? strm_li(curr_sess)->proto->name : "?");
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
conn = objt_conn(strm_orig(curr_sess));
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
switch (conn ? addr_to_str(&conn->addr.from, pn, sizeof(pn)) : AF_UNSPEC) {
[MINOR] make use of addr_to_str() and get_host_port() to replace many inet_ntop() Many inet_ntop calls were partially right, which was hard to detect given the complex combinations. Some of them were relying on the listener's proto instead of the address itself, which could have been different when dealing with an accept-proxy connection. The new addr_to_str() function does the dirty job and returns the family, which makes it particularly suited to calls from switch/case statements. A large number of if/else statements were removed and the stats output could even be cleaned up in the case of session dump. As a side effect of doing this, the resulting code is smaller by almost 1kB. All changed parts have been tested and provided expected output.
2011-09-04 18:36:48 -04:00
case AF_INET:
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
case AF_INET6:
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
" src=%s:%d fe=%s be=%s srv=%s",
pn,
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
get_host_port(&conn->addr.from),
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
strm_fe(curr_sess)->id,
[MINOR] stats: display "<NONE>" instead of the frontend name when unknown "show sess" should display "<NONE>" instead of the frontend's name as the backend's.
2011-09-02 11:33:05 -04:00
(curr_sess->be->cap & PR_CAP_BE) ? curr_sess->be->id : "<NONE>",
MAJOR: connection: replace struct target with a pointer to an enum Instead of storing a couple of (int, ptr) in the struct connection and the struct session, we use a different method : we only store a pointer to an integer which is stored inside the target object and which contains a unique type identifier. That way, the pointer allows us to retrieve the object type (by dereferencing it) and the object's address (by computing the displacement in the target structure). The NULL pointer always corresponds to OBJ_TYPE_NONE. This reduces the size of the connection and session structs. It also simplifies target assignment and compare. In order to improve the generated code, we try to put the obj_type element at the beginning of all the structs (listener, server, proxy, si_applet), so that the original and target pointers are always equal. A lot of code was touched by massive replaces, but the changes are not that important.
2012-11-11 18:42:33 -05:00
objt_server(curr_sess->target) ? objt_server(curr_sess->target)->id : "<none>"
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
);
break;
case AF_UNIX:
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] Manage unix socket source field on session dump on sock stats
2010-10-22 10:19:01 -04:00
" src=unix:%d fe=%s be=%s srv=%s",
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
strm_li(curr_sess)->luid,
strm_fe(curr_sess)->id,
[MINOR] stats: display "<NONE>" instead of the frontend name when unknown "show sess" should display "<NONE>" instead of the frontend's name as the backend's.
2011-09-02 11:33:05 -04:00
(curr_sess->be->cap & PR_CAP_BE) ? curr_sess->be->id : "<NONE>",
MAJOR: connection: replace struct target with a pointer to an enum Instead of storing a couple of (int, ptr) in the struct connection and the struct session, we use a different method : we only store a pointer to an integer which is stored inside the target object and which contains a unique type identifier. That way, the pointer allows us to retrieve the object type (by dereferencing it) and the object's address (by computing the displacement in the target structure). The NULL pointer always corresponds to OBJ_TYPE_NONE. This reduces the size of the connection and session structs. It also simplifies target assignment and compare. In order to improve the generated code, we try to put the obj_type element at the beginning of all the structs (listener, server, proxy, si_applet), so that the original and target pointers are always equal. A lot of code was touched by massive replaces, but the changes are not that important.
2012-11-11 18:42:33 -05:00
objt_server(curr_sess->target) ? objt_server(curr_sess->target)->id : "<none>"
[MINOR] Manage unix socket source field on session dump on sock stats
2010-10-22 10:19:01 -04:00
);
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
break;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] remove now obsolete ana_state from the session struct This one is not used anymore.
2009-10-04 08:24:59 -04:00
" ts=%02x age=%s calls=%d",
curr_sess->task->state,
[MINOR] show sess: report number of calls to each task For debugging purposes, it can be useful to know how many times each task has been called.
2009-03-28 12:54:35 -04:00
human_time(now.tv_sec - curr_sess->logs.tv_accept.tv_sec, 1),
curr_sess->task->calls);
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MAJOR: buffer: replace buf->l with buf->{o+i} We don't have buf->l anymore. We have buf->i for pending data and the total length is retrieved by adding buf->o. Some computation already become simpler. Despite extreme care, bugs are not excluded. It's worth noting that msg->err_pos as set by HTTP request/response analysers becomes relative to pending data and not to the beginning of the buffer. This has not been completed yet so differences might occur when outgoing data are left in the buffer.
2012-03-01 12:19:58 -05:00
" rq[f=%06xh,i=%d,an=%02xh,rx=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->req.flags,
curr_sess->req.buf->i,
curr_sess->req.analysers,
curr_sess->req.rex ?
human_time(TICKS_TO_MS(curr_sess->req.rex - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
",wx=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->req.wex ?
human_time(TICKS_TO_MS(curr_sess->req.wex - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
",ax=%s]",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->req.analyse_exp ?
human_time(TICKS_TO_MS(curr_sess->req.analyse_exp - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MAJOR: buffer: replace buf->l with buf->{o+i} We don't have buf->l anymore. We have buf->i for pending data and the total length is retrieved by adding buf->o. Some computation already become simpler. Despite extreme care, bugs are not excluded. It's worth noting that msg->err_pos as set by HTTP request/response analysers becomes relative to pending data and not to the beginning of the buffer. This has not been completed yet so differences might occur when outgoing data are left in the buffer.
2012-03-01 12:19:58 -05:00
" rp[f=%06xh,i=%d,an=%02xh,rx=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->res.flags,
curr_sess->res.buf->i,
curr_sess->res.analysers,
curr_sess->res.rex ?
human_time(TICKS_TO_MS(curr_sess->res.rex - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
",wx=%s",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->res.wex ?
human_time(TICKS_TO_MS(curr_sess->res.wex - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
",ax=%s]",
REORG/MAJOR: move session's req and resp channels back into the session The channels were pointers to outside structs and this is not needed anymore since the buffers have moved, but this complicates operations. Move them back into the session so that both channels and stream interfaces are always allocated for a session. Some places (some early sample fetch functions) used to validate that a channel was NULL prior to dereferencing it. Now instead we check if chn->buf is NULL and we force it to remain NULL until the channel is initialized.
2014-11-27 14:45:39 -05:00
curr_sess->res.analyse_exp ?
human_time(TICKS_TO_MS(curr_sess->res.analyse_exp - now_ms),
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
TICKS_TO_MS(1000)) : "");
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
conn = objt_conn(curr_sess->si[0].end);
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
" s0=[%d,%1xh,fd=%d,ex=%s]",
curr_sess->si[0].state,
curr_sess->si[0].flags,
DEBUG: connection: mark the closed FDs with a value that is easier to detect Setting an FD to -1 when closed isn't the most easily noticeable thing to do when we're chasing accidental reuse of a stale file descriptor. Instead set it to that large a negative value that it will overflow the fdtab and provide an analysable core at the moment the issue happens. Care was taken to ensure it doesn't overflow nor change sign on 32-bit machines when multiplied by fdtab, and that it also remains negative for the various checks that exist. The value equals 0xFDDEADFD which happens to be easily spotted in a debugger.
2016-11-17 08:22:52 -05:00
(conn && conn->t.sock.fd >= 0) ? conn->t.sock.fd : -1,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
curr_sess->si[0].exp ?
human_time(TICKS_TO_MS(curr_sess->si[0].exp - now_ms),
TICKS_TO_MS(1000)) : "");
MAJOR: stream-int: stop using si->conn and use si->end instead The connection will only remain there as a pre-allocated entity whose goal is to be placed in ->end when establishing an outgoing connection. All connection initialization can be made on this connection, but all information retrieved should be applied to the end point only. This change is huge because there were many users of si->conn. Now the only users are those who initialize the new connection. The difficulty appears in a few places such as backend.c, proto_http.c, peers.c where si->conn is used to hold the connection's target address before assigning the connection to the stream interface. This is why we have to keep si->conn for now. A future improvement might consist in dynamically allocating the connection when it is needed.
2013-10-01 04:45:07 -04:00
conn = objt_conn(curr_sess->si[1].end);
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
" s1=[%d,%1xh,fd=%d,ex=%s]",
curr_sess->si[1].state,
curr_sess->si[1].flags,
DEBUG: connection: mark the closed FDs with a value that is easier to detect Setting an FD to -1 when closed isn't the most easily noticeable thing to do when we're chasing accidental reuse of a stale file descriptor. Instead set it to that large a negative value that it will overflow the fdtab and provide an analysable core at the moment the issue happens. Care was taken to ensure it doesn't overflow nor change sign on 32-bit machines when multiplied by fdtab, and that it also remains negative for the various checks that exist. The value equals 0xFDDEADFD which happens to be easily spotted in a debugger.
2016-11-17 08:22:52 -05:00
(conn && conn->t.sock.fd >= 0) ? conn->t.sock.fd : -1,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
curr_sess->si[1].exp ?
human_time(TICKS_TO_MS(curr_sess->si[1].exp - now_ms),
TICKS_TO_MS(1000)) : "");
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
" exp=%s",
curr_sess->task->expire ?
human_time(TICKS_TO_MS(curr_sess->task->expire - now_ms),
TICKS_TO_MS(1000)) : "");
[OPTIM] task: don't unlink a task from a wait queue when waking it up In many situations, we wake a task on an I/O event, then queue it exactly where it was. This is a real waste because we delete/insert tasks into the wait queue for nothing. The only reason for this is that there was only one tree node in the task struct. By adding another tree node, we can have one tree for the timers (wait queue) and one tree for the priority (run queue). That way, we can have a task both in the run queue and wait queue at the same time. The wait queue now really holds timers, which is what it was designed for. The net gain is at least 1 delete/insert cycle per session, and up to 2-3 depending on the workload, since we save one cycle each time the expiration date is not changed during a wake up.
2009-03-07 11:25:21 -05:00
if (task_in_rq(curr_sess->task))
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, " run(nice=%d)", curr_sess->task->nice);
[MINOR] show sess: report a lot more information about sessions For complex troubleshooting, it's sometimes useful to be able to completely dump all the states and flags related to a session. Now "show sess" will report the stream interfaces and buffers status for each session.
2009-03-28 19:18:14 -04:00
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, "\n");
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* let's try again later from this stream. We add ourselves into
* this stream's users so that it can remove us upon termination.
[BUG] fix random memory corruption using "show sess" Commit 8a5c626e73bac905d150185e45110525588d7b4c introduced the sessions dump on the unix socket. This implementation is buggy because it may try to link to the sessions list's head after the last session is removed with a backref. Also, for the LIST_ISEMPTY test to succeed, we have to proceed with LIST_INIT after LIST_DEL.
2009-02-22 09:17:24 -05:00
*/
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
LIST_ADDQ(&curr_sess->back_refs, &appctx->ctx.sess.bref.users);
[MINOR] stats_dump_sess_to_buffer: use buffer_feed_chunk() same as previous patch for this function.
2009-10-03 17:55:14 -04:00
return 0;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
}
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
next_sess:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.bref.ref = curr_sess->list.n;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
}
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.sess.target && appctx->ctx.sess.target != (void *)-1) {
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
/* specified stream not found */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.sess.section > 0)
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, " *** session terminated while we were watching it ***\n");
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
else
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, "Session not found.\n");
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.sess.target = NULL;
appctx->ctx.sess.uid = 0;
[MINOR] stats socket: add show sess <id> to dump details about a session When trying to spot some complex bugs, it's often needed to access information on stuck sessions, which is quite difficult. This new command helps one get detailed information about a session, with flags, timers, states, etc... The buffer data are not dumped yet.
2010-03-05 11:53:32 -05:00
return 1;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_FIN;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
/* fall through */
default:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_FIN;
[MINOR] stats_dump_sess_to_buffer: use buffer_feed_chunk() same as previous patch for this function.
2009-10-03 17:55:14 -04:00
return 1;
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
}
}
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
/* This is called when the stream interface is closed. For instance, upon an
* external abort, we won't call the i/o handler anymore so we may need to
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
* remove back references to the stream currently being dumped.
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
*/
MEDIUM: applet: make the applet not depend on a stream interface anymore Now that applet's functions only take an appctx in argument, not a stream interface. This slightly simplifies the code and will be needed to take the appctx out of the stream interface.
2015-04-13 06:05:19 -04:00
static void cli_release_handler(struct appctx *appctx)
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
{
MINOR: cli: add private pointer and release function This pointer will be used for storing private context. With this, the same executed function can handle more than one keyword. This will be very useful for creation Lua cli bindings. The release function is called when the command is terminated (give back the hand to the prompt) or when the session is broken (timeout or client closed).
2016-11-12 04:51:33 -05:00
if (appctx->io_release) {
appctx->io_release(appctx);
appctx->io_release = NULL;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st0 == STAT_CLI_O_SESS && appctx->st2 == STAT_ST_LIST) {
if (!LIST_ISEMPTY(&appctx->ctx.sess.bref.users))
LIST_DEL(&appctx->ctx.sess.bref.users);
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
}
BUG/MINOR: cli: properly decrement ref count on tables during failed dumps Gernot Prner reported some constant leak of ref counts for stick tables entries. It happens that this leak was not at all in the regular traffic path but on the "show table" path. An extra ref count was taken during the dump if the output had to be paused, and it was released upon clean termination or an error detected in the I/O handler. But the release handler didn't do it, while it used to properly do it for the sessions dump. This fix needs to be backported to 1.6.
2016-11-18 13:17:40 -05:00
else if ((appctx->st0 == STAT_CLI_O_TAB || appctx->st0 == STAT_CLI_O_CLR) &&
appctx->st2 == STAT_ST_LIST) {
appctx->ctx.table.entry->ref_cnt--;
stksess_kill_if_expired(&appctx->ctx.table.proxy->table, appctx->ctx.table.entry);
}
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
else if (appctx->st0 == STAT_CLI_PRINT_FREE) {
free(appctx->ctx.cli.err);
CLEANUP: cli: ensure we can never double-free error messages The release handler used to be called twice for some time and just by pure luck we never ended up double-freeing the data there. Add a NULL to ensure this can never happen should a future change permit this situation again.
2015-10-07 14:00:24 -04:00
appctx->ctx.cli.err = NULL;
MEDIUM: dumpstats: Display error message during add of values. This patch adds new display type. This display returns allocated string, when the string is flush into buffers, it is freed. This permit to return the content of "memprintf(err, ...)" messages. The pat_ref_add functions has changed to return error.
2014-01-29 13:08:49 -05:00
}
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
else if (appctx->st0 == STAT_CLI_O_MLOOK) {
free(appctx->ctx.map.chunk.str);
CLEANUP: cli: ensure we can never double-free error messages The release handler used to be called twice for some time and just by pure luck we never ended up double-freeing the data there. Add a NULL to ensure this can never happen should a future change permit this situation again.
2015-10-07 14:00:24 -04:00
appctx->ctx.map.chunk.str = NULL;
MAJOR: pattern/map: Extends the map edition system in the patterns This patch add the following socket command line options: show acl [<id>] clear acl <id> get acl <id> <pattern> del acl <id> <pattern> add acl <id> <pattern> The system used for maps is backported in the pattern functions.
2014-02-11 05:31:40 -05:00
}
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
}
BUG/MINOR: cli: "clear table" did not work anymore without a key Will Glass-Husain reported this breakage which was caused by commit dec9814e merged in 1.5-dev12, and which was incomplete, resulting in both "clear table" and "show table" to do the same thing. No backport is needed.
2013-04-13 03:22:25 -04:00
/* This function is used to either dump tables states (when action is set
* to STAT_CLI_O_TAB) or clear tables (when action is STAT_CLI_O_CLR).
* It returns 0 if the output buffer is full and it needs to be called
* again, otherwise non-zero.
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
*/
BUG/MINOR: cli: "clear table" did not work anymore without a key Will Glass-Husain reported this breakage which was caused by commit dec9814e merged in 1.5-dev12, and which was incomplete, resulting in both "clear table" and "show table" to do the same thing. No backport is needed.
2013-04-13 03:22:25 -04:00
static int stats_table_request(struct stream_interface *si, int action)
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
REORG/MAJOR: session: rename the "session" entity to "stream" With HTTP/2, we'll have to support multiplexed streams. A stream is in fact the largest part of what we currently call a session, it has buffers, logs, etc. In order to catch any error, this commit removes any reference to the struct session and tries to rename most "session" occurrences in function names to "stream" and "sess" to "strm" when that's related to a session. The files stream.{c,h} were added and session.{c,h} removed. The session will be reintroduced later and a few parts of the stream will progressively be moved overthere. It will more or less contain only what we need in an embryonic session. Sample fetch functions and converters will have to change a bit so that they'll use an L5 (session) instead of what's currently called "L4" which is in fact L6 for now. Once all changes are completed, we should see approximately this : L7 - http_txn L6 - stream L5 - session L4 - connection | applet There will be at most one http_txn per stream, and a same session will possibly be referenced by multiple streams. A connection will point to a session and to a stream. The session will hold all the information we need to keep even when we don't yet have a stream. Some more cleanup is needed because some code was already far from being clean. The server queue management still refers to sessions at many places while comments talk about connections. This will have to be cleaned up once we have a server-side connection pool manager. Stream flags "SN_*" still need to be renamed, it doesn't seem like any of them will need to move to the session.
2015-04-02 18:22:06 -04:00
struct stream *s = si_strm(si);
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
struct ebmb_node *eb;
int dt;
BUILD: stdbool is not portable Benjamin Polidore reported a build issue on Solaris with gcc 4.2.4 where stdbool is not usable without c99. It only appeared at one location in dumpstats and is totally useless, let's use the more common and portable int as everywhere else.
2012-12-05 17:01:12 -05:00
int skip_entry;
BUG/MINOR: cli: "clear table" did not work anymore without a key Will Glass-Husain reported this breakage which was caused by commit dec9814e merged in 1.5-dev12, and which was incomplete, resulting in both "clear table" and "show table" to do the same thing. No backport is needed.
2013-04-13 03:22:25 -04:00
int show = action == STAT_CLI_O_TAB;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
/*
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
* We have 3 possible states in appctx->st2 :
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
* - STAT_ST_INIT : the first call
* - STAT_ST_INFO : the proxy pointer points to the next table to
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
* dump, the entry pointer is NULL ;
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
* - STAT_ST_LIST : the proxy pointer points to the current table
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
* and the entry pointer points to the next entry to be dumped,
* and the refcount on the next entry is held ;
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
* - STAT_ST_END : nothing left to dump, the buffer may contain some
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
* data though.
*/
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW))) {
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
/* in case of abort, remove any refcount we might have set on an entry */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->st2 == STAT_ST_LIST) {
appctx->ctx.table.entry->ref_cnt--;
stksess_kill_if_expired(&appctx->ctx.table.proxy->table, appctx->ctx.table.entry);
[MEDIUM] session counters: automatically remove expired entries. When a ref_cnt goes down to zero and the entry is expired, remove it.
2010-08-03 14:34:06 -04:00
}
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
return 1;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_reset(&trash);
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
while (appctx->st2 != STAT_ST_FIN) {
switch (appctx->st2) {
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_INIT:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.proxy = appctx->ctx.table.target;
if (!appctx->ctx.table.proxy)
appctx->ctx.table.proxy = proxy;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.entry = NULL;
appctx->st2 = STAT_ST_INFO;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_INFO:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!appctx->ctx.table.proxy ||
(appctx->ctx.table.target &&
appctx->ctx.table.proxy != appctx->ctx.table.target)) {
appctx->st2 = STAT_ST_END;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.table.proxy->table.size) {
if (show && !stats_dump_table_head_to_buffer(&trash, si, appctx->ctx.table.proxy,
appctx->ctx.table.target))
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
return 0;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.table.target &&
MINOR: stream: provide a few helpers to retrieve frontend, listener and origin Expressions are quite long when using strm_sess(strm)->whatever, so let's provide a few helpers : strm_fe(), strm_li(), strm_orig().
2015-04-03 20:10:38 -04:00
strm_li(s)->bind_conf->level >= ACCESS_LVL_OPER) {
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
/* dump entries only if table explicitly requested */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
eb = ebmb_first(&appctx->ctx.table.proxy->table.keys);
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
if (eb) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.entry = ebmb_entry(eb, struct stksess, key);
appctx->ctx.table.entry->ref_cnt++;
appctx->st2 = STAT_ST_LIST;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
}
}
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.proxy = appctx->ctx.table.proxy->next;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_LIST:
BUILD: stdbool is not portable Benjamin Polidore reported a build issue on Solaris with gcc 4.2.4 where stdbool is not usable without c99. It only appeared at one location in dumpstats and is totally useless, let's use the more common and portable int as everywhere else.
2012-12-05 17:01:12 -05:00
skip_entry = 0;
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.table.data_type >= 0) {
[MEDIUM] stats: add the ability to dump table entries matching criteria It is now possible to dump some select table entries based on criteria which apply to the stored data. This is enabled by appending the following options to the end of the "show table" statement : data.<data_type> {eq|ne|lt|gt|le|ge} <value> For intance : show table http_proxy data.conn_rate gt 5 show table http_proxy data.gpc0 ne 0 The compare applies to the integer value as it would be displayed, and operates on signed long long integers.
2010-07-18 05:46:20 -04:00
/* we're filtering on some data contents */
void *ptr;
long long data;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
dt = appctx->ctx.table.data_type;
ptr = stktable_data_ptr(&appctx->ctx.table.proxy->table,
appctx->ctx.table.entry,
[MEDIUM] stats: add the ability to dump table entries matching criteria It is now possible to dump some select table entries based on criteria which apply to the stored data. This is enabled by appending the following options to the end of the "show table" statement : data.<data_type> {eq|ne|lt|gt|le|ge} <value> For intance : show table http_proxy data.conn_rate gt 5 show table http_proxy data.gpc0 ne 0 The compare applies to the integer value as it would be displayed, and operates on signed long long integers.
2010-07-18 05:46:20 -04:00
dt);
data = 0;
switch (stktable_data_types[dt].std_type) {
case STD_T_SINT:
data = stktable_data_cast(ptr, std_t_sint);
break;
case STD_T_UINT:
data = stktable_data_cast(ptr, std_t_uint);
break;
case STD_T_ULL:
data = stktable_data_cast(ptr, std_t_ull);
break;
case STD_T_FRQP:
data = read_freq_ctr_period(&stktable_data_cast(ptr, std_t_frqp),
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.proxy->table.data_arg[dt].u);
[MEDIUM] stats: add the ability to dump table entries matching criteria It is now possible to dump some select table entries based on criteria which apply to the stored data. This is enabled by appending the following options to the end of the "show table" statement : data.<data_type> {eq|ne|lt|gt|le|ge} <value> For intance : show table http_proxy data.conn_rate gt 5 show table http_proxy data.gpc0 ne 0 The compare applies to the integer value as it would be displayed, and operates on signed long long integers.
2010-07-18 05:46:20 -04:00
break;
}
/* skip the entry if the data does not match the test and the value */
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if ((data < appctx->ctx.table.value &&
(appctx->ctx.table.data_op == STD_OP_EQ ||
appctx->ctx.table.data_op == STD_OP_GT ||
appctx->ctx.table.data_op == STD_OP_GE)) ||
(data == appctx->ctx.table.value &&
(appctx->ctx.table.data_op == STD_OP_NE ||
appctx->ctx.table.data_op == STD_OP_GT ||
appctx->ctx.table.data_op == STD_OP_LT)) ||
(data > appctx->ctx.table.value &&
(appctx->ctx.table.data_op == STD_OP_EQ ||
appctx->ctx.table.data_op == STD_OP_LT ||
appctx->ctx.table.data_op == STD_OP_LE)))
BUILD: stdbool is not portable Benjamin Polidore reported a build issue on Solaris with gcc 4.2.4 where stdbool is not usable without c99. It only appeared at one location in dumpstats and is totally useless, let's use the more common and portable int as everywhere else.
2012-12-05 17:01:12 -05:00
skip_entry = 1;
[MEDIUM] stats: add the ability to dump table entries matching criteria It is now possible to dump some select table entries based on criteria which apply to the stored data. This is enabled by appending the following options to the end of the "show table" statement : data.<data_type> {eq|ne|lt|gt|le|ge} <value> For intance : show table http_proxy data.conn_rate gt 5 show table http_proxy data.gpc0 ne 0 The compare applies to the integer value as it would be displayed, and operates on signed long long integers.
2010-07-18 05:46:20 -04:00
}
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
if (show && !skip_entry &&
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
!stats_dump_table_entry_to_buffer(&trash, si, appctx->ctx.table.proxy,
appctx->ctx.table.entry))
[MINOR] Break out dumping table This will allow the code to be reused for showing a table filtered by key Signed-off-by: Simon Horman <horms@verge.net.au>
2011-06-15 02:18:45 -04:00
return 0;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.entry->ref_cnt--;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
eb = ebmb_next(&appctx->ctx.table.entry->key);
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
if (eb) {
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct stksess *old = appctx->ctx.table.entry;
appctx->ctx.table.entry = ebmb_entry(eb, struct stksess, key);
BUG/MINOR: cli: correctly remove the whole table on "clear table" Joe Price reported that "clear table xxx" sent on the CLI would only clear the last entry. This is true, some code was missing to remove an entry from within the loop, and only the final condition was able to remove an entry. The fix is obvious. No backport is needed.
2012-01-09 05:50:03 -05:00
if (show)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
stksess_kill_if_expired(&appctx->ctx.table.proxy->table, old);
else if (!skip_entry && !appctx->ctx.table.entry->ref_cnt)
stksess_kill(&appctx->ctx.table.proxy->table, old);
appctx->ctx.table.entry->ref_cnt++;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
}
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
if (show)
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
stksess_kill_if_expired(&appctx->ctx.table.proxy->table, appctx->ctx.table.entry);
else if (!skip_entry && !appctx->ctx.table.entry->ref_cnt)
stksess_kill(&appctx->ctx.table.proxy->table, appctx->ctx.table.entry);
[MINOR] More flexible clearing of stick table * Allow clearing of all entries of a table * Allow clearing of all entries of a table that match a data filter
2011-06-15 02:18:49 -04:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.table.proxy = appctx->ctx.table.proxy->next;
appctx->st2 = STAT_ST_INFO;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
[REORG] session: move the data_ctx struct to the stream interface's applet This is in fact where those parts belong to. The old data_state was replaced by applet.state and is now initialized when the applet is registered. It's worth noting that the applet does not need to know the session nor the buffer anymore since everything is brought by the stream interface. It is possible that having a separate applet struct would simplify the code but that's not a big deal.
2011-03-10 05:25:07 -05:00
case STAT_ST_END:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->st2 = STAT_ST_FIN;
[MEDIUM] stats: add "show table [<name>]" to dump a stick-table It is now possible to dump a table's contents with keys, expire, use count, and various data using the command above on the stats socket. "show table" only shows main table stats, while "show table <name>" dumps table contents, only if the socket level is admin.
2010-07-12 11:55:33 -04:00
break;
}
}
return 1;
}
[MINOR] stats: make the data dump function reusable for other purposes The dump_error_line() function was limited to dump error buffers while it's perfectly suitable to dump anything else.
2010-03-05 08:58:26 -05:00
/* print a line of text buffer (limited to 70 bytes) to <out>. The format is :
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
* <2 spaces> <offset=5 digits> <space or plus> <space> <70 chars max> <\n>
* which is 60 chars per line. Non-printable chars \t, \n, \r and \e are
* encoded in C format. Other non-printable chars are encoded "\xHH". Original
* lines are respected within the limit of 70 output chars. Lines that are
* continuation of a previous truncated line begin with "+" instead of " "
* after the offset. The new pointer is returned.
*/
[MINOR] stats: make the data dump function reusable for other purposes The dump_error_line() function was limited to dump error buffers while it's perfectly suitable to dump anything else.
2010-03-05 08:58:26 -05:00
static int dump_text_line(struct chunk *out, const char *buf, int bsize, int len,
int *line, int ptr)
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
{
int end;
unsigned char c;
end = out->len + 80;
[MAJOR] struct chunk rework Add size to struct chunk and simplify the code as there is no longer required to pass sizeof in chunk_printf().
2009-09-27 07:23:20 -04:00
if (end > out->size)
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
return ptr;
CLEANUP: replace chunk_printf() with chunk_appendf() This function's naming was misleading as it is used to append data at the end of a string, causing some surprizes when used for the first time! Add a chunk_printf() function which does what its name suggests.
2012-10-29 11:14:26 -04:00
chunk_appendf(out, " %05d%c ", ptr, (ptr == *line) ? ' ' : '+');
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
[MINOR] stats: make the data dump function reusable for other purposes The dump_error_line() function was limited to dump error buffers while it's perfectly suitable to dump anything else.
2010-03-05 08:58:26 -05:00
while (ptr < len && ptr < bsize) {
c = buf[ptr];
[MINOR] show errors: encode backslash as well as non-ascii characters These ones were not properly encoded, causing confusion on the output.
2009-03-12 03:18:33 -04:00
if (isprint(c) && isascii(c) && c != '\\') {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
if (out->len > end - 2)
break;
out->str[out->len++] = c;
[MINOR] show errors: encode backslash as well as non-ascii characters These ones were not properly encoded, causing confusion on the output.
2009-03-12 03:18:33 -04:00
} else if (c == '\t' || c == '\n' || c == '\r' || c == '\e' || c == '\\') {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
if (out->len > end - 3)
break;
out->str[out->len++] = '\\';
switch (c) {
case '\t': c = 't'; break;
case '\n': c = 'n'; break;
case '\r': c = 'r'; break;
case '\e': c = 'e'; break;
[MINOR] show errors: encode backslash as well as non-ascii characters These ones were not properly encoded, causing confusion on the output.
2009-03-12 03:18:33 -04:00
case '\\': c = '\\'; break;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
out->str[out->len++] = c;
} else {
if (out->len > end - 5)
break;
out->str[out->len++] = '\\';
out->str[out->len++] = 'x';
out->str[out->len++] = hextab[(c >> 4) & 0xF];
out->str[out->len++] = hextab[c & 0xF];
}
[MINOR] stats: make the data dump function reusable for other purposes The dump_error_line() function was limited to dump error buffers while it's perfectly suitable to dump anything else.
2010-03-05 08:58:26 -05:00
if (buf[ptr++] == '\n') {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* we had a line break, let's return now */
out->str[out->len++] = '\n';
*line = ptr;
return ptr;
}
}
/* we have an incomplete line, we return it as-is */
out->str[out->len++] = '\n';
return ptr;
}
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
/* This function dumps counters from all resolvers section and associated name servers.
* It returns 0 if the output buffer is full and it needs
* to be called again, otherwise non-zero.
*/
static int stats_dump_resolvers_to_buffer(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);
struct dns_resolvers *presolvers;
struct dns_nameserver *pnameserver;
chunk_reset(&trash);
switch (appctx->st2) {
case STAT_ST_INIT:
appctx->st2 = STAT_ST_LIST; /* let's start producing data */
/* fall through */
case STAT_ST_LIST:
MINOR: cli: Dump all resolvers stats if no resolver section is given This commit adds support for dumping all resolver stats. Specifically if a command 'show stats resolvers' is issued withOUT a resolver section id, we dump all known resolver sections. If none are configured, a message is displayed indicating that.
2015-10-02 16:33:01 -04:00
if (LIST_ISEMPTY(&dns_resolvers)) {
chunk_appendf(&trash, "No resolvers found\n");
}
else {
list_for_each_entry(presolvers, &dns_resolvers, list) {
if (appctx->ctx.resolvers.ptr != NULL && appctx->ctx.resolvers.ptr != presolvers)
continue;
chunk_appendf(&trash, "Resolvers section %s\n", presolvers->id);
list_for_each_entry(pnameserver, &presolvers->nameserver_list, list) {
chunk_appendf(&trash, " nameserver %s:\n", pnameserver->id);
chunk_appendf(&trash, " sent: %ld\n", pnameserver->counters.sent);
chunk_appendf(&trash, " valid: %ld\n", pnameserver->counters.valid);
chunk_appendf(&trash, " update: %ld\n", pnameserver->counters.update);
chunk_appendf(&trash, " cname: %ld\n", pnameserver->counters.cname);
chunk_appendf(&trash, " cname_error: %ld\n", pnameserver->counters.cname_error);
chunk_appendf(&trash, " any_err: %ld\n", pnameserver->counters.any_err);
chunk_appendf(&trash, " nx: %ld\n", pnameserver->counters.nx);
chunk_appendf(&trash, " timeout: %ld\n", pnameserver->counters.timeout);
chunk_appendf(&trash, " refused: %ld\n", pnameserver->counters.refused);
chunk_appendf(&trash, " other: %ld\n", pnameserver->counters.other);
chunk_appendf(&trash, " invalid: %ld\n", pnameserver->counters.invalid);
chunk_appendf(&trash, " too_big: %ld\n", pnameserver->counters.too_big);
chunk_appendf(&trash, " truncated: %ld\n", pnameserver->counters.truncated);
chunk_appendf(&trash, " outdated: %ld\n", pnameserver->counters.outdated);
}
}
MINOR: dns: add DNS statistics add a new command on the stats socket to print a DNS resolvers section (including per server) statistics: "show stats resolvers <id>"
2015-05-16 18:33:24 -04:00
}
/* display response */
if (bi_putchk(si_ic(si), &trash) == -1) {
/* let's try again later from this session. We add ourselves into
* this session's users so that it can remove us upon termination.
*/
si->flags |= SI_FL_WAIT_ROOM;
return 0;
}
appctx->st2 = STAT_ST_FIN;
/* fall through */
default:
appctx->st2 = STAT_ST_FIN;
return 1;
}
}
REORG: connection: rename the data layer the "transport layer" While working on the changes required to make the health checks use the new connections, it started to become obvious that some naming was not logical at all in the connections. Specifically, it is not logical to call the "data layer" the layer which is in charge for all the handshake and which does not yet provide a data layer once established until a session has allocated all the required buffers. In fact, it's more a transport layer, which makes much more sense. The transport layer offers a medium on which data can transit, and it offers the functions to move these data when the upper layer requests this. And it is the upper layer which iterates over the transport layer's functions to move data which should be called the data layer. The use case where it's obvious is with embryonic sessions : an incoming SSL connection is accepted. Only the connection is allocated, not the buffers nor stream interface, etc... The connection handles the SSL handshake by itself. Once this handshake is complete, we can't use the data functions because the buffers and stream interface are not there yet. Hence we have to first call a specific function to complete the session initialization, after which we'll be able to use the data functions. This clearly proves that SSL here is only a transport layer and that the stream interface constitutes the data layer. A similar change will be performed to rename app_cb => data, but the two could not be in the same commit for obvious reasons.
2012-10-02 18:19:48 -04:00
/* This function dumps all captured errors onto the stream interface's
MEDIUM: stats: don't use conn->xprt_ctx anymore This field was used by dumpstats to retrieve a pointer to the current session, which may already be found from ->owner. With this change, the stats code doesn't need the connection at all anymore.
2013-07-08 09:53:06 -04:00
* read buffer. It returns 0 if the output buffer is full and it needs
[CLEANUP] stats: make all dump functions only rely on the stream interface This will be needed to move the applet-specific data out of the session.
2011-02-13 09:27:22 -05:00
* to be called again, otherwise non-zero.
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
*/
[CLEANUP] dumpstats: make symbols static where possible
2011-06-15 02:18:44 -04:00
static int stats_dump_errors_to_buffer(struct stream_interface *si)
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
{
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
struct appctx *appctx = __objt_appctx(si->end);
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
extern const char *monthname[12];
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 1;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_reset(&trash);
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (!appctx->ctx.errors.px) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* the function had not been called yet, let's prepare the
* buffer for a response.
*/
[MINOR] stats: add global event ID and count This counter will help quickly spot whether there are new errors or not. It is also assigned to each capture so that a script can keep trace of which capture was taken when.
2010-12-12 08:00:34 -05:00
struct tm tm;
get_localtime(date.tv_sec, &tm);
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, "Total events captured on [%02d/%s/%04d:%02d:%02d:%02d.%03d] : %u\n",
[MINOR] stats: add global event ID and count This counter will help quickly spot whether there are new errors or not. It is also assigned to each capture so that a script can keep trace of which capture was taken when.
2010-12-12 08:00:34 -05:00
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(date.tv_usec/1000),
error_snapshot_id);
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
[MINOR] stats: add global event ID and count This counter will help quickly spot whether there are new errors or not. It is also assigned to each capture so that a script can keep trace of which capture was taken when.
2010-12-12 08:00:34 -05:00
/* Socket buffer full. Let's try again later from the same point */
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats: add global event ID and count This counter will help quickly spot whether there are new errors or not. It is also assigned to each capture so that a script can keep trace of which capture was taken when.
2010-12-12 08:00:34 -05:00
return 0;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.px = proxy;
appctx->ctx.errors.buf = 0;
appctx->ctx.errors.bol = 0;
appctx->ctx.errors.ptr = -1;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
/* we have two inner loops here, one for the proxy, the other one for
* the buffer.
*/
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
while (appctx->ctx.errors.px) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
struct error_snapshot *es;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.errors.buf == 0)
es = &appctx->ctx.errors.px->invalid_req;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
else
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
es = &appctx->ctx.errors.px->invalid_rep;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
if (!es->when.tv_sec)
goto next;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.errors.iid >= 0 &&
appctx->ctx.errors.px->uuid != appctx->ctx.errors.iid &&
es->oe->uuid != appctx->ctx.errors.iid)
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
goto next;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.errors.ptr < 0) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* just print headers now */
char pn[INET6_ADDRSTRLEN];
struct tm tm;
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
int port;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
get_localtime(es->when.tv_sec, &tm);
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash, " \n[%02d/%s/%04d:%02d:%02d:%02d.%03d]",
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
tm.tm_mday, monthname[tm.tm_mon], tm.tm_year+1900,
[MINOR] fix several printf formats and missing arguments Last patch revealed a number of mistakes in printf-like calls, mostly int/long mismatches, and a few missing arguments.
2009-04-03 08:49:12 -04:00
tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(es->when.tv_usec/1000));
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
switch (addr_to_str(&es->src, pn, sizeof(pn))) {
case AF_INET:
case AF_INET6:
port = get_host_port(&es->src);
break;
default:
port = 0;
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
switch (appctx->ctx.errors.buf) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
case 0:
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
" frontend %s (#%d): invalid request\n"
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
" backend %s (#%d)",
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.px->id, appctx->ctx.errors.px->uuid,
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
(es->oe->cap & PR_CAP_BE) ? es->oe->id : "<NONE>",
(es->oe->cap & PR_CAP_BE) ? es->oe->uuid : -1);
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
break;
case 1:
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MINOR: stats: fix minor typo fix in stats_dump_errors_to_buffer() Remove the space before the colon to match the format used in the frontend.
2014-09-08 05:23:00 -04:00
" backend %s (#%d): invalid response\n"
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
" frontend %s (#%d)",
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.px->id, appctx->ctx.errors.px->uuid,
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
es->oe->id, es->oe->uuid);
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
break;
}
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
MEDIUM: http: improve error capture reports A number of important information were missing from the error captures, so let's improve them. Now we also log source port, session flags, transaction flags, message flags, pending output bytes, expected buffer wrapping position, total bytes transferred, message chunk length, and message body length. As such, the output format has slightly evolved and the source address moved to the third line : [08/May/2012:11:14:36.341] frontend echo (#1): invalid request backend echo (#1), server <NONE> (#-1), event #1 src 127.0.0.1:40616, session #4, session flags 0x00000000 HTTP msg state 26, msg flags 0x00000000, tx flags 0x00000000 HTTP chunk len 0 bytes, HTTP body len 0 bytes buffer flags 0x00909002, out 0 bytes, total 28 bytes pending 28 bytes, wrapping at 8030, error at position 7: 00000 GET / /?t=20000 HTTP/1.1\r\n 00026 \r\n [08/May/2012:11:13:13.426] backend echo (#1) : invalid response frontend echo (#1), server local (#1), event #0 src 127.0.0.1:40615, session #1, session flags 0x0000044e HTTP msg state 32, msg flags 0x0000000e, tx flags 0x08200000 HTTP chunk len 0 bytes, HTTP body len 20 bytes buffer flags 0x00008002, out 81 bytes, total 92 bytes pending 11 bytes, wrapping at 7949, error at position 9: 00000 Foo: bar\r\r\n
2012-05-08 05:03:10 -04:00
", server %s (#%d), event #%u\n"
" src %s:%d, session #%d, session flags 0x%08x\n"
" HTTP msg state %d, msg flags 0x%08x, tx flags 0x%08x\n"
" HTTP chunk len %lld bytes, HTTP body len %lld bytes\n"
" buffer flags 0x%08x, out %d bytes, total %lld bytes\n"
" pending %d bytes, wrapping at %d, error at position %d:\n \n",
es->srv ? es->srv->id : "<NONE>", es->srv ? es->srv->puid : -1,
es->ev_id,
pn, port, es->sid, es->s_flags,
es->state, es->m_flags, es->t_flags,
es->m_clen, es->m_blen,
es->b_flags, es->b_out, es->b_tot,
es->len, es->b_wrap, es->pos);
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* Socket buffer full. Let's try again later from the same point */
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 0;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.ptr = 0;
appctx->ctx.errors.sid = es->sid;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (appctx->ctx.errors.sid != es->sid) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* the snapshot changed while we were dumping it */
MEDIUM: make the trash be a chunk instead of a char * The trash is used everywhere to store the results of temporary strings built out of s(n)printf, or as a storage for a chunk when chunks are needed. Using global.tune.bufsize is not the most convenient thing either. So let's replace trash with a chunk and directly use it as such. We can then use trash.size as the natural way to get its size, and get rid of many intermediary chunks that were previously used. The patch is huge because it touches many areas but it makes the code a lot more clear and even outlines places where trash was used without being that obvious.
2012-10-29 11:51:55 -04:00
chunk_appendf(&trash,
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
" WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n");
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
if (bi_putchk(si_ic(si), &trash) == -1) {
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 0;
MEDIUM: channel: don't always set CF_WAKE_WRITE on bi_put* It was inappropriate to put this flag on every failed write into an input buffer because it depends where it happens. When it's in the context of an analyser (eg: hlua) it makes sense. When it's in the context of an applet (eg: dumpstats), it does not make sense, and it only happens to work because currently applets are scheduled by the sessions. The proper solution for applets would be to add the flag SI_FL_WAIT_ROOM on the stream interface. Thus, we now don't set any flag anymore in bi_put* and it's up to the caller to either set CF_WAKE_WRITE on the channel or SI_FL_WAIT_ROOM on the stream interface. Changes were applied to hlua, peers and dumpstats.
2015-03-13 09:00:47 -04:00
}
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
goto next;
}
/* OK, ptr >= 0, so we have to dump the current line */
MEDIUM: proxy: use dynamic allocation for error dumps There are two issues with error captures. The first one is that the capture size is still hard-coded to BUFSIZE regardless of any possible tune.bufsize setting and of the fact that frontends only capture request errors and that backends only capture response errors. The second is that captures are allocated in both directions for all proxies, which start to count a lot in configs using thousands of proxies. This patch changes this so that error captures are allocated only when needed, and of the proper size. It also refrains from dumping a buffer that was not allocated, which still allows to emit all relevant info such as flags and HTTP states. This way it is possible to save up to 32 kB of RAM per proxy in the default configuration.
2016-03-31 07:45:10 -04:00
while (es->buf && appctx->ctx.errors.ptr < es->len && appctx->ctx.errors.ptr < global.tune.bufsize) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
int newptr;
int newline;
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
newline = appctx->ctx.errors.bol;
MEDIUM: proxy: use dynamic allocation for error dumps There are two issues with error captures. The first one is that the capture size is still hard-coded to BUFSIZE regardless of any possible tune.bufsize setting and of the fact that frontends only capture request errors and that backends only capture response errors. The second is that captures are allocated in both directions for all proxies, which start to count a lot in configs using thousands of proxies. This patch changes this so that error captures are allocated only when needed, and of the proper size. It also refrains from dumping a buffer that was not allocated, which still allows to emit all relevant info such as flags and HTTP states. This way it is possible to save up to 32 kB of RAM per proxy in the default configuration.
2016-03-31 07:45:10 -04:00
newptr = dump_text_line(&trash, es->buf, global.tune.bufsize, es->len, &newline, appctx->ctx.errors.ptr);
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
if (newptr == appctx->ctx.errors.ptr)
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 0;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
REORG/MEDIUM: stream-int: introduce si_ic/si_oc to access channels We'll soon remove direct references to the channels from the stream interface since everything belongs to the same session, so let's first not dereference si->ib / si->ob anymore and use macros instead.
2014-11-28 05:11:05 -05:00
if (bi_putchk(si_ic(si), &trash) == -1) {
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
/* Socket buffer full. Let's try again later from the same point */
MEDIUM: applet: make the applets only use si_applet_{cant|want|stop}_{get|put} The applets don't fiddle with SI_FL_WAIT_ROOM anymore, instead they indicate what they want, possibly that they failed (eg: WAIT_ROOM), and it's done() / update() which finally updates the WAIT_* flags according to the channels' and stream interface's states. This solves the issue of the pauses during a "show sess" without creating busy loops.
2015-04-21 13:23:39 -04:00
si_applet_cant_put(si);
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 0;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.ptr = newptr;
appctx->ctx.errors.bol = newline;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
};
next:
MEDIUM: stream-int: replace occurrences of si->appctx with si_appctx() We're about to remove si->appctx, so first let's replace all occurrences of its usage with a dynamic extract from si->end. A lot of code was changed by search-n-replace, but the behaviour was intentionally not altered. The code surrounding calls to stream_int_register_handler() was slightly changed since we can only use si->end *after* the registration.
2013-12-01 03:15:12 -05:00
appctx->ctx.errors.bol = 0;
appctx->ctx.errors.ptr = -1;
appctx->ctx.errors.buf++;
if (appctx->ctx.errors.buf > 1) {
appctx->ctx.errors.buf = 0;
appctx->ctx.errors.px = appctx->ctx.errors.px->next;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
}
/* dump complete */
[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk() We can simplify the code in the stats functions using buffer_feed_chunk() instead of buffer_write_chunk(). Let's start with this function. This patch also fixed an issue where we could dump past the end of the capture buffer if it is shorter than the captured request.
2009-10-03 17:49:35 -04:00
return 1;
[MEDIUM] implement error dump on unix socket with "show errors" The new "show errors" command sent on a unix socket will dump all captured request and response errors for all proxies. It is also possible to bound the log to frontends and backends whose ID is passed as an optional parameter. The output provides information about frontend, backend, server, session ID, source address, error type, and error position along with a complete dump of the request or response which has caused the error. If a new error scratches the one currently being reported, then the dump is aborted with a warning message, and processing goes on to next error.
2009-03-04 09:53:18 -05:00
}
MINOR: cli: add a new "show env" command Using environment variables in configuration files can make troubleshooting complicated because there's no easy way to verify that the variables are correct. This patch introduces a new "show env" command which displays the whole environment on the CLI, one variable per line. The socket must at least have level operator to display the environment.
2016-02-16 05:27:28 -05:00
/* This function dumps all environmnent variables to the buffer. It returns 0
* if the output buffer is full and it needs to be called again, otherwise
* non-zero. Dumps only one entry if st2 == STAT_ST_END.
*/
static int stats_dump_env_to_buffer(struct stream_interface *si)
{
struct appctx *appctx = __objt_appctx(si->end);
if (unlikely(si_ic(si)->flags & (CF_WRITE_ERROR|CF_SHUTW)))
return 1;
chunk_reset(&trash);
/* we have two inner loops here, one for the proxy, the other one for
* the buffer.
*/
while (*appctx->ctx.env.var) {
chunk_printf(&trash, "%s\n", *appctx->ctx.env.var);
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
if (appctx->st2 == STAT_ST_END)
break;
appctx->ctx.env.var++;
}
/* dump complete */
return 1;
}
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
/* parse the "level" argument on the bind lines */
static int bind_parse_level(char **args, int cur_arg, struct proxy *px, struct bind_conf *conf, char **err)
{
if (!*args[cur_arg + 1]) {
memprintf(err, "'%s' : missing level", args[cur_arg]);
return ERR_ALERT | ERR_FATAL;
}
if (!strcmp(args[cur_arg+1], "user"))
conf->level = ACCESS_LVL_USER;
else if (!strcmp(args[cur_arg+1], "operator"))
conf->level = ACCESS_LVL_OPER;
else if (!strcmp(args[cur_arg+1], "admin"))
conf->level = ACCESS_LVL_ADMIN;
else {
memprintf(err, "'%s' only supports 'user', 'operator', and 'admin' (got '%s')",
args[cur_arg], args[cur_arg+1]);
return ERR_ALERT | ERR_FATAL;
}
return 0;
}
CLEANUP: applet: rename struct si_applet to applet Since this one does not depend on stream_interface anymore, remove the "si_" prefix.
2015-04-13 07:50:30 -04:00
static struct applet cli_applet = {
MAJOR: connection: replace struct target with a pointer to an enum Instead of storing a couple of (int, ptr) in the struct connection and the struct session, we use a different method : we only store a pointer to an integer which is stored inside the target object and which contains a unique type identifier. That way, the pointer allows us to retrieve the object type (by dereferencing it) and the object's address (by computing the displacement in the target structure). The NULL pointer always corresponds to OBJ_TYPE_NONE. This reduces the size of the connection and session structs. It also simplifies target assignment and compare. In order to improve the generated code, we try to put the obj_type element at the beginning of all the structs (listener, server, proxy, si_applet), so that the original and target pointers are always equal. A lot of code was touched by massive replaces, but the changes are not that important.
2012-11-11 18:42:33 -05:00
.obj_type = OBJ_TYPE_APPLET,
[MINOR] stream_interface: make use of an applet descriptor for IO handlers I/O handlers are still delicate to manipulate. They have no type, they're just raw functions which have no knowledge of themselves. Let's have them declared as applets once for all. That way we can have multiple applets share the same handler functions and we can store their names there. When we later need to add more parameters (eg: usage stats), we'll be able to do so in the applets themselves. The CLI functions has been prefixed with "cli" instead of "stats" as it's clearly what is going on there. The applet descriptor in the stream interface should get all the applet specific data (st0, ...) but this will be done in the next patch so that we don't pollute this one too much.
2011-02-13 07:16:36 -05:00
.name = "<CLI>", /* used for logging */
.fct = cli_io_handler,
BUG/MAJOR: cli: show sess <id> may randomly corrupt the back-ref list show sess <id> puts a backref into the session it's dumping. If the output is interrupted, the backref cannot always be removed because it's only done in the I/O handler. This can randomly corrupt the backref list when the session closes, because it passes the pointer to the next session which itself might be watched. The case is hard to reproduce (hundreds of attempts) but monitoring systems might encounter it frequently. Thus we have to add a release handler which does the cleanup even when the I/O handler is not called. This issue should also be present in 1.4 so the patch should be backported.
2012-11-25 20:22:40 -05:00
.release = cli_release_handler,
[MINOR] stream_interface: make use of an applet descriptor for IO handlers I/O handlers are still delicate to manipulate. They have no type, they're just raw functions which have no knowledge of themselves. Let's have them declared as applets once for all. That way we can have multiple applets share the same handler functions and we can store their names there. When we later need to add more parameters (eg: usage stats), we'll be able to do so in the applets themselves. The CLI functions has been prefixed with "cli" instead of "stats" as it's clearly what is going on there. The applet descriptor in the stream interface should get all the applet specific data (st0, ...) but this will be done in the next patch so that we don't pollute this one too much.
2011-02-13 07:16:36 -05:00
};
[MEDIUM] add support for "show sess" in unix stats socket It is now possible to list all known sessions by issuing "show sess" on the unix stats socket. The format is not much evolved but it is very useful for debugging. The doc has been updated to reflect the new keyword.
2008-12-07 16:29:48 -05:00
BUG/MEDIUM: prevent gcc from moving empty keywords lists into BSS Benoit Dolez reported a failure to start haproxy 1.5-dev19. The process would immediately report an internal error with missing fetches from some crap instead of ACL names. The cause is that some versions of gcc seem to trim static structs containing a variable array when moving them to BSS, and only keep the fixed size, which is just a list head for all ACL and sample fetch keywords. This was confirmed at least with gcc 3.4.6. And we can't move these structs to const because they contain a list element which is needed to link all of them together during the parsing. The bug indeed appeared with 1.5-dev19 because it's the first one to have some empty ACL keyword lists. One solution is to impose -fno-zero-initialized-in-bss to everyone but this is not really nice. Another solution consists in ensuring the struct is never empty so that it does not move there. The easy solution consists in having a non-null list head since it's not yet initialized. A new "ILH" list head type was thus created for this purpose : create an Initialized List Head so that gcc cannot move the struct to BSS. This fixes the issue for this version of gcc and does not create any burden for the declarations.
2013-06-21 17:16:39 -04:00
static struct cfg_kw_list cfg_kws = {ILH, {
[MEDIUM] modularize the global "stats" keyword configuration parser The "stats" keyword already relied on an external parser, let's make use of the new keyword registration mechanism.
2008-07-09 14:12:41 -04:00
{ CFG_GLOBAL, "stats", stats_parse_global },
{ 0, NULL, NULL },
}};
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
static struct bind_kw_list bind_kws = { "STAT", { }, {
{ "level", bind_parse_level, 1 }, /* set the unix socket admin level */
{ NULL, NULL, 0 },
}};
[MEDIUM] modularize the global "stats" keyword configuration parser The "stats" keyword already relied on an external parser, let's make use of the new keyword registration mechanism.
2008-07-09 14:12:41 -04:00
__attribute__((constructor))
static void __dumpstats_module_init(void)
{
cfg_register_keywords(&cfg_kws);
MEDIUM: stats: make use of the standard "bind" parsers to parse global socket The global stats socket statement now makes use of the standard bind parsers. This results in all UNIX socket options being set by proto_uxst and in all TCP and SSL options being inherited and usable. For example it is now possible to enable a stats socket over SSL/TCP by appending the "ssl" keyword and a certificate after "crt". The code is simplified since we don't have a special case to parse this config keyword anymore.
2012-09-22 13:32:35 -04:00
bind_register_keywords(&bind_kws);
[MEDIUM] modularize the global "stats" keyword configuration parser The "stats" keyword already relied on an external parser, let's make use of the new keyword registration mechanism.
2008-07-09 14:12:41 -04:00
}
[MEDIUM] moved stats and buffer generic functions to new files Neither the primitives used to write data to a buffer, nor the stats dump functions are HTTP-specific anymore. Move them to dedicated files
2007-10-17 11:06:05 -04:00
/*
* Local variables:
* c-indent-level: 8
* c-basic-offset: 8
* End:
*/
Reference in a new issue Copy permalink