bug#35506: Acknowledgement (27.0.50; Emacs hangs while interrupting tramp processes)

[John Shahid <jvshahid@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 62 bytes --]


Attached are the two patches I mentioned in the bug report.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Kill-the-entire-process-group.patch --]
[-- Type: text/x-patch, Size: 1019 bytes --]

From e056e98d4b899b8ae7636a967d0a55125e624fad Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Mon, 29 Apr 2019 16:09:32 -0400
Subject: [PATCH] Kill the entire process group

Some processes (e.g. terraform) don't handle signals but its
subprocess (with the exact same name) does.  Killing the parent
process doesn't do anything, we have to send the signal to the entire
group in order to reach the child.  This seems to be what terminals
typically do.
---
 lisp/net/tramp.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 2e1a0960d7..427b3c41e3 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4870,7 +4870,7 @@ tramp-interrupt-process
 	(tramp-compat-funcall
 	 'tramp-send-command
 	 (process-get proc 'vector)
-	 (format "kill -2 %d" pid))
+	 (format "kill -2 -%d" pid))
 	;; Wait, until the process has disappeared.  If it doesn't,
 	;; fall back to the default implementation.
 	(with-timeout (1 (ignore))
-- 
2.21.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0001-Do-not-wait-for-process-output-after-interruption.patch --]
[-- Type: text/x-patch, Size: 1170 bytes --]

From cf2d0e2e58a683756878c9c7e4dd2066efe6e807 Mon Sep 17 00:00:00 2001
From: John Shahid <jvshahid@gmail.com>
Date: Mon, 29 Apr 2019 16:10:47 -0400
Subject: [PATCH] Do not wait for process output after interruption.

Some processes such as terraform can have cleanup logic that causes
the process to take longer to shut down than normal.  This causes
eshell to do a busy wait locking up Emacs while waiting for the
process to finish.  I don't understand why we do that anyway, just let
the process finish at its own pace.
---
 lisp/net/tramp.el | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 427b3c41e3..27bef45efb 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4873,10 +4873,7 @@ tramp-interrupt-process
 	 (format "kill -2 -%d" pid))
 	;; Wait, until the process has disappeared.  If it doesn't,
 	;; fall back to the default implementation.
-	(with-timeout (1 (ignore))
-	  (while (tramp-accept-process-output proc))
-	  ;; Report success.
-	  proc)))))
+        ))))
 
 ;; `interrupt-process-functions' exists since Emacs 26.1.
 (when (boundp 'interrupt-process-functions)
-- 
2.21.0