Revert ServerAliveInterval

Revert ServerAliveInterval change in 6.20161111, which caused problems
with too many old versions of ssh and unusual ssh configurations.

It should have not been needed anyway since ssh is supposted to
have TCPKeepAlive enabled by default.
This commit is contained in:
Joey Hess 2016-12-13 12:05:05 -04:00
parent 1d516069d8
commit 48d9624a2d
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
8 changed files with 35 additions and 39 deletions

View file

@ -59,5 +59,3 @@ SHA256E-s41311329--69c3b054a3fe9676133605730d85b7fcef8696f6782d402a524e41b836253
[[!meta title="Detect stalled transfer and retry or abort it"]]
> [[done]] --[[Joey]]

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-12-13T16:05:42Z"
content="""
Could the original bug reporter please show what your ~/.ssh/config
contains? As far as I can tell, ssh's TCPKeepAlive option, which is
supposed to be enabled by default, unless you have disabled it, should
avoid such problems.
It may also help to set ServerAliveInterval.
Unfortunately, my attempt to make git-annex set ServerAliveInterval
when running ssh broke too many systems with old sshed, and I have had to
revert it.
"""]]

View file

@ -65,3 +65,5 @@ I would just like to be sure nothing else is hidden.
> .git/config to remove that in order to recover from the problem, so might
> as well remove `.git/annex/ssh_config` too.
> --[[Joey]]
>> Fixed more by stopping using `.git/annex/ssh_config` at all. --[[Joey]]

View file

@ -24,3 +24,7 @@ To be fair, this might be an OpenSSH bug (IgnoreUnknown ought to be merged), but
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Yes, it's been taking care of my archives for nearly a year.
> How annoying, ssh seems to make it impossible to set this in a way that
> doesn't break some configurations. Oh well, gave up on setting it
> and removed the code to do so. [[done]] --[[Joey]]

View file

@ -6,3 +6,5 @@ Unfortunately, the Android apk (which I got from https://downloads.kitenet.net/g
I had to edit .git/annex/ssh.config to comment out the three offending lines and then append the contents of ~/.ssh/config to get git-annex working again.
(This is on a Nexus 10 running stock, though I doubt it matters)
> Reverted use of this feature for now.[[done]] --[[Joey]]