|
19 | 19 | import sys |
20 | 20 | from textwrap import dedent |
21 | 21 | import threading |
| 22 | +import time |
22 | 23 | import warnings |
23 | 24 |
|
24 | 25 | from git.compat import defenc, force_bytes, safe_decode |
|
99 | 100 | ## @{ |
100 | 101 |
|
101 | 102 |
|
| 103 | +def _kill_process(pid: int) -> bool: |
| 104 | + """Kill a POSIX process and its descendants, returning whether it was killed.""" |
| 105 | + # Collect descendants before signalling, while their parent PIDs still identify them. |
| 106 | + pids = [pid] |
| 107 | + for parent_pid in pids: |
| 108 | + try: |
| 109 | + try: |
| 110 | + p = Popen(["pgrep", "-P", str(parent_pid)], stdout=PIPE) |
| 111 | + except FileNotFoundError: |
| 112 | + # POSIX ps does not support selecting by parent PID. |
| 113 | + ps_args = ["ps", "-ef"] if sys.platform == "cygwin" else ["ps", "-A", "-o", "pid=", "-o", "ppid="] |
| 114 | + with Popen(ps_args, stdout=PIPE) as p: |
| 115 | + if p.stdout is not None: |
| 116 | + for line in p.stdout: |
| 117 | + fields = line.split() |
| 118 | + if sys.platform == "cygwin": |
| 119 | + fields = fields[1:3] # ps -ef starts with UID, PID, PPID. |
| 120 | + if len(fields) == 2 and all(field.isdigit() for field in fields): |
| 121 | + if int(fields[1]) == parent_pid: |
| 122 | + pids.append(int(fields[0])) |
| 123 | + else: |
| 124 | + with p: |
| 125 | + if p.stdout is not None: |
| 126 | + for line in p.stdout: |
| 127 | + if line.strip().isdigit(): |
| 128 | + pids.append(int(line)) |
| 129 | + except OSError as ex: |
| 130 | + _logger.info("Unable to enumerate child processes: %r", ex) |
| 131 | + killed = False |
| 132 | + if sys.platform != "win32": |
| 133 | + for process_pid in pids: |
| 134 | + try: |
| 135 | + os.kill(process_pid, signal.SIGKILL) |
| 136 | + killed = killed or process_pid == pid |
| 137 | + except OSError: |
| 138 | + pass |
| 139 | + return killed |
| 140 | + |
| 141 | + |
102 | 142 | def handle_process_output( |
103 | 143 | process: Union["Git.AutoInterrupt", Popen], |
104 | 144 | stdout_handler: Union[ |
@@ -165,7 +205,7 @@ def pump_stream( |
165 | 205 |
|
166 | 206 | except Exception as ex: |
167 | 207 | _logger.error(f"Pumping {name!r} of cmd({remove_password_if_present(cmdline)}) failed due to: {ex!r}") |
168 | | - if "I/O operation on closed file" not in str(ex): |
| 208 | + if not (isinstance(ex, ValueError) and stream.closed): |
169 | 209 | # Only reraise if the error was not due to the stream closing. |
170 | 210 | raise CommandError([f"<{name}-pump>"] + remove_password_if_present(cmdline), ex) from ex |
171 | 211 | finally: |
@@ -200,27 +240,23 @@ def pump_stream( |
200 | 240 | threads.append(t) |
201 | 241 |
|
202 | 242 | # FIXME: Why join? Will block if stdin needs feeding... |
| 243 | + deadline = None if kill_after_timeout is None else time.monotonic() + kill_after_timeout |
203 | 244 | for t in threads: |
204 | | - t.join(timeout=kill_after_timeout) |
| 245 | + t.join(timeout=None if deadline is None else max(0, deadline - time.monotonic())) |
205 | 246 | if t.is_alive(): |
206 | 247 | if isinstance(process, Git.AutoInterrupt): |
| 248 | + if sys.platform != "win32" and process.proc is not None: |
| 249 | + _kill_process(process.proc.pid) |
207 | 250 | process._terminate() |
208 | 251 | else: # Don't want to deal with the other case. |
209 | 252 | raise RuntimeError( |
210 | 253 | "Thread join() timed out in cmd.handle_process_output()." |
211 | 254 | f" kill_after_timeout={kill_after_timeout} seconds" |
212 | 255 | ) |
213 | | - if stderr_handler: |
214 | | - error_str: Union[str, bytes] = ( |
215 | | - f"error: process killed because it timed out. kill_after_timeout={kill_after_timeout} seconds" |
216 | | - ) |
217 | | - if not decode_streams and isinstance(p_stderr, BinaryIO): |
218 | | - # Assume stderr_handler needs binary input. |
219 | | - error_str = cast(str, error_str) |
220 | | - error_str = error_str.encode() |
221 | | - # We ignore typing on the next line because mypy does not like the way |
222 | | - # we inferred that stderr takes str or bytes. |
223 | | - stderr_handler(error_str) # type: ignore[arg-type] |
| 256 | + process._timeout_error = ( |
| 257 | + f"error: process killed because it timed out. kill_after_timeout={kill_after_timeout} seconds" |
| 258 | + ) |
| 259 | + break |
224 | 260 |
|
225 | 261 | if finalizer: |
226 | 262 | finalizer(process) |
@@ -326,7 +362,7 @@ class _AutoInterrupt: |
326 | 362 | raise. |
327 | 363 | """ |
328 | 364 |
|
329 | | - __slots__ = ("proc", "args", "status") |
| 365 | + __slots__ = ("proc", "args", "status", "_timeout_error") |
330 | 366 |
|
331 | 367 | # If this is non-zero it will override any status code during _terminate, used |
332 | 368 | # to prevent race conditions in testing. |
@@ -336,6 +372,7 @@ def __init__(self, proc: Union[None, subprocess.Popen], args: Any) -> None: |
336 | 372 | self.proc = proc |
337 | 373 | self.args = args |
338 | 374 | self.status: Union[int, None] = None |
| 375 | + self._timeout_error: Optional[str] = None |
339 | 376 |
|
340 | 377 | def _terminate(self) -> None: |
341 | 378 | """Terminate the underlying process.""" |
@@ -344,37 +381,45 @@ def _terminate(self) -> None: |
344 | 381 |
|
345 | 382 | proc = self.proc |
346 | 383 | self.proc = None |
347 | | - if proc.stdin: |
348 | | - proc.stdin.close() |
349 | | - if proc.stdout: |
350 | | - proc.stdout.close() |
351 | | - if proc.stderr: |
352 | | - proc.stderr.close() |
353 | | - # Did the process finish already so we have a return code? |
354 | 384 | try: |
355 | | - if proc.poll() is not None: |
356 | | - self.status = self._status_code_if_terminate or proc.poll() |
| 385 | + if proc.stdin: |
| 386 | + # A timed-out process may already have exited before input is flushed. |
| 387 | + with contextlib.suppress(BrokenPipeError): |
| 388 | + proc.stdin.close() |
| 389 | + # Did the process finish already so we have a return code? |
| 390 | + try: |
| 391 | + if proc.poll() is not None: |
| 392 | + self.status = self._status_code_if_terminate or proc.poll() |
| 393 | + return |
| 394 | + except OSError as ex: |
| 395 | + _logger.info("Ignored error after process had died: %r", ex) |
| 396 | + |
| 397 | + # It can be that nothing really exists anymore... |
| 398 | + if os is None or getattr(os, "kill", None) is None: |
357 | 399 | return |
358 | | - except OSError as ex: |
359 | | - _logger.info("Ignored error after process had died: %r", ex) |
360 | 400 |
|
361 | | - # It can be that nothing really exists anymore... |
362 | | - if os is None or getattr(os, "kill", None) is None: |
363 | | - return |
| 401 | + # Try to kill it. |
| 402 | + try: |
| 403 | + proc.terminate() |
| 404 | + except (OSError, AttributeError) as ex: |
| 405 | + # On interpreter shutdown (notably on Windows), parts of the stdlib used by |
| 406 | + # subprocess can already be torn down (e.g. `subprocess._winapi` becomes None), |
| 407 | + # which can cause AttributeError during terminate(). In that case, we prefer |
| 408 | + # to silently ignore to avoid noisy "Exception ignored in: __del__" messages. |
| 409 | + _logger.info("Ignored error while terminating process: %r", ex) |
| 410 | + return |
| 411 | + # END exception handling |
| 412 | + finally: |
| 413 | + if proc.stdout: |
| 414 | + proc.stdout.close() |
| 415 | + if proc.stderr: |
| 416 | + proc.stderr.close() |
364 | 417 |
|
365 | | - # Try to kill it. |
366 | 418 | try: |
367 | | - proc.terminate() |
368 | | - status = proc.wait() # Ensure the process goes away. |
369 | | - |
| 419 | + status = proc.wait() |
370 | 420 | self.status = self._status_code_if_terminate or status |
371 | 421 | except (OSError, AttributeError) as ex: |
372 | | - # On interpreter shutdown (notably on Windows), parts of the stdlib used by |
373 | | - # subprocess can already be torn down (e.g. `subprocess._winapi` becomes None), |
374 | | - # which can cause AttributeError during terminate(). In that case, we prefer |
375 | | - # to silently ignore to avoid noisy "Exception ignored in: __del__" messages. |
376 | | - _logger.info("Ignored error while terminating process: %r", ex) |
377 | | - # END exception handling |
| 422 | + _logger.info("Ignored error while waiting for terminated process: %r", ex) |
378 | 423 |
|
379 | 424 | def __del__(self) -> None: |
380 | 425 | self._terminate() |
@@ -395,6 +440,8 @@ def wait(self, stderr: Union[None, str, bytes] = b"") -> int: |
395 | 440 | :raise git.exc.GitCommandError: |
396 | 441 | If the return status is not 0. |
397 | 442 | """ |
| 443 | + if self._timeout_error is not None: |
| 444 | + stderr = self._timeout_error |
398 | 445 | stderr_b = force_bytes(data=stderr, encoding="utf-8") or b"" |
399 | 446 | status: Union[int, None] |
400 | 447 | if self.proc is not None: |
@@ -1381,9 +1428,10 @@ def execute( |
1381 | 1428 | 1. This feature is not supported at all on Windows. |
1382 | 1429 | 2. Enumerating child processes requires ``pgrep -P``, or a ``ps`` command |
1383 | 1430 | supporting the POSIX ``-A`` and ``-o`` options if ``pgrep`` is not |
1384 | | - installed. Effectiveness may vary on systems without these commands. |
1385 | | - 3. Deeper descendants do not receive signals, though they may sometimes |
1386 | | - terminate as a consequence of their parent processes being killed. |
| 1431 | + installed (``ps -ef`` on Cygwin). Effectiveness may vary on systems |
| 1432 | + without these commands. |
| 1433 | + 3. Descendants are enumerated before signalling. Processes that detach |
| 1434 | + or spawn after enumeration may not receive signals. |
1387 | 1435 | 4. `kill_after_timeout` uses ``SIGKILL``, which can have negative side |
1388 | 1436 | effects on a repository. For example, stale locks in case of |
1389 | 1437 | :manpage:`git-gc(1)` could render the repository incapable of accepting |
@@ -1537,43 +1585,9 @@ def execute( |
1537 | 1585 | timeout = kill_after_timeout |
1538 | 1586 |
|
1539 | 1587 | def kill_process(pid: int) -> None: |
1540 | | - """Callback to kill a process. |
1541 | | -
|
1542 | | - This callback implementation would be ineffective and unsafe on Windows. |
1543 | | - """ |
1544 | | - child_pids = [] |
1545 | | - try: |
1546 | | - p = Popen(["pgrep", "-P", str(pid)], stdout=PIPE) |
1547 | | - except FileNotFoundError: |
1548 | | - # POSIX ps does not support selecting by parent PID. |
1549 | | - with Popen(["ps", "-A", "-o", "pid=", "-o", "ppid="], stdout=PIPE) as p: |
1550 | | - if p.stdout is not None: |
1551 | | - for line in p.stdout: |
1552 | | - fields = line.split() |
1553 | | - if len(fields) == 2 and all(field.isdigit() for field in fields): |
1554 | | - if int(fields[1]) == pid: |
1555 | | - child_pids.append(int(fields[0])) |
1556 | | - else: |
1557 | | - with p: |
1558 | | - if p.stdout is not None: |
1559 | | - for line in p.stdout: |
1560 | | - if line.strip().isdigit(): |
1561 | | - child_pids.append(int(line)) |
1562 | | - try: |
1563 | | - os.kill(pid, signal.SIGKILL) |
1564 | | - for child_pid in child_pids: |
1565 | | - try: |
1566 | | - os.kill(child_pid, signal.SIGKILL) |
1567 | | - except OSError: |
1568 | | - pass |
1569 | | - # Tell the main routine that the process was killed. |
| 1588 | + if _kill_process(pid): |
1570 | 1589 | assert kill_check is not None |
1571 | 1590 | kill_check.set() |
1572 | | - except OSError: |
1573 | | - # It is possible that the process gets completed in the duration |
1574 | | - # after timeout happens and before we try to kill the process. |
1575 | | - pass |
1576 | | - return |
1577 | 1591 |
|
1578 | 1592 | def make_timeout_error() -> Union[str, bytes]: |
1579 | 1593 | err = f'Timeout: the command "{" ".join(redacted_command)}" did not complete in {timeout:g} secs.' |
|