1
=== modified file 'lib/lp/scripts/utilities/killservice.py'
2
--- lib/lp/scripts/utilities/killservice.py	2009-07-24 12:32:28 +0000
3
+++ lib/lp/scripts/utilities/killservice.py	2009-09-10 11:20:16 +0000
4
@@ -8,7 +8,8 @@
5
8
__metaclass__ = type
8
__metaclass__ = type
6
9
9
7
10
import os, logging
10
import os, logging
9
11
from signal import SIGTERM
11
from signal import SIGKILL, SIGTERM
10
12
import time
11
12
from optparse import OptionParser
13
from optparse import OptionParser
12
13
from canonical.config import config
14
from canonical.config import config
13
14
from canonical.lazr.pidfile import get_pid, pidfile_path, remove_pidfile
15
from canonical.lazr.pidfile import get_pid, pidfile_path, remove_pidfile
14
@@ -18,16 +19,26 @@
15
18
19
16
19
def main():
20
def main():
17
20
    parser = OptionParser('Usage: %prog [options] [SERVICE ...]')
21
    parser = OptionParser('Usage: %prog [options] [SERVICE ...]')
18
22
    parser.add_option("-w", "--wait", metavar="SECS",
19
23
        default=20, type="int",
20
24
        help="Wait up to SECS seconds for processes "
21
25
            "to die before retrying with SIGKILL")
22
21
    logger_options(parser, logging.INFO)
26
    logger_options(parser, logging.INFO)
23
22
    (options, args) = parser.parse_args()
27
    (options, args) = parser.parse_args()
24
23
    log = logger(options)
28
    log = logger(options)
25
24
    if len(args) < 1:
29
    if len(args) < 1:
26
25
        parser.error('No service name provided')
30
        parser.error('No service name provided')
30
26
    for service in args:
31
31
27
        # Mailman is special, but only stop it if it was launched.
32
    pids = [] # List of pids we tried to kill.
32
28
        if service == 'mailman' and config.mailman.launch:
33
    services = args[:]
33
34
34
35
    # Mailman is special, but only stop it if it was launched.
35
36
    if 'mailman' in services:
36
37
        if config.mailman.launch:
37
29
            stop_mailman()
38
            stop_mailman()
39
30
            continue
39
        services.remove('mailman')
40
40
41
41
    for service in services:
42
31
        log.debug("PID file is %s", pidfile_path(service))
42
        log.debug("PID file is %s", pidfile_path(service))
43
32
        try:
43
        try:
44
33
            pid = get_pid(service)
44
            pid = get_pid(service)
45
@@ -38,12 +49,72 @@
46
38
            log.info("Killing %s (%d)", service, pid)
49
            log.info("Killing %s (%d)", service, pid)
47
39
            try:
50
            try:
48
40
                os.kill(pid, SIGTERM)
51
                os.kill(pid, SIGTERM)
49
52
                pids.append((service, pid))
50
41
            except OSError, x:
53
            except OSError, x:
53
42
                log.error("Unable to kill %s (%d) - %s",
54
                log.error(
54
43
                          service, pid, x.strerror)
55
                    "Unable to SIGTERM %s (%d) - %s",
55
56
                    service, pid, x.strerror)
56
57
        else:
57
58
            log.debug("No PID file for %s", service)
58
59
59
60
    wait_for_pids(pids, options.wait, log)
60
61
61
62
    # Anything that didn't die, kill harder with SIGKILL.
62
63
    for service, pid in pids:
63
64
        if not process_exists(pid):
64
65
            continue
65
66
        log.warn(
66
67
            "SIGTERM failed to kill %s (%d). Trying SIGKILL", service, pid)
67
68
        try:
68
69
            os.kill(pid, SIGKILL)
69
70
        except OSError, x:
70
71
            log.error(
71
72
                "Unable to SIGKILL %s (%d) - %s", service, pid, x.strerror)
72
73
73
74
    wait_for_pids(pids, options.wait, log)
74
75
75
76
    # Report anything still left running after a SIGKILL.
76
77
    for service, pid in pids:
77
78
        if process_exists(pid):
78
79
            log.error("SIGKILL didn't terminate %s (%d)", service, pid)
79
80
80
81
    # Remove any pidfiles that didn't get cleaned up if there is no
81
82
    # corresponding process (from an unkillable process, or maybe some
82
83
    # other job has relaunched it while we were not looking).
83
84
    for service in services:
84
85
        pid = get_pid(service)
85
86
        if pid is not None and not process_exists(pid):
86
44
            try:
87
            try:
87
45
                remove_pidfile(service)
88
                remove_pidfile(service)
88
46
            except OSError:
89
            except OSError:
89
47
                pass
90
                pass
92
48
        else:
91
93
49
            log.debug("No PID file for %s", service)
92
94
93
def process_exists(pid):
95
94
    """True if the given process exists."""
96
95
    try:
97
96
        pgid = os.getpgid(pid)
98
97
    except OSError, x:
99
98
        if x.errno == 3:
100
99
            return False
101
100
        log.error("Unknown exception from getpgid - %s", str(x))
102
101
    return True
103
102
104
103
105
104
def wait_for_pids(pids, wait, log):
106
105
    """
107
106
    Wait until all signalled processes are dead, or until we hit the
108
107
    timeout.
109
108
110
109
    Processes discovered to be dead are removed from the list.
111
110
112
111
    :param pids: A list of (service, pid).
113
112
114
113
    :param wait: How many seconds to wait.
115
114
    """
116
115
    wait_start = time.time()
117
116
    while pids and time.time() < wait_start + wait:
118
117
        for service, pid in pids[:]:
119
118
            if not process_exists(pid):
120
119
                pids.remove((service, pid))
121
120
        time.sleep(0.1)
Reviewer	Review Type	Date Requested	Status
Eleanor Berger (community)		2009-09-10	Approve on 2009-09-14
Review via email: mp+11517@code.staging.launchpad.net