Skip to content
Permalink
Branch: master
Commits on Apr 1, 2019
  1. MINOR: cli: export HAPROXY_CLI environment variable

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Export the HAPROXY_CLI environment variable which contains the list of
    all stats sockets (including the sockpair@) separated by semicolons.
  2. MINOR: cli: start addresses by a prefix in 'show cli sockets'

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Displays a prefix for every addresses in 'show cli sockets'.
    It could be 'unix@', 'ipv4@', 'ipv6@', 'abns@' or 'sockpair@'.
    
    Could be backported in 1.9 and 1.8.
  3. BUG/MINOR: cli: correctly handle abns in 'show cli sockets'

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    The 'show cli sockets' was not handling the abns sockets. This is a
    problem since it uses the AF_UNIX family, it displays nothing
    in the path column because the path starts by \0.
    
    Should be backported to 1.9 and 1.8.
  4. MINOR: mworker/cli: show programs in 'show proc'

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Show the programs in 'show proc'
    
    Example:
    
    	# programs
    	2285            dataplane-api   -               0               0d 00h00m12s
    	# old programs
    	2261            dataplane-api   -               1               0d 00h00m53s
  5. MEDIUM: mworker-prog: implement program for master-worker

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    This patch implements the external binary support in the master worker.
    
    To configure an external process, you need to use the program section,
    for example:
    
    	program dataplane-api
    		command ./dataplane_api
    
    Those processes are launched at the same time as the workers.
    
    During a reload of HAProxy, those processes are dealing with the same
    sequence as a worker:
    
      - the master is re-executed
      - the master sends a USR1 signal to the program
      - the master launches a new instance of the program
    
    During a stop, or restart, a SIGTERM is sent to the program.
  6. REORG: mworker/cli: move CLI functions to mworker.c

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Move the CLI functions of the master worker to mworker.c
  7. MINOR: cli: export cli_parse_default() definition in cli.h

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Export the cli_parse_default() function in cli.h so it could be used in
    other files.
  8. MINOR: mworker: don't use children variable anymore

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    The children variable is still used in haproxy, it is not required
    anymore since we have the information about the current workers in the
    mworker_proc linked list.
    
    The oldpids array is also replaced by this linked list when we
    generated the arguments for the master reexec.
  9. MINOR: mworker: calloc mworker_proc structures

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Initialize mworker_proc structures to 0 with calloc instead of just
    doing a malloc.
  10. REORG: mworker: move mworker_cleanlisteners to mworker.c

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
  11. REORG: mworker: move signal handlers and related functions

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Move the following functions to mworker.c:
    
    void mworker_catch_sighup(struct sig_handler *sh);
    void mworker_catch_sigterm(struct sig_handler *sh);
    void mworker_catch_sigchld(struct sig_handler *sh);
    
    static void mworker_kill(int sig);
    int current_child(int pid);
  12. REORG: mworker: move IPC functions to mworker.c

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Move the following functions to mworker.c:
    
    void mworker_accept_wrapper(int fd);
    void mworker_pipe_register();
  13. REORG: mworker: move signals functions to mworker.c

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Move the following functions to mworker.c:
    
    void mworker_block_signals();
    void mworker_unblock_signals();
  14. REORG: mworker: move serializing functions to mworker.c

    wlallemand authored and Willy Tarreau committed Apr 1, 2019
    Move the 2 following functions to mworker.c:
    
    void mworker_proc_list_to_env()
    void mworker_env_to_proc_list()
You can’t perform that action at this time.