MINOR: server: enable standard options for dynamic servers

Enable a subset of server options to be used as keywords on the CLI
command 'add server'. These options are safe and can be applied
flawlessly for a dynamic server.

diff --git a/doc/management.txt b/doc/management.txt
index bc7071def41e3dcbf01a2f50cace703832af9091..6301ffaca76379e0fead2ae2cb9195e06923ce89 100644 (file)
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -1432,8 +1432,31 @@ add server <backend>/<server> [args]*
   restriction is put on the backend which must used a compatible load-balancing
   algorithm with consistent hashing method. A subset of keywords from the
   server config file statement can be used to configure the server behavior.
-  They can also be specified via an existing 'default-server' statement in the
-  backend. For the moment, no keywords are supported.
+  Also note that no settings will be reused from an hypothetical
+  'defaut-server' statement in the same backend.
+
+  Here is the list of the currently supported keywords :
+
+  - backup
+  - disabled
+  - enabled
+  - id
+  - maxconn
+  - maxqueue
+  - minconn
+  - pool-low-conn
+  - pool-max-conn
+  - pool-purge-delay
+  - proxy-v2-options
+  - send-proxy
+  - send-proxy-v2
+  - source
+  - tfo
+  - usesrc
+  - weight
+
+  Their syntax is similar to the server line from the configuration file,
+  please refer to their individual documentation for details.
 
 add ssl crt-list <crtlist> <certificate>
 add ssl crt-list <crtlist> <payload>

