#62194 - 30.0.50; Two Eglot-over-Tramp tests are failing on master, passing on emacs-29

GNU bug report logs - #62194
30.0.50; Two Eglot-over-Tramp tests are failing on master, passing on emacs-29

Package: emacs;

Reported by: João Távora <joaotavora <at> gmail.com>

Date: Tue, 14 Mar 2023 23:07:01 UTC

Severity: normal

Found in version 30.0.50

Done: Michael Albinus <michael.albinus <at> gmx.de>

Bug is archived. No further changes may be made.

Message #44 received at 62194 <at> debbugs.gnu.org (full text, mbox):

From: João Távora <joaotavora <at> gmail.com> To: Michael Albinus <michael.albinus <at> gmx.de> Cc: 62194 <at> debbugs.gnu.org, miha <at> kamnitnik.top Subject: Re: bug#62194: 30.0.50; Two Eglot-over-Tramp tests are failing on master, passing on emacs-29 Date: Thu, 16 Mar 2023 17:59:30 +0000

[Message part 1 (text/plain, inline)]

Michael Albinus <michael.albinus <at> gmx.de> writes: > João Távora <joaotavora <at> gmail.com> writes: > > Hi João, > >>> Honestly, I'm lost with all the patches back forth and back. Could you >>> pls show me the change you propose, based on the current master state? >> >> OK. Based on the current master state, I'm sending you 4 (four >> patches). I known it looks a lot, but is quite simple. > > I've applied the 4 patches. As expected, eglot-tests, tramp-tests, and > filenotify-tests run successfully. > >> * bug#61350 should be fixed -- even without the Eglot workaround. Let >> me know if you need help testing this (I have a nifty dockerfile and >> some command-line incantations that make testing very easy). > > The example given by Thomas blocks, again. So we are back to the > beginning, aren't we? Doh! I gave you a wrong patch-0003. It needs a tweak. You can either apply this one-line diff or re-aplply attached patchset of 4 over origin/master again. Then please try again, and sorry for the extra confusion. diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 885b29f9471..a7406a9d80e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5804,7 +5804,7 @@ tramp-accept-process-output (v (process-get proc 'vector))) (dolist (p (delq proc (process-list))) (when (tramp-file-name-equal-p v (process-get p 'vector)) - (while (accept-process-output p 0 nil t))))) + (while (accept-process-output p 0))))) (with-current-buffer (process-buffer proc) (let ((inhibit-read-only t) last-coding-system-used I've tested Thomas's example 5 times in a row, moving around energically, in the Emacs -Q, exercising multiple Eglot features, etc. 0% failures.

From a168ef267aadf2d83627806c18853a7aaf1e88ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora <at> gmail.com> Date: Thu, 16 Mar 2023 12:24:29 +0000 Subject: [PATCH 1/4] Revert Michael Albinus' "Fix regression in Tramp (bug#62194)" This reverts commit 0330cff65ae837e93ae4d059acf643734d16386d. --- lisp/net/tramp-sh.el | 6 +++--- lisp/net/tramp.el | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2f990af334d..882b79b3ee7 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2427,7 +2427,7 @@ tramp-do-copy-or-rename-file-out-of-band ;; This is neded for ssh or PuTTY based processes, and ;; only if the respective options are set. Perhaps, ;; the setting could be more fine-grained. - ;; (process-put p 'shared-socket t) + (process-put p 'shared-socket t) (process-put p 'adjust-window-size-function #'ignore) (set-process-query-on-exit-flag p nil) @@ -3760,7 +3760,7 @@ tramp-sh-handle-file-notify-add-watch ;; This is neded for ssh or PuTTY based processes, and only if ;; the respective options are set. Perhaps, the setting could ;; be more fine-grained. - ;; (process-put p 'shared-socket t) + (process-put p 'shared-socket t) ;; Needed for process filter. (process-put p 'events events) (process-put p 'watch-name localname) @@ -5124,7 +5124,7 @@ tramp-maybe-open-connection ;; This is neded for ssh or PuTTY based processes, and ;; only if the respective options are set. Perhaps, ;; the setting could be more fine-grained. - ;; (process-put p 'shared-socket t) + (process-put p 'shared-socket t) (process-put p 'adjust-window-size-function #'ignore) (set-process-query-on-exit-flag p nil) (setq tramp-current-connection (cons vec (current-time))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 0c8f8acc07d..b6e985db6b1 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5091,7 +5091,7 @@ tramp-handle-make-process ;; This is neded for ssh or PuTTY based processes, and ;; only if the respective options are set. Perhaps, the ;; setting could be more fine-grained. - ;; (process-put p 'shared-socket t) + (process-put p 'shared-socket t) (process-put p 'remote-command orig-command) (tramp-set-connection-property p "remote-command" orig-command) @@ -5809,7 +5809,6 @@ tramp-accept-process-output ;; There could be other processes which use the same socket for ;; communication. This could block the output for the current ;; process. Read such output first. (Bug#61350) - ;; The process property isn't set anymore due to Bug#62194. (when-let (((process-get proc 'shared-socket)) (v (process-get proc 'vector))) (dolist (p (delq proc (process-list))) -- 2.39.2

From 14e37318dd5f170771fb1a74d69e89d5e756d1cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora <at> gmail.com> Date: Thu, 16 Mar 2023 12:26:04 +0000 Subject: [PATCH 2/4] Revert Michael Albinus' "Improve Tramp processes to accept..." It was found to cause the failure of test file-notify-test04-autorevert-remote, among other instabilities. This reverts commit 54ef338ba3670415cf47fabc33a92d4904707c7e. --- lisp/net/tramp-adb.el | 2 +- lisp/net/tramp-gvfs.el | 2 +- lisp/net/tramp-sh.el | 14 +------------- lisp/net/tramp-smb.el | 6 +++--- lisp/net/tramp-sudoedit.el | 2 +- lisp/net/tramp.el | 33 +++++++++------------------------ 6 files changed, 16 insertions(+), 43 deletions(-) diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index d338201ab72..64f45e7958d 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el @@ -990,7 +990,7 @@ tramp-adb-handle-make-process (progn (goto-char (point-min)) (not (search-forward "\n" nil t))) - (tramp-accept-process-output p)) + (tramp-accept-process-output p 0)) (delete-region (point-min) (point))) ;; Provide error buffer. This shows only ;; initial error messages; messages diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index c1ad37de1d2..266724c587f 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -1469,7 +1469,7 @@ tramp-gvfs-handle-file-notify-add-watch (set-process-sentinel p #'tramp-file-notify-process-sentinel) ;; There might be an error if the monitor is not supported. ;; Give the filter a chance to read the output. - (while (tramp-accept-process-output p)) + (while (tramp-accept-process-output p 0)) (unless (process-live-p p) (tramp-error p 'file-notify-error "Monitoring not supported for `%s'" file-name)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 882b79b3ee7..48ebfff6cfe 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -2424,10 +2424,6 @@ tramp-do-copy-or-rename-file-out-of-band copy-program copy-args))) (tramp-message v 6 "%s" (string-join (process-command p) " ")) (process-put p 'vector v) - ;; This is neded for ssh or PuTTY based processes, and - ;; only if the respective options are set. Perhaps, - ;; the setting could be more fine-grained. - (process-put p 'shared-socket t) (process-put p 'adjust-window-size-function #'ignore) (set-process-query-on-exit-flag p nil) @@ -3757,10 +3753,6 @@ tramp-sh-handle-file-notify-add-watch (string-join sequence " ")) (tramp-message v 6 "Run `%s', %S" (string-join sequence " ") p) (process-put p 'vector v) - ;; This is neded for ssh or PuTTY based processes, and only if - ;; the respective options are set. Perhaps, the setting could - ;; be more fine-grained. - (process-put p 'shared-socket t) ;; Needed for process filter. (process-put p 'events events) (process-put p 'watch-name localname) @@ -3769,7 +3761,7 @@ tramp-sh-handle-file-notify-add-watch (set-process-sentinel p #'tramp-file-notify-process-sentinel) ;; There might be an error if the monitor is not supported. ;; Give the filter a chance to read the output. - (while (tramp-accept-process-output p)) + (while (tramp-accept-process-output p 0)) (unless (process-live-p p) (tramp-error p 'file-notify-error "Monitoring not supported for `%s'" file-name)) @@ -5121,10 +5113,6 @@ tramp-maybe-open-connection ;; Set sentinel and query flag. Initialize variables. (set-process-sentinel p #'tramp-process-sentinel) (process-put p 'vector vec) - ;; This is neded for ssh or PuTTY based processes, and - ;; only if the respective options are set. Perhaps, - ;; the setting could be more fine-grained. - (process-put p 'shared-socket t) (process-put p 'adjust-window-size-function #'ignore) (set-process-query-on-exit-flag p nil) (setq tramp-current-connection (cons vec (current-time))) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index bb4ab9e3057..1aa4520eeb6 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -757,7 +757,7 @@ tramp-smb-action-get-acl "Read ACL data from connection buffer." (unless (process-live-p proc) ;; Accept pending output. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (with-current-buffer (tramp-get-connection-buffer vec) ;; There might be a hidden password prompt. (widen) @@ -1363,7 +1363,7 @@ tramp-smb-action-set-acl "Set ACL data." (unless (process-live-p proc) ;; Accept pending output. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (tramp-message vec 10 "\n%s" (tramp-get-buffer-string (tramp-get-connection-buffer vec))) (throw 'tramp-action 'ok))) @@ -2023,7 +2023,7 @@ tramp-smb-wait-for-output ;; Read pending output. (while (not (re-search-forward tramp-smb-prompt nil t)) - (while (tramp-accept-process-output p)) + (while (tramp-accept-process-output p 0)) (goto-char (point-min))) (tramp-message vec 6 "\n%s" (buffer-string)) diff --git a/lisp/net/tramp-sudoedit.el b/lisp/net/tramp-sudoedit.el index 3cacde2468c..abb9afc570b 100644 --- a/lisp/net/tramp-sudoedit.el +++ b/lisp/net/tramp-sudoedit.el @@ -692,7 +692,7 @@ tramp-sudoedit-action-sudo "Check, whether a sudo process has finished. Remove unneeded output." ;; There might be pending output for the exit status. (unless (process-live-p proc) - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) ;; Delete narrowed region, it would be in the way reading a Lisp form. (goto-char (point-min)) (widen) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index b6e985db6b1..47173b95bea 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5087,11 +5087,6 @@ tramp-handle-make-process ;; t. See Bug#51177. (when filter (set-process-filter p filter)) - (process-put p 'vector v) - ;; This is neded for ssh or PuTTY based processes, and - ;; only if the respective options are set. Perhaps, the - ;; setting could be more fine-grained. - (process-put p 'shared-socket t) (process-put p 'remote-command orig-command) (tramp-set-connection-property p "remote-command" orig-command) @@ -5494,7 +5489,7 @@ tramp-handle-file-notify-rm-watch ;; There might be pending output. Avoid problems with reentrant ;; call of Tramp. (ignore-errors - (while (tramp-accept-process-output proc))) + (while (tramp-accept-process-output proc 0))) (tramp-message proc 6 "Kill %S" proc) (delete-process proc)) @@ -5646,13 +5641,13 @@ tramp-action-process-alive "Check, whether a process has finished." (unless (process-live-p proc) ;; There might be pending output. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (throw 'tramp-action 'process-died))) (defun tramp-action-out-of-band (proc vec) "Check, whether an out-of-band copy has finished." ;; There might be pending output for the exit status. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (cond ((and (not (process-live-p proc)) (zerop (process-exit-status proc))) (tramp-message vec 3 "Process has finished.") @@ -5683,7 +5678,7 @@ tramp-process-one-action (while (not found) ;; Reread output once all actions have been performed. ;; Obviously, the output was not complete. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (setq todo actions) (while todo (setq item (pop todo) @@ -5800,21 +5795,11 @@ with-tramp-locked-connection ,@body) (tramp-flush-connection-property ,proc "locked")))) -(defun tramp-accept-process-output (proc &optional _timeout) +(defun tramp-accept-process-output (proc &optional timeout) "Like `accept-process-output' for Tramp processes. This is needed in order to hide `last-coding-system-used', which is set for process communication also. If the user quits via `C-g', it is propagated up to `tramp-file-name-handler'." - (declare (advertised-calling-convention (proc) "29.2")) - ;; There could be other processes which use the same socket for - ;; communication. This could block the output for the current - ;; process. Read such output first. (Bug#61350) - (when-let (((process-get proc 'shared-socket)) - (v (process-get proc 'vector))) - (dolist (p (delq proc (process-list))) - (when (tramp-file-name-equal-p v (process-get p 'vector)) - (accept-process-output p 0 nil t)))) - (with-current-buffer (process-buffer proc) (let ((inhibit-read-only t) last-coding-system-used @@ -5824,10 +5809,10 @@ tramp-accept-process-output ;; JUST-THIS-ONE is set due to Bug#12145. `with-local-quit' ;; returns t in order to report success. (if (with-local-quit - (setq result (accept-process-output proc 0 nil t)) t) + (setq result (accept-process-output proc timeout nil t)) t) (tramp-message - proc 10 "%s %s %s\n%s" - proc (process-status proc) result (buffer-string)) + proc 10 "%s %s %s %s\n%s" + proc timeout (process-status proc) result (buffer-string)) ;; Propagate quit. (keyboard-quit))) result))) @@ -6840,7 +6825,7 @@ tramp-interrupt-process (tramp-get-remote-null-device (process-get proc 'vector)))) ;; Wait, until the process has disappeared. If it doesn't, ;; fall back to the default implementation. - (while (tramp-accept-process-output proc)) + (while (tramp-accept-process-output proc 0)) (not (process-live-p proc)))))) (add-hook 'interrupt-process-functions #'tramp-interrupt-process) -- 2.39.2

From ac334523b4a7ba23a5198ad60a97456055ffbfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora <at> gmail.com> Date: Wed, 15 Mar 2023 20:02:43 +0000 Subject: [PATCH 3/4] A simpler fix for bug#61350, a small tweak Michael's original idea. * lisp/net/tramp.el (tramp-accept-process-output): Accept process from related processes. --- lisp/net/tramp.el | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 47173b95bea..a7406a9d80e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -5800,6 +5800,11 @@ tramp-accept-process-output This is needed in order to hide `last-coding-system-used', which is set for process communication also. If the user quits via `C-g', it is propagated up to `tramp-file-name-handler'." + (when-let (((process-get proc 'shared-socket)) + (v (process-get proc 'vector))) + (dolist (p (delq proc (process-list))) + (when (tramp-file-name-equal-p v (process-get p 'vector)) + (while (accept-process-output p 0))))) (with-current-buffer (process-buffer proc) (let ((inhibit-read-only t) last-coding-system-used -- 2.39.2

From 566a4de4bd5c39f35a5fce245bc722ee23590ded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora <at> gmail.com> Date: Wed, 15 Mar 2023 19:52:34 +0000 Subject: [PATCH 4/4] Just for testing: Remove Tramp-specific workaround in Eglot * lisp/progmodes/eglot.el (eglot--connect): No longer bind tramp vars. (tramp-ssh-controlmaster-options) (tramp-use-ssh-controlmaster-options): Remove. --- lisp/progmodes/eglot.el | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 6c1b9eafe43..f96f7dd254f 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -130,8 +130,6 @@ (defvar markdown-fontify-code-blocks-natively) (defvar company-backends) (defvar company-tooltip-align-annotations) -(defvar tramp-ssh-controlmaster-options) -(defvar tramp-use-ssh-controlmaster-options) ;;; User tweakable stuff @@ -1251,15 +1249,7 @@ eglot--connect (contact (cl-subseq contact 0 probe))) `(:process ,(lambda () - (let ((default-directory default-directory) - ;; bug#61350: Tramp turns on a feature - ;; by default that can't (yet) handle - ;; very much data so we turn it off - ;; unconditionally -- just for our - ;; process. - (tramp-use-ssh-controlmaster-options t) - (tramp-ssh-controlmaster-options - "-o ControlMaster=no -o ControlPath=none")) + (let ((default-directory default-directory)) (make-process :name readable-name :command (setq server-info (eglot--cmd contact)) -- 2.39.2

This bug report was last modified 2 years and 59 days ago.

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.

GNU bug report logs - #62194 30.0.50; Two Eglot-over-Tramp tests are failing on master, passing on emacs-29

GNU bug report logs - #62194
30.0.50; Two Eglot-over-Tramp tests are failing on master, passing on emacs-29