Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ssh: enable compression by default 

Using the same test as in 7af97c0365,
transmitted wire bytes drops from 135,531 to 133,071 (-1.81%), while
received drops from 21,073 to 14,775 (-30%).

Combined, both changes shave 13,914 bytes (-8.6%) off aggregate
bandwidth usage.

Make it configurable as compression hurts in some scenarios.
This commit is contained in:
David Wilson 2018-02-16 08:25:05 +05:45
parent a53e85ff69
commit 7e8ef4223c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/api.rst
View File

@ -562,7 +562,7 @@ Router Class
a password is requested, :py:class:`mitogen.sudo.PasswordError` is a password is requested, :py:class:`mitogen.sudo.PasswordError` is
raised. raised.
.. method:: ssh (hostname, username=None, ssh_path=None, port=None, check_host_keys=True, password=None, identity_file=None, \**kwargs) .. method:: ssh (hostname, username=None, ssh_path=None, port=None, check_host_keys=True, password=None, identity_file=None, compression_level=6, \**kwargs)
Arrange for a context to be constructed over a ``ssh`` invocation. The Arrange for a context to be constructed over a ``ssh`` invocation. The
``ssh`` process is started in a newly allocated pseudo-terminal, and ``ssh`` process is started in a newly allocated pseudo-terminal, and
@ -594,6 +594,10 @@ Router Class
the SSH client to perform authenticaion; agent authentication is the SSH client to perform authenticaion; agent authentication is
automatically disabled, as is reading the default private key from automatically disabled, as is reading the default private key from
``~/.ssh/id_rsa``, or ``~/.ssh/id_dsa``. ``~/.ssh/id_rsa``, or ``~/.ssh/id_dsa``.
:param int compression_level:
Integer 0-9 representing the zlib compression level to use on the
connection, with 0 indicating compression is disabled. Defaults to
6.
Context Class Context Class

8
mitogen/ssh.py
View File

@ -59,7 +59,7 @@ class Stream(mitogen.parent.Stream):
def construct(self, hostname, username=None, ssh_path=None, port=None, def construct(self, hostname, username=None, ssh_path=None, port=None,
check_host_keys=True, password=None, identity_file=None, check_host_keys=True, password=None, identity_file=None,
**kwargs): compression_level=6, **kwargs):
super(Stream, self).construct(**kwargs) super(Stream, self).construct(**kwargs)
self.hostname = hostname self.hostname = hostname
self.username = username self.username = username
@ -67,6 +67,7 @@ class Stream(mitogen.parent.Stream):
self.check_host_keys = check_host_keys self.check_host_keys = check_host_keys
self.password = password self.password = password
self.identity_file = identity_file self.identity_file = identity_file
self.compression_level = compression_level
if ssh_path: if ssh_path:
self.ssh_path = ssh_path self.ssh_path = ssh_path
@ -82,6 +83,11 @@ class Stream(mitogen.parent.Stream):
bits += ['-o', 'IdentitiesOnly yes'] bits += ['-o', 'IdentitiesOnly yes']
if self.identity_file: if self.identity_file:
bits += ['-i', self.identity_file] bits += ['-i', self.identity_file]
if self.compression_level:
bits += [
'-o', 'Compression yes',
'-o', 'CompressionLevel %d' % (self.compression_level,)
]
if not self.check_host_keys: if not self.check_host_keys:
bits += [ bits += [
'-o', 'StrictHostKeyChecking no', '-o', 'StrictHostKeyChecking no',