diff --git a/src/server.c b/src/server.c
index e77d77fb5675ae23f6606f3d36358b50470de489..376c797c1fac2e5bc02ad47e00bf3a6aa14c393d 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -1626,48 +1626,48 @@ void srv_compute_all_admin_states(struct proxy *px)
  * Note: -1 as ->skip value means that the number of arguments are variable.
  */
 static struct srv_kw_list srv_kws = { "ALL", { }, {
-       { "backup",              srv_parse_backup,              0,  1,  0 }, /* Flag as backup server */
+       { "backup",              srv_parse_backup,              0,  1,  1 }, /* Flag as backup server */
        { "cookie",              srv_parse_cookie,              1,  1,  0 }, /* Assign a cookie to the server */
-       { "disabled",            srv_parse_disabled,            0,  1,  0 }, /* Start the server in 'disabled' state */
-       { "enabled",             srv_parse_enabled,             0,  1,  0 }, /* Start the server in 'enabled' state */
+       { "disabled",            srv_parse_disabled,            0,  1,  1 }, /* Start the server in 'disabled' state */
+       { "enabled",             srv_parse_enabled,             0,  1,  1 }, /* Start the server in 'enabled' state */
        { "error-limit",         srv_parse_error_limit,         1,  1,  0 }, /* Configure the consecutive count of check failures to consider a server on error */
-       { "id",                  srv_parse_id,                  1,  0,  0 }, /* set id# of server */
+       { "id",                  srv_parse_id,                  1,  0,  1 }, /* set id# of server */
        { "init-addr",           srv_parse_init_addr,           1,  1,  0 }, /* */
        { "log-proto",           srv_parse_log_proto,           1,  1,  0 }, /* Set the protocol for event messages, only relevant in a ring section */
-       { "maxconn",             srv_parse_maxconn,             1,  1,  0 }, /* Set the max number of concurrent connection */
-       { "maxqueue",            srv_parse_maxqueue,            1,  1,  0 }, /* Set the max number of connection to put in queue */
+       { "maxconn",             srv_parse_maxconn,             1,  1,  1 }, /* Set the max number of concurrent connection */
+       { "maxqueue",            srv_parse_maxqueue,            1,  1,  1 }, /* Set the max number of connection to put in queue */
        { "max-reuse",           srv_parse_max_reuse,           1,  1,  0 }, /* Set the max number of requests on a connection, -1 means unlimited */
-       { "minconn",             srv_parse_minconn,             1,  1,  0 }, /* Enable a dynamic maxconn limit */
+       { "minconn",             srv_parse_minconn,             1,  1,  1 }, /* Enable a dynamic maxconn limit */
        { "namespace",           srv_parse_namespace,           1,  1,  0 }, /* Namespace the server socket belongs to (if supported) */
-       { "no-backup",           srv_parse_no_backup,           0,  1,  0 }, /* Flag as non-backup server */
-       { "no-send-proxy",       srv_parse_no_send_proxy,       0,  1,  0 }, /* Disable use of PROXY V1 protocol */
-       { "no-send-proxy-v2",    srv_parse_no_send_proxy_v2,    0,  1,  0 }, /* Disable use of PROXY V2 protocol */
-       { "no-tfo",              srv_parse_no_tfo,              0,  1,  0 }, /* Disable use of TCP Fast Open */
+       { "no-backup",           srv_parse_no_backup,           0,  1,  1 }, /* Flag as non-backup server */
+       { "no-send-proxy",       srv_parse_no_send_proxy,       0,  1,  1 }, /* Disable use of PROXY V1 protocol */
+       { "no-send-proxy-v2",    srv_parse_no_send_proxy_v2,    0,  1,  1 }, /* Disable use of PROXY V2 protocol */
+       { "no-tfo",              srv_parse_no_tfo,              0,  1,  1 }, /* Disable use of TCP Fast Open */
        { "non-stick",           srv_parse_non_stick,           0,  1,  0 }, /* Disable stick-table persistence */
        { "observe",             srv_parse_observe,             1,  1,  0 }, /* Enables health adjusting based on observing communication with the server */
        { "on-error",            srv_parse_on_error,            1,  1,  0 }, /* Configure the action on check failure */
        { "on-marked-down",      srv_parse_on_marked_down,      1,  1,  0 }, /* Configure the action when a server is marked down */
        { "on-marked-up",        srv_parse_on_marked_up,        1,  1,  0 }, /* Configure the action when a server is marked up */
-       { "pool-low-conn",       srv_parse_pool_low_conn,       1,  1,  0 }, /* Set the min number of orphan idle connecbefore being allowed to pick from other threads */
-       { "pool-max-conn",       srv_parse_pool_max_conn,       1,  1,  0 }, /* Set the max number of orphan idle connections, -1 means unlimited */
-       { "pool-purge-delay",    srv_parse_pool_purge_delay,    1,  1,  0 }, /* Set the time before we destroy orphan idle connections, defaults to 1s */
+       { "pool-low-conn",       srv_parse_pool_low_conn,       1,  1,  1 }, /* Set the min number of orphan idle connecbefore being allowed to pick from other threads */
+       { "pool-max-conn",       srv_parse_pool_max_conn,       1,  1,  1 }, /* Set the max number of orphan idle connections, -1 means unlimited */
+       { "pool-purge-delay",    srv_parse_pool_purge_delay,    1,  1,  1 }, /* Set the time before we destroy orphan idle connections, defaults to 1s */
        { "proto",               srv_parse_proto,               1,  1,  0 }, /* Set the proto to use for all outgoing connections */
-       { "proxy-v2-options",    srv_parse_proxy_v2_options,    1,  1,  0 }, /* options for send-proxy-v2 */
+       { "proxy-v2-options",    srv_parse_proxy_v2_options,    1,  1,  1 }, /* options for send-proxy-v2 */
        { "redir",               srv_parse_redir,               1,  1,  0 }, /* Enable redirection mode */
        { "resolve-net",         srv_parse_resolve_net,         1,  1,  0 }, /* Set the prefered network range for name resolution */
        { "resolve-opts",        srv_parse_resolve_opts,        1,  1,  0 }, /* Set options for name resolution */
        { "resolve-prefer",      srv_parse_resolve_prefer,      1,  1,  0 }, /* Set the prefered family for name resolution */
        { "resolvers",           srv_parse_resolvers,           1,  1,  0 }, /* Configure the resolver to use for name resolution */
-       { "send-proxy",          srv_parse_send_proxy,          0,  1,  0 }, /* Enforce use of PROXY V1 protocol */
-       { "send-proxy-v2",       srv_parse_send_proxy_v2,       0,  1,  0 }, /* Enforce use of PROXY V2 protocol */
+       { "send-proxy",          srv_parse_send_proxy,          0,  1,  1 }, /* Enforce use of PROXY V1 protocol */
+       { "send-proxy-v2",       srv_parse_send_proxy_v2,       0,  1,  1 }, /* Enforce use of PROXY V2 protocol */
        { "slowstart",           srv_parse_slowstart,           1,  1,  0 }, /* Set the warm-up timer for a previously failed server */
-       { "source",              srv_parse_source,             -1,  1,  0 }, /* Set the source address to be used to connect to the server */
+       { "source",              srv_parse_source,             -1,  1,  1 }, /* Set the source address to be used to connect to the server */
        { "stick",               srv_parse_stick,               0,  1,  0 }, /* Enable stick-table persistence */
-       { "tfo",                 srv_parse_tfo,                 0,  1,  0 }, /* enable TCP Fast Open of server */
+       { "tfo",                 srv_parse_tfo,                 0,  1,  1 }, /* enable TCP Fast Open of server */
        { "track",               srv_parse_track,               1,  1,  0 }, /* Set the current state of the server, tracking another one */
        { "socks4",              srv_parse_socks4,              1,  1,  0 }, /* Set the socks4 proxy of the server*/
-       { "usesrc",              srv_parse_usesrc,              0,  1,  0 }, /* safe-guard against usesrc without preceding <source> keyword */
-       { "weight",              srv_parse_weight,              1,  1,  0 }, /* Set the load-balancing weight */
+       { "usesrc",              srv_parse_usesrc,              0,  1,  1 }, /* safe-guard against usesrc without preceding <source> keyword */
+       { "weight",              srv_parse_weight,              1,  1,  1 }, /* Set the load-balancing weight */
        { NULL, NULL, 0 },
 }};