• anozdrin@mysql.com's avatar
    Partial fix for BUG#14106: IM: im_life_cycle and im_utils · 3b74668b
    anozdrin@mysql.com authored
    tests fail on FreeBSD.
    
    The patch contains of the following:
      - make Instance Manager, running in the daemon mode, dump
        the pid of angel-process in the special file;
      - default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
      - if ordinary (IM) pid-file-name is specified in the configuration,
        angel-pid-file-name is updated according to the following
        rule: extension of the basename of pid-file-name is replaced by
        '.angel.pid.
        For example:
        - pid-file-name: /tmp/im.pid
          => angel-pid-file-name: /tmp/im.angel.pid
        - pid-file-name: /tmp/im.txt
          => angel-pid-file-name: /tmp/im.angel.pid
        - pid-file-name: /tmp/5.0/im
          => angel-pid-file-name: /tmp/5.0/im.angel.pid
      - add support for configuration option to customize angel
        pid file name;
      - fix test suite to use angel pid to kill Instance Manager
        by all means if something went wrong.
    
    Background
    ----------
    
    The problem is that on some OSes (FreeBSD for one) Instance
    Manager does not get SIGTERM, so can not shutdown gracefully.
    Test suite wasn't able to cope with it, so this leads to the
    mess in test results.
    
    The problem should be split into two:
      - fix signal handling;
      - fix test suite.
    
    This patch fixes test suite so that it will be able to kill
    uncooperative Instance Manager. In order to achieve this,
    test suite needs to know PID of IM Angel process.
    3b74668b
manager.cc 6.78 KB