bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
1  | 
# Copyright (C) 2006 Canonical Ltd
 | 
2  | 
#
 | 
|
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
| 
4183.7.1
by Sabin Iacob
 update FSF mailing address  | 
15  | 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
16  | 
|
| 
2018.5.19
by Andrew Bennetts
 Add docstrings to all the new modules, and a few other places.  | 
17  | 
"""The 'medium' layer for the smart servers and clients.
 | 
18  | 
||
19  | 
"Medium" here is the noun meaning "a means of transmission", not the adjective
 | 
|
20  | 
for "the quality between big and small."
 | 
|
21  | 
||
22  | 
Media carry the bytes of the requests somehow (e.g. via TCP, wrapped in HTTP, or
 | 
|
23  | 
over SSH), and pass them to and from the protocol logic.  See the overview in
 | 
|
24  | 
bzrlib/transport/smart/__init__.py.
 | 
|
25  | 
"""
 | 
|
26  | 
||
| 
3750.1.2
by Vincent Ladeuil
 Fixed as per Andrew's review.  | 
27  | 
import errno  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
28  | 
import os  | 
29  | 
import socket  | 
|
| 
2018.5.162
by Andrew Bennetts
 Add some missing _ensure_real calls, and a missing import.  | 
30  | 
import sys  | 
| 
3431.3.11
by Andrew Bennetts
 Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.  | 
31  | 
import urllib  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
32  | 
|
| 
3530.1.1
by John Arbash Meinel
 Make bzrlib.smart use lazy imports.  | 
33  | 
from bzrlib.lazy_import import lazy_import  | 
34  | 
lazy_import(globals(), """  | 
|
| 
3731.2.4
by Andrew Bennetts
 Minor tweaks.  | 
35  | 
import atexit
 | 
36  | 
import weakref
 | 
|
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
37  | 
from bzrlib import (
 | 
| 
3731.2.1
by Andrew Bennetts
 Show total HPSS calls (if any) on stderr when -Dhpss is active.  | 
38  | 
    debug,
 | 
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
39  | 
    errors,
 | 
| 
3118.2.1
by Andrew Bennetts
 (andrew) Fix #115781 by passing no more than 64k at a time to socket.sendall.  | 
40  | 
    osutils,
 | 
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
41  | 
    symbol_versioning,
 | 
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
42  | 
    trace,
 | 
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
43  | 
    ui,
 | 
| 
3431.3.11
by Andrew Bennetts
 Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.  | 
44  | 
    urlutils,
 | 
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
45  | 
    )
 | 
| 
3731.2.1
by Andrew Bennetts
 Show total HPSS calls (if any) on stderr when -Dhpss is active.  | 
46  | 
from bzrlib.smart import client, protocol
 | 
| 
3066.2.1
by John Arbash Meinel
 We don't require paramiko for bzr+ssh.  | 
47  | 
from bzrlib.transport import ssh
 | 
| 
3530.1.1
by John Arbash Meinel
 Make bzrlib.smart use lazy imports.  | 
48  | 
""")  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
49  | 
|
| 
2018.5.17
by Andrew Bennetts
 Paramaterise the commands handled by SmartServerRequestHandler.  | 
50  | 
|
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
51  | 
# We must not read any more than 64k at a time so we don't risk "no buffer
 | 
52  | 
# space available" errors on some platforms.  Windows in particular is likely
 | 
|
53  | 
# to give error 10053 or 10055 if we read more than 64k from a socket.
 | 
|
54  | 
_MAX_READ_SIZE = 64 * 1024  | 
|
55  | 
||
56  | 
||
| 
3245.4.16
by Andrew Bennetts
 Remove duplication of request version identification logic in wsgi.py  | 
57  | 
def _get_protocol_factory_for_bytes(bytes):  | 
58  | 
"""Determine the right protocol factory for 'bytes'.  | 
|
59  | 
||
60  | 
    This will return an appropriate protocol factory depending on the version
 | 
|
61  | 
    of the protocol being used, as determined by inspecting the given bytes.
 | 
|
62  | 
    The bytes should have at least one newline byte (i.e. be a whole line),
 | 
|
63  | 
    otherwise it's possible that a request will be incorrectly identified as
 | 
|
64  | 
    version 1.
 | 
|
65  | 
||
66  | 
    Typical use would be::
 | 
|
67  | 
||
68  | 
         factory, unused_bytes = _get_protocol_factory_for_bytes(bytes)
 | 
|
69  | 
         server_protocol = factory(transport, write_func, root_client_path)
 | 
|
70  | 
         server_protocol.accept_bytes(unused_bytes)
 | 
|
71  | 
||
72  | 
    :param bytes: a str of bytes of the start of the request.
 | 
|
73  | 
    :returns: 2-tuple of (protocol_factory, unused_bytes).  protocol_factory is
 | 
|
74  | 
        a callable that takes three args: transport, write_func,
 | 
|
75  | 
        root_client_path.  unused_bytes are any bytes that were not part of a
 | 
|
76  | 
        protocol version marker.
 | 
|
77  | 
    """
 | 
|
| 
3530.1.1
by John Arbash Meinel
 Make bzrlib.smart use lazy imports.  | 
78  | 
if bytes.startswith(protocol.MESSAGE_VERSION_THREE):  | 
79  | 
protocol_factory = protocol.build_server_protocol_three  | 
|
80  | 
bytes = bytes[len(protocol.MESSAGE_VERSION_THREE):]  | 
|
81  | 
elif bytes.startswith(protocol.REQUEST_VERSION_TWO):  | 
|
82  | 
protocol_factory = protocol.SmartServerRequestProtocolTwo  | 
|
83  | 
bytes = bytes[len(protocol.REQUEST_VERSION_TWO):]  | 
|
| 
3245.4.16
by Andrew Bennetts
 Remove duplication of request version identification logic in wsgi.py  | 
84  | 
else:  | 
| 
3530.1.1
by John Arbash Meinel
 Make bzrlib.smart use lazy imports.  | 
85  | 
protocol_factory = protocol.SmartServerRequestProtocolOne  | 
| 
3245.4.16
by Andrew Bennetts
 Remove duplication of request version identification logic in wsgi.py  | 
86  | 
return protocol_factory, bytes  | 
87  | 
||
88  | 
||
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
89  | 
def _get_line(read_bytes_func):  | 
90  | 
"""Read bytes using read_bytes_func until a newline byte.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
91  | 
|
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
92  | 
    This isn't particularly efficient, so should only be used when the
 | 
93  | 
    expected size of the line is quite short.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
94  | 
|
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
95  | 
    :returns: a tuple of two strs: (line, excess)
 | 
96  | 
    """
 | 
|
97  | 
newline_pos = -1  | 
|
98  | 
bytes = ''  | 
|
99  | 
while newline_pos == -1:  | 
|
100  | 
new_bytes = read_bytes_func(1)  | 
|
101  | 
bytes += new_bytes  | 
|
102  | 
if new_bytes == '':  | 
|
103  | 
            # Ran out of bytes before receiving a complete line.
 | 
|
104  | 
return bytes, ''  | 
|
105  | 
newline_pos = bytes.find('\n')  | 
|
106  | 
line = bytes[:newline_pos+1]  | 
|
107  | 
excess = bytes[newline_pos+1:]  | 
|
108  | 
return line, excess  | 
|
109  | 
||
110  | 
||
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
111  | 
class SmartMedium(object):  | 
112  | 
"""Base class for smart protocol media, both client- and server-side."""  | 
|
113  | 
||
114  | 
def __init__(self):  | 
|
115  | 
self._push_back_buffer = None  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
116  | 
|
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
117  | 
def _push_back(self, bytes):  | 
118  | 
"""Return unused bytes to the medium, because they belong to the next  | 
|
119  | 
        request(s).
 | 
|
120  | 
||
121  | 
        This sets the _push_back_buffer to the given bytes.
 | 
|
122  | 
        """
 | 
|
123  | 
if self._push_back_buffer is not None:  | 
|
124  | 
raise AssertionError(  | 
|
125  | 
"_push_back called when self._push_back_buffer is %r"  | 
|
126  | 
% (self._push_back_buffer,))  | 
|
127  | 
if bytes == '':  | 
|
128  | 
            return
 | 
|
129  | 
self._push_back_buffer = bytes  | 
|
130  | 
||
131  | 
def _get_push_back_buffer(self):  | 
|
132  | 
if self._push_back_buffer == '':  | 
|
133  | 
raise AssertionError(  | 
|
134  | 
'%s._push_back_buffer should never be the empty string, '  | 
|
135  | 
'which can be confused with EOF' % (self,))  | 
|
136  | 
bytes = self._push_back_buffer  | 
|
137  | 
self._push_back_buffer = None  | 
|
138  | 
return bytes  | 
|
139  | 
||
140  | 
def read_bytes(self, desired_count):  | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
141  | 
"""Read some bytes from this medium.  | 
142  | 
||
143  | 
        :returns: some bytes, possibly more or less than the number requested
 | 
|
144  | 
            in 'desired_count' depending on the medium.
 | 
|
145  | 
        """
 | 
|
146  | 
if self._push_back_buffer is not None:  | 
|
147  | 
return self._get_push_back_buffer()  | 
|
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
148  | 
bytes_to_read = min(desired_count, _MAX_READ_SIZE)  | 
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
149  | 
return self._read_bytes(bytes_to_read)  | 
150  | 
||
151  | 
def _read_bytes(self, count):  | 
|
152  | 
raise NotImplementedError(self._read_bytes)  | 
|
153  | 
||
154  | 
def _get_line(self):  | 
|
155  | 
"""Read bytes from this request's response until a newline byte.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
156  | 
|
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
157  | 
        This isn't particularly efficient, so should only be used when the
 | 
158  | 
        expected size of the line is quite short.
 | 
|
159  | 
||
160  | 
        :returns: a string of bytes ending in a newline (byte 0x0A).
 | 
|
161  | 
        """
 | 
|
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
162  | 
line, excess = _get_line(self.read_bytes)  | 
163  | 
self._push_back(excess)  | 
|
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
164  | 
return line  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
165  | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
166  | 
def _report_activity(self, bytes, direction):  | 
167  | 
"""Notify that this medium has activity.  | 
|
168  | 
||
169  | 
        Implementations should call this from all methods that actually do IO.
 | 
|
170  | 
        Be careful that it's not called twice, if one method is implemented on
 | 
|
171  | 
        top of another.
 | 
|
172  | 
||
173  | 
        :param bytes: Number of bytes read or written.
 | 
|
174  | 
        :param direction: 'read' or 'write' or None.
 | 
|
175  | 
        """
 | 
|
176  | 
ui.ui_factory.report_transport_activity(self, bytes, direction)  | 
|
177  | 
||
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
178  | 
|
179  | 
class SmartServerStreamMedium(SmartMedium):  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
180  | 
"""Handles smart commands coming over a stream.  | 
181  | 
||
182  | 
    The stream may be a pipe connected to sshd, or a tcp socket, or an
 | 
|
183  | 
    in-process fifo for testing.
 | 
|
184  | 
||
185  | 
    One instance is created for each connected client; it can serve multiple
 | 
|
186  | 
    requests in the lifetime of the connection.
 | 
|
187  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
188  | 
    The server passes requests through to an underlying backing transport,
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
189  | 
    which will typically be a LocalTransport looking at the server's filesystem.
 | 
| 
3236.3.4
by Andrew Bennetts
 Rename 'push_back' attribute to '_push_back_buffer', add some docstrings, and remove a little bit of redundant code from SmartServerSocketStreamMedium._serve_one_request_unguarded.  | 
190  | 
|
191  | 
    :ivar _push_back_buffer: a str of bytes that have been read from the stream
 | 
|
192  | 
        but not used yet, or None if there are no buffered bytes.  Subclasses
 | 
|
193  | 
        should make sure to exhaust this buffer before reading more bytes from
 | 
|
194  | 
        the stream.  See also the _push_back method.
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
195  | 
    """
 | 
196  | 
||
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
197  | 
def __init__(self, backing_transport, root_client_path='/'):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
198  | 
"""Construct new server.  | 
199  | 
||
200  | 
        :param backing_transport: Transport for the directory served.
 | 
|
201  | 
        """
 | 
|
202  | 
        # backing_transport could be passed to serve instead of __init__
 | 
|
203  | 
self.backing_transport = backing_transport  | 
|
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
204  | 
self.root_client_path = root_client_path  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
205  | 
self.finished = False  | 
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
206  | 
SmartMedium.__init__(self)  | 
| 
3236.3.5
by Andrew Bennetts
 Add _get_push_back_buffer helper.  | 
207  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
208  | 
def serve(self):  | 
209  | 
"""Serve requests until the client disconnects."""  | 
|
210  | 
        # Keep a reference to stderr because the sys module's globals get set to
 | 
|
211  | 
        # None during interpreter shutdown.
 | 
|
212  | 
from sys import stderr  | 
|
213  | 
try:  | 
|
214  | 
while not self.finished:  | 
|
| 
2432.2.3
by Andrew Bennetts
 Merge from bzr.dev.  | 
215  | 
server_protocol = self._build_protocol()  | 
| 
2018.5.14
by Andrew Bennetts
 Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.  | 
216  | 
self._serve_one_request(server_protocol)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
217  | 
except Exception, e:  | 
218  | 
stderr.write("%s terminating on exception %s\n" % (self, e))  | 
|
219  | 
            raise
 | 
|
220  | 
||
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
221  | 
def _build_protocol(self):  | 
| 
2432.2.8
by Andrew Bennetts
 NEWS entry, greatly improved docstring in bzrlib.smart.  | 
222  | 
"""Identifies the version of the incoming request, and returns an  | 
223  | 
        a protocol object that can interpret it.
 | 
|
224  | 
||
225  | 
        If more bytes than the version prefix of the request are read, they will
 | 
|
226  | 
        be fed into the protocol before it is returned.
 | 
|
227  | 
||
228  | 
        :returns: a SmartServerRequestProtocol.
 | 
|
229  | 
        """
 | 
|
| 
2432.2.7
by Andrew Bennetts
 Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.  | 
230  | 
bytes = self._get_line()  | 
| 
3245.4.16
by Andrew Bennetts
 Remove duplication of request version identification logic in wsgi.py  | 
231  | 
protocol_factory, unused_bytes = _get_protocol_factory_for_bytes(bytes)  | 
| 
3245.4.14
by Andrew Bennetts
 Merge from bzr.dev (via loom thread).  | 
232  | 
protocol = protocol_factory(  | 
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
233  | 
self.backing_transport, self._write_out, self.root_client_path)  | 
| 
3245.4.16
by Andrew Bennetts
 Remove duplication of request version identification logic in wsgi.py  | 
234  | 
protocol.accept_bytes(unused_bytes)  | 
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
235  | 
return protocol  | 
236  | 
||
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
237  | 
def _serve_one_request(self, protocol):  | 
238  | 
"""Read one request from input, process, send back a response.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
239  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
240  | 
        :param protocol: a SmartServerRequestProtocol.
 | 
241  | 
        """
 | 
|
242  | 
try:  | 
|
243  | 
self._serve_one_request_unguarded(protocol)  | 
|
244  | 
except KeyboardInterrupt:  | 
|
245  | 
            raise
 | 
|
246  | 
except Exception, e:  | 
|
247  | 
self.terminate_due_to_error()  | 
|
248  | 
||
249  | 
def terminate_due_to_error(self):  | 
|
250  | 
"""Called when an unhandled exception from the protocol occurs."""  | 
|
251  | 
raise NotImplementedError(self.terminate_due_to_error)  | 
|
252  | 
||
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
253  | 
def _read_bytes(self, desired_count):  | 
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
254  | 
"""Get some bytes from the medium.  | 
255  | 
||
256  | 
        :param desired_count: number of bytes we want to read.
 | 
|
257  | 
        """
 | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
258  | 
raise NotImplementedError(self._read_bytes)  | 
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
259  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
260  | 
|
261  | 
class SmartServerSocketStreamMedium(SmartServerStreamMedium):  | 
|
262  | 
||
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
263  | 
def __init__(self, sock, backing_transport, root_client_path='/'):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
264  | 
"""Constructor.  | 
265  | 
||
266  | 
        :param sock: the socket the server will read from.  It will be put
 | 
|
267  | 
            into blocking mode.
 | 
|
268  | 
        """
 | 
|
| 
2692.1.11
by Andrew Bennetts
 Improve test coverage by making SmartTCPServer_for_testing by default create a server that does not serve the backing transport's root at its own root. This mirrors the way most HTTP smart servers are configured.  | 
269  | 
SmartServerStreamMedium.__init__(  | 
270  | 
self, backing_transport, root_client_path=root_client_path)  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
271  | 
sock.setblocking(True)  | 
272  | 
self.socket = sock  | 
|
273  | 
||
274  | 
def _serve_one_request_unguarded(self, protocol):  | 
|
275  | 
while protocol.next_read_size():  | 
|
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
276  | 
            # We can safely try to read large chunks.  If there is less data
 | 
277  | 
            # than _MAX_READ_SIZE ready, the socket wil just return a short
 | 
|
278  | 
            # read immediately rather than block.
 | 
|
279  | 
bytes = self.read_bytes(_MAX_READ_SIZE)  | 
|
| 
3236.3.4
by Andrew Bennetts
 Rename 'push_back' attribute to '_push_back_buffer', add some docstrings, and remove a little bit of redundant code from SmartServerSocketStreamMedium._serve_one_request_unguarded.  | 
280  | 
if bytes == '':  | 
281  | 
self.finished = True  | 
|
282  | 
                return
 | 
|
283  | 
protocol.accept_bytes(bytes)  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
284  | 
|
| 
3245.4.21
by Andrew Bennetts
 Remove 'excess_buffer' attribute and another crufty comment.  | 
285  | 
self._push_back(protocol.unused_data)  | 
| 
3195.3.18
by Andrew Bennetts
 call_with_body_bytes now works with v3 (e.g. test_copy_content_remote_to_local passes). Lots of debugging cruft, though.  | 
286  | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
287  | 
def _read_bytes(self, desired_count):  | 
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
288  | 
        # We ignore the desired_count because on sockets it's more efficient to
 | 
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
289  | 
        # read large chunks (of _MAX_READ_SIZE bytes) at a time.
 | 
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
290  | 
bytes = osutils.until_no_eintr(self.socket.recv, _MAX_READ_SIZE)  | 
291  | 
self._report_activity(len(bytes), 'read')  | 
|
292  | 
return bytes  | 
|
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
293  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
294  | 
def terminate_due_to_error(self):  | 
| 
3245.4.59
by Andrew Bennetts
 Various tweaks in response to Martin's review.  | 
295  | 
        # TODO: This should log to a server log file, but no such thing
 | 
296  | 
        # exists yet.  Andrew Bennetts 2006-09-29.
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
297  | 
self.socket.close()  | 
298  | 
self.finished = True  | 
|
299  | 
||
300  | 
def _write_out(self, bytes):  | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
301  | 
osutils.send_all(self.socket, bytes, self._report_activity)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
302  | 
|
303  | 
||
304  | 
class SmartServerPipeStreamMedium(SmartServerStreamMedium):  | 
|
305  | 
||
306  | 
def __init__(self, in_file, out_file, backing_transport):  | 
|
307  | 
"""Construct new server.  | 
|
308  | 
||
309  | 
        :param in_file: Python file from which requests can be read.
 | 
|
310  | 
        :param out_file: Python file to write responses.
 | 
|
311  | 
        :param backing_transport: Transport for the directory served.
 | 
|
312  | 
        """
 | 
|
313  | 
SmartServerStreamMedium.__init__(self, backing_transport)  | 
|
| 
2018.5.161
by Andrew Bennetts
 Reinstate forcing binary mode on windows in SmartServerStreamMedium.  | 
314  | 
if sys.platform == 'win32':  | 
315  | 
            # force binary mode for files
 | 
|
316  | 
import msvcrt  | 
|
317  | 
for f in (in_file, out_file):  | 
|
318  | 
fileno = getattr(f, 'fileno', None)  | 
|
319  | 
if fileno:  | 
|
320  | 
msvcrt.setmode(fileno(), os.O_BINARY)  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
321  | 
self._in = in_file  | 
322  | 
self._out = out_file  | 
|
323  | 
||
324  | 
def _serve_one_request_unguarded(self, protocol):  | 
|
325  | 
while True:  | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
326  | 
            # We need to be careful not to read past the end of the current
 | 
327  | 
            # request, or else the read from the pipe will block, so we use
 | 
|
328  | 
            # protocol.next_read_size().
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
329  | 
bytes_to_read = protocol.next_read_size()  | 
330  | 
if bytes_to_read == 0:  | 
|
331  | 
                # Finished serving this request.
 | 
|
332  | 
self._out.flush()  | 
|
333  | 
                return
 | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
334  | 
bytes = self.read_bytes(bytes_to_read)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
335  | 
if bytes == '':  | 
336  | 
                # Connection has been closed.
 | 
|
337  | 
self.finished = True  | 
|
338  | 
self._out.flush()  | 
|
339  | 
                return
 | 
|
340  | 
protocol.accept_bytes(bytes)  | 
|
341  | 
||
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
342  | 
def _read_bytes(self, desired_count):  | 
| 
2432.2.2
by Andrew Bennetts
 Smart server mediums now detect which protocol version a request is and dispatch accordingly.  | 
343  | 
return self._in.read(desired_count)  | 
344  | 
||
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
345  | 
def terminate_due_to_error(self):  | 
346  | 
        # TODO: This should log to a server log file, but no such thing
 | 
|
347  | 
        # exists yet.  Andrew Bennetts 2006-09-29.
 | 
|
348  | 
self._out.close()  | 
|
349  | 
self.finished = True  | 
|
350  | 
||
351  | 
def _write_out(self, bytes):  | 
|
352  | 
self._out.write(bytes)  | 
|
353  | 
||
354  | 
||
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
355  | 
class SmartClientMediumRequest(object):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
356  | 
"""A request on a SmartClientMedium.  | 
357  | 
||
358  | 
    Each request allows bytes to be provided to it via accept_bytes, and then
 | 
|
359  | 
    the response bytes to be read via read_bytes.
 | 
|
360  | 
||
361  | 
    For instance:
 | 
|
362  | 
    request.accept_bytes('123')
 | 
|
363  | 
    request.finished_writing()
 | 
|
364  | 
    result = request.read_bytes(3)
 | 
|
365  | 
    request.finished_reading()
 | 
|
366  | 
||
367  | 
    It is up to the individual SmartClientMedium whether multiple concurrent
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
368  | 
    requests can exist. See SmartClientMedium.get_request to obtain instances
 | 
369  | 
    of SmartClientMediumRequest, and the concrete Medium you are using for
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
370  | 
    details on concurrency and pipelining.
 | 
371  | 
    """
 | 
|
372  | 
||
373  | 
def __init__(self, medium):  | 
|
374  | 
"""Construct a SmartClientMediumRequest for the medium medium."""  | 
|
375  | 
self._medium = medium  | 
|
376  | 
        # we track state by constants - we may want to use the same
 | 
|
377  | 
        # pattern as BodyReader if it gets more complex.
 | 
|
378  | 
        # valid states are: "writing", "reading", "done"
 | 
|
379  | 
self._state = "writing"  | 
|
380  | 
||
381  | 
def accept_bytes(self, bytes):  | 
|
382  | 
"""Accept bytes for inclusion in this request.  | 
|
383  | 
||
384  | 
        This method may not be be called after finished_writing() has been
 | 
|
385  | 
        called.  It depends upon the Medium whether or not the bytes will be
 | 
|
386  | 
        immediately transmitted. Message based Mediums will tend to buffer the
 | 
|
387  | 
        bytes until finished_writing() is called.
 | 
|
388  | 
||
389  | 
        :param bytes: A bytestring.
 | 
|
390  | 
        """
 | 
|
391  | 
if self._state != "writing":  | 
|
392  | 
raise errors.WritingCompleted(self)  | 
|
393  | 
self._accept_bytes(bytes)  | 
|
394  | 
||
395  | 
def _accept_bytes(self, bytes):  | 
|
396  | 
"""Helper for accept_bytes.  | 
|
397  | 
||
398  | 
        Accept_bytes checks the state of the request to determing if bytes
 | 
|
399  | 
        should be accepted. After that it hands off to _accept_bytes to do the
 | 
|
400  | 
        actual acceptance.
 | 
|
401  | 
        """
 | 
|
402  | 
raise NotImplementedError(self._accept_bytes)  | 
|
403  | 
||
404  | 
def finished_reading(self):  | 
|
405  | 
"""Inform the request that all desired data has been read.  | 
|
406  | 
||
407  | 
        This will remove the request from the pipeline for its medium (if the
 | 
|
408  | 
        medium supports pipelining) and any further calls to methods on the
 | 
|
409  | 
        request will raise ReadingCompleted.
 | 
|
410  | 
        """
 | 
|
411  | 
if self._state == "writing":  | 
|
412  | 
raise errors.WritingNotComplete(self)  | 
|
413  | 
if self._state != "reading":  | 
|
414  | 
raise errors.ReadingCompleted(self)  | 
|
415  | 
self._state = "done"  | 
|
416  | 
self._finished_reading()  | 
|
417  | 
||
418  | 
def _finished_reading(self):  | 
|
419  | 
"""Helper for finished_reading.  | 
|
420  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
421  | 
        finished_reading checks the state of the request to determine if
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
422  | 
        finished_reading is allowed, and if it is hands off to _finished_reading
 | 
423  | 
        to perform the action.
 | 
|
424  | 
        """
 | 
|
425  | 
raise NotImplementedError(self._finished_reading)  | 
|
426  | 
||
427  | 
def finished_writing(self):  | 
|
428  | 
"""Finish the writing phase of this request.  | 
|
429  | 
||
430  | 
        This will flush all pending data for this request along the medium.
 | 
|
431  | 
        After calling finished_writing, you may not call accept_bytes anymore.
 | 
|
432  | 
        """
 | 
|
433  | 
if self._state != "writing":  | 
|
434  | 
raise errors.WritingCompleted(self)  | 
|
435  | 
self._state = "reading"  | 
|
436  | 
self._finished_writing()  | 
|
437  | 
||
438  | 
def _finished_writing(self):  | 
|
439  | 
"""Helper for finished_writing.  | 
|
440  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
441  | 
        finished_writing checks the state of the request to determine if
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
442  | 
        finished_writing is allowed, and if it is hands off to _finished_writing
 | 
443  | 
        to perform the action.
 | 
|
444  | 
        """
 | 
|
445  | 
raise NotImplementedError(self._finished_writing)  | 
|
446  | 
||
447  | 
def read_bytes(self, count):  | 
|
448  | 
"""Read bytes from this requests response.  | 
|
449  | 
||
450  | 
        This method will block and wait for count bytes to be read. It may not
 | 
|
451  | 
        be invoked until finished_writing() has been called - this is to ensure
 | 
|
| 
2432.2.7
by Andrew Bennetts
 Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.  | 
452  | 
        a message-based approach to requests, for compatibility with message
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
453  | 
        based mediums like HTTP.
 | 
454  | 
        """
 | 
|
455  | 
if self._state == "writing":  | 
|
456  | 
raise errors.WritingNotComplete(self)  | 
|
457  | 
if self._state != "reading":  | 
|
458  | 
raise errors.ReadingCompleted(self)  | 
|
459  | 
return self._read_bytes(count)  | 
|
460  | 
||
461  | 
def _read_bytes(self, count):  | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
462  | 
"""Helper for SmartClientMediumRequest.read_bytes.  | 
463  | 
||
464  | 
        read_bytes checks the state of the request to determing if bytes
 | 
|
465  | 
        should be read. After that it hands off to _read_bytes to do the
 | 
|
466  | 
        actual read.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
467  | 
|
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
468  | 
        By default this forwards to self._medium.read_bytes because we are
 | 
469  | 
        operating on the medium's stream.
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
470  | 
        """
 | 
| 
3565.1.2
by Andrew Bennetts
 Delete some more code, fix some bugs, add more comments.  | 
471  | 
return self._medium.read_bytes(count)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
472  | 
|
| 
2432.2.7
by Andrew Bennetts
 Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.  | 
473  | 
def read_line(self):  | 
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
474  | 
line = self._read_line()  | 
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
475  | 
if not line.endswith('\n'):  | 
476  | 
            # end of file encountered reading from server
 | 
|
477  | 
raise errors.ConnectionReset(  | 
|
| 
4070.8.1
by Martin Pool
 Remove 'try -Dhpss' from error messages  | 
478  | 
"please check connectivity and permissions")  | 
| 
2432.2.7
by Andrew Bennetts
 Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.  | 
479  | 
return line  | 
480  | 
||
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
481  | 
def _read_line(self):  | 
482  | 
"""Helper for SmartClientMediumRequest.read_line.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
483  | 
|
| 
3606.4.1
by Andrew Bennetts
 Fix NotImplementedError when probing for smart protocol via HTTP.  | 
484  | 
        By default this forwards to self._medium._get_line because we are
 | 
485  | 
        operating on the medium's stream.
 | 
|
486  | 
        """
 | 
|
487  | 
return self._medium._get_line()  | 
|
488  | 
||
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
489  | 
|
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
490  | 
class _DebugCounter(object):  | 
491  | 
"""An object that counts the HPSS calls made to each client medium.  | 
|
492  | 
||
493  | 
    When a medium is garbage-collected, or failing that when atexit functions
 | 
|
494  | 
    are run, the total number of calls made on that medium are reported via
 | 
|
495  | 
    trace.note.
 | 
|
| 
3731.2.1
by Andrew Bennetts
 Show total HPSS calls (if any) on stderr when -Dhpss is active.  | 
496  | 
    """
 | 
497  | 
||
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
498  | 
def __init__(self):  | 
499  | 
self.counts = weakref.WeakKeyDictionary()  | 
|
500  | 
client._SmartClient.hooks.install_named_hook(  | 
|
501  | 
'call', self.increment_call_count, 'hpss call counter')  | 
|
502  | 
atexit.register(self.flush_all)  | 
|
503  | 
||
504  | 
def track(self, medium):  | 
|
505  | 
"""Start tracking calls made to a medium.  | 
|
506  | 
||
507  | 
        This only keeps a weakref to the medium, so shouldn't affect the
 | 
|
508  | 
        medium's lifetime.
 | 
|
509  | 
        """
 | 
|
510  | 
medium_repr = repr(medium)  | 
|
511  | 
        # Add this medium to the WeakKeyDictionary
 | 
|
512  | 
self.counts[medium] = [0, medium_repr]  | 
|
513  | 
        # Weakref callbacks are fired in reverse order of their association
 | 
|
514  | 
        # with the referenced object.  So we add a weakref *after* adding to
 | 
|
515  | 
        # the WeakKeyDict so that we can report the value from it before the
 | 
|
516  | 
        # entry is removed by the WeakKeyDict's own callback.
 | 
|
517  | 
ref = weakref.ref(medium, self.done)  | 
|
518  | 
||
519  | 
def increment_call_count(self, params):  | 
|
520  | 
        # Increment the count in the WeakKeyDictionary
 | 
|
521  | 
value = self.counts[params.medium]  | 
|
522  | 
value[0] += 1  | 
|
| 
3731.2.1
by Andrew Bennetts
 Show total HPSS calls (if any) on stderr when -Dhpss is active.  | 
523  | 
|
524  | 
def done(self, ref):  | 
|
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
525  | 
value = self.counts[ref]  | 
526  | 
count, medium_repr = value  | 
|
527  | 
        # In case this callback is invoked for the same ref twice (by the
 | 
|
528  | 
        # weakref callback and by the atexit function), set the call count back
 | 
|
529  | 
        # to 0 so this item won't be reported twice.
 | 
|
530  | 
value[0] = 0  | 
|
531  | 
if count != 0:  | 
|
532  | 
trace.note('HPSS calls: %d %s', count, medium_repr)  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
533  | 
|
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
534  | 
def flush_all(self):  | 
535  | 
for ref in list(self.counts.keys()):  | 
|
536  | 
self.done(ref)  | 
|
537  | 
||
538  | 
_debug_counter = None  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
539  | 
|
540  | 
||
| 
3565.1.1
by Andrew Bennetts
 Read no more then 64k at a time in the smart protocol code.  | 
541  | 
class SmartClientMedium(SmartMedium):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
542  | 
"""Smart client is a medium for sending smart protocol requests over."""  | 
543  | 
||
| 
3431.3.3
by Andrew Bennetts
 Set 'base' in SmartClientMedium base class.  | 
544  | 
def __init__(self, base):  | 
| 
3241.1.1
by Andrew Bennetts
 Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.  | 
545  | 
super(SmartClientMedium, self).__init__()  | 
| 
3431.3.3
by Andrew Bennetts
 Set 'base' in SmartClientMedium base class.  | 
546  | 
self.base = base  | 
| 
3241.1.4
by Andrew Bennetts
 Use get_smart_medium as suggested by Robert, and deal with the fallout.  | 
547  | 
self._protocol_version_error = None  | 
| 
3241.1.1
by Andrew Bennetts
 Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.  | 
548  | 
self._protocol_version = None  | 
| 
3245.4.47
by Andrew Bennetts
 Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).  | 
549  | 
self._done_hello = False  | 
| 
3435.1.1
by Andrew Bennetts
 Define _remote_is_at_least_1_2 on SmartClientMedium base class, rather than just SmartClientStreamMedium.  | 
550  | 
        # Be optimistic: we assume the remote end can accept new remote
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
551  | 
        # requests until we get an error saying otherwise.
 | 
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
552  | 
        # _remote_version_is_before tracks the bzr version the remote side
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
553  | 
        # can be based on what we've seen so far.
 | 
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
554  | 
self._remote_version_is_before = None  | 
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
555  | 
        # Install debug hook function if debug flag is set.
 | 
| 
3731.2.1
by Andrew Bennetts
 Show total HPSS calls (if any) on stderr when -Dhpss is active.  | 
556  | 
if 'hpss' in debug.debug_flags:  | 
| 
3731.2.5
by Andrew Bennetts
 Rework hpss call counter.  | 
557  | 
global _debug_counter  | 
558  | 
if _debug_counter is None:  | 
|
559  | 
_debug_counter = _DebugCounter()  | 
|
560  | 
_debug_counter.track(self)  | 
|
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
561  | 
|
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
562  | 
def _is_remote_before(self, version_tuple):  | 
| 
3502.1.1
by Matt Nordhoff
 Fix a docstring typo, and a two-expression ``raise`` statement  | 
563  | 
"""Is it possible the remote side supports RPCs for a given version?  | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
564  | 
|
565  | 
        Typical use::
 | 
|
566  | 
||
567  | 
            needed_version = (1, 2)
 | 
|
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
568  | 
            if medium._is_remote_before(needed_version):
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
569  | 
                fallback_to_pre_1_2_rpc()
 | 
570  | 
            else:
 | 
|
571  | 
                try:
 | 
|
572  | 
                    do_1_2_rpc()
 | 
|
573  | 
                except UnknownSmartMethod:
 | 
|
| 
3453.4.9
by Andrew Bennetts
 Rename _remote_is_not to _remember_remote_is_before.  | 
574  | 
                    medium._remember_remote_is_before(needed_version)
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
575  | 
                    fallback_to_pre_1_2_rpc()
 | 
576  | 
||
| 
3453.4.9
by Andrew Bennetts
 Rename _remote_is_not to _remember_remote_is_before.  | 
577  | 
        :seealso: _remember_remote_is_before
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
578  | 
        """
 | 
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
579  | 
if self._remote_version_is_before is None:  | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
580  | 
            # So far, the remote side seems to support everything
 | 
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
581  | 
return False  | 
582  | 
return version_tuple >= self._remote_version_is_before  | 
|
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
583  | 
|
| 
3453.4.9
by Andrew Bennetts
 Rename _remote_is_not to _remember_remote_is_before.  | 
584  | 
def _remember_remote_is_before(self, version_tuple):  | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
585  | 
"""Tell this medium that the remote side is older the given version.  | 
586  | 
||
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
587  | 
        :seealso: _is_remote_before
 | 
| 
3453.4.1
by Andrew Bennetts
 Better infrastructure on SmartClientMedium for tracking the remote version.  | 
588  | 
        """
 | 
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
589  | 
if (self._remote_version_is_before is not None and  | 
590  | 
version_tuple > self._remote_version_is_before):  | 
|
| 
4017.3.3
by Robert Collins
 Review feedback - make RemoteRepository.initialize use helpers, and version-lock the new method to not attempt the method on older servers.  | 
591  | 
            # We have been told that the remote side is older than some version
 | 
592  | 
            # which is newer than a previously supplied older-than version.
 | 
|
593  | 
            # This indicates that some smart verb call is not guarded
 | 
|
594  | 
            # appropriately (it should simply not have been tried).
 | 
|
| 
3502.1.1
by Matt Nordhoff
 Fix a docstring typo, and a two-expression ``raise`` statement  | 
595  | 
raise AssertionError(  | 
| 
3453.4.9
by Andrew Bennetts
 Rename _remote_is_not to _remember_remote_is_before.  | 
596  | 
"_remember_remote_is_before(%r) called, but "  | 
597  | 
"_remember_remote_is_before(%r) was called previously."  | 
|
| 
3453.4.10
by Andrew Bennetts
 Change _is_remote_at_least to _is_remote_before.  | 
598  | 
% (version_tuple, self._remote_version_is_before))  | 
599  | 
self._remote_version_is_before = version_tuple  | 
|
| 
3241.1.1
by Andrew Bennetts
 Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.  | 
600  | 
|
601  | 
def protocol_version(self):  | 
|
| 
3245.4.47
by Andrew Bennetts
 Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).  | 
602  | 
"""Find out if 'hello' smart request works."""  | 
| 
3241.1.4
by Andrew Bennetts
 Use get_smart_medium as suggested by Robert, and deal with the fallout.  | 
603  | 
if self._protocol_version_error is not None:  | 
604  | 
raise self._protocol_version_error  | 
|
| 
3245.4.47
by Andrew Bennetts
 Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).  | 
605  | 
if not self._done_hello:  | 
| 
3241.1.4
by Andrew Bennetts
 Use get_smart_medium as suggested by Robert, and deal with the fallout.  | 
606  | 
try:  | 
607  | 
medium_request = self.get_request()  | 
|
608  | 
                # Send a 'hello' request in protocol version one, for maximum
 | 
|
609  | 
                # backwards compatibility.
 | 
|
| 
3530.1.2
by John Arbash Meinel
 missed one of the imports  | 
610  | 
client_protocol = protocol.SmartClientRequestProtocolOne(medium_request)  | 
| 
3245.4.47
by Andrew Bennetts
 Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).  | 
611  | 
client_protocol.query_version()  | 
612  | 
self._done_hello = True  | 
|
| 
3241.1.4
by Andrew Bennetts
 Use get_smart_medium as suggested by Robert, and deal with the fallout.  | 
613  | 
except errors.SmartProtocolError, e:  | 
614  | 
                # Cache the error, just like we would cache a successful
 | 
|
615  | 
                # result.
 | 
|
616  | 
self._protocol_version_error = e  | 
|
617  | 
                raise
 | 
|
| 
3245.4.47
by Andrew Bennetts
 Don't automatically send 'hello' requests from RemoteBzrDirFormat.probe_transport unless we have to (i.e. the transport is HTTP).  | 
618  | 
return '2'  | 
619  | 
||
620  | 
def should_probe(self):  | 
|
621  | 
"""Should RemoteBzrDirFormat.probe_transport send a smart request on  | 
|
622  | 
        this medium?
 | 
|
623  | 
||
624  | 
        Some transports are unambiguously smart-only; there's no need to check
 | 
|
625  | 
        if the transport is able to carry smart requests, because that's all
 | 
|
626  | 
        it is for.  In those cases, this method should return False.
 | 
|
627  | 
||
628  | 
        But some HTTP transports can sometimes fail to carry smart requests,
 | 
|
629  | 
        but still be usuable for accessing remote bzrdirs via plain file
 | 
|
630  | 
        accesses.  So for those transports, their media should return True here
 | 
|
631  | 
        so that RemoteBzrDirFormat can determine if it is appropriate for that
 | 
|
632  | 
        transport.
 | 
|
633  | 
        """
 | 
|
634  | 
return False  | 
|
| 
3241.1.1
by Andrew Bennetts
 Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.  | 
635  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
636  | 
def disconnect(self):  | 
637  | 
"""If this medium maintains a persistent connection, close it.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
638  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
639  | 
        The default implementation does nothing.
 | 
640  | 
        """
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
641  | 
|
| 
3431.3.11
by Andrew Bennetts
 Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.  | 
642  | 
def remote_path_from_transport(self, transport):  | 
643  | 
"""Convert transport into a path suitable for using in a request.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
644  | 
|
| 
3431.3.11
by Andrew Bennetts
 Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.  | 
645  | 
        Note that the resulting remote path doesn't encode the host name or
 | 
646  | 
        anything but path, so it is only safe to use it in requests sent over
 | 
|
647  | 
        the medium from the matching transport.
 | 
|
648  | 
        """
 | 
|
649  | 
medium_base = urlutils.join(self.base, '/')  | 
|
650  | 
rel_url = urlutils.relative_url(medium_base, transport.base)  | 
|
651  | 
return urllib.unquote(rel_url)  | 
|
652  | 
||
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
653  | 
|
654  | 
class SmartClientStreamMedium(SmartClientMedium):  | 
|
655  | 
"""Stream based medium common class.  | 
|
656  | 
||
657  | 
    SmartClientStreamMediums operate on a stream. All subclasses use a common
 | 
|
658  | 
    SmartClientStreamMediumRequest for their requests, and should implement
 | 
|
659  | 
    _accept_bytes and _read_bytes to allow the request objects to send and
 | 
|
660  | 
    receive bytes.
 | 
|
661  | 
    """
 | 
|
662  | 
||
| 
3431.3.3
by Andrew Bennetts
 Set 'base' in SmartClientMedium base class.  | 
663  | 
def __init__(self, base):  | 
664  | 
SmartClientMedium.__init__(self, base)  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
665  | 
self._current_request = None  | 
666  | 
||
667  | 
def accept_bytes(self, bytes):  | 
|
668  | 
self._accept_bytes(bytes)  | 
|
669  | 
||
670  | 
def __del__(self):  | 
|
671  | 
"""The SmartClientStreamMedium knows how to close the stream when it is  | 
|
672  | 
        finished with it.
 | 
|
673  | 
        """
 | 
|
674  | 
self.disconnect()  | 
|
675  | 
||
676  | 
def _flush(self):  | 
|
677  | 
"""Flush the output stream.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
678  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
679  | 
        This method is used by the SmartClientStreamMediumRequest to ensure that
 | 
680  | 
        all data for a request is sent, to avoid long timeouts or deadlocks.
 | 
|
681  | 
        """
 | 
|
682  | 
raise NotImplementedError(self._flush)  | 
|
683  | 
||
684  | 
def get_request(self):  | 
|
685  | 
"""See SmartClientMedium.get_request().  | 
|
686  | 
||
687  | 
        SmartClientStreamMedium always returns a SmartClientStreamMediumRequest
 | 
|
688  | 
        for get_request.
 | 
|
689  | 
        """
 | 
|
690  | 
return SmartClientStreamMediumRequest(self)  | 
|
691  | 
||
692  | 
||
693  | 
class SmartSimplePipesClientMedium(SmartClientStreamMedium):  | 
|
694  | 
"""A client medium using simple pipes.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
695  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
696  | 
    This client does not manage the pipes: it assumes they will always be open.
 | 
697  | 
    """
 | 
|
698  | 
||
| 
3431.3.1
by Andrew Bennetts
 First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.  | 
699  | 
def __init__(self, readable_pipe, writeable_pipe, base):  | 
| 
3431.3.3
by Andrew Bennetts
 Set 'base' in SmartClientMedium base class.  | 
700  | 
SmartClientStreamMedium.__init__(self, base)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
701  | 
self._readable_pipe = readable_pipe  | 
702  | 
self._writeable_pipe = writeable_pipe  | 
|
703  | 
||
704  | 
def _accept_bytes(self, bytes):  | 
|
705  | 
"""See SmartClientStreamMedium.accept_bytes."""  | 
|
706  | 
self._writeable_pipe.write(bytes)  | 
|
| 
3958.1.2
by Andrew Bennetts
 Report network activity from more client medium implementations.  | 
707  | 
self._report_activity(len(bytes), 'write')  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
708  | 
|
709  | 
def _flush(self):  | 
|
710  | 
"""See SmartClientStreamMedium._flush()."""  | 
|
711  | 
self._writeable_pipe.flush()  | 
|
712  | 
||
713  | 
def _read_bytes(self, count):  | 
|
714  | 
"""See SmartClientStreamMedium._read_bytes."""  | 
|
| 
3958.1.2
by Andrew Bennetts
 Report network activity from more client medium implementations.  | 
715  | 
bytes = self._readable_pipe.read(count)  | 
716  | 
self._report_activity(len(bytes), 'read')  | 
|
717  | 
return bytes  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
718  | 
|
719  | 
||
720  | 
class SmartSSHClientMedium(SmartClientStreamMedium):  | 
|
721  | 
"""A client medium using SSH."""  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
722  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
723  | 
def __init__(self, host, port=None, username=None, password=None,  | 
| 
3431.3.1
by Andrew Bennetts
 First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.  | 
724  | 
base=None, vendor=None, bzr_remote_path=None):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
725  | 
"""Creates a client that will connect on the first use.  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
726  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
727  | 
        :param vendor: An optional override for the ssh vendor to use. See
 | 
728  | 
            bzrlib.transport.ssh for details on ssh vendors.
 | 
|
729  | 
        """
 | 
|
730  | 
self._connected = False  | 
|
731  | 
self._host = host  | 
|
732  | 
self._password = password  | 
|
733  | 
self._port = port  | 
|
734  | 
self._username = username  | 
|
| 
4100.1.5
by Martin Pool
 Fix crash in SSHSmartClientStreamMedium repr.  | 
735  | 
        # SmartClientStreamMedium stores the repr of this object in its
 | 
736  | 
        # _DebugCounter so we have to store all the values used in our repr
 | 
|
737  | 
        # method before calling the super init.
 | 
|
738  | 
SmartClientStreamMedium.__init__(self, base)  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
739  | 
self._read_from = None  | 
740  | 
self._ssh_connection = None  | 
|
741  | 
self._vendor = vendor  | 
|
742  | 
self._write_to = None  | 
|
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
743  | 
self._bzr_remote_path = bzr_remote_path  | 
| 
4110.2.19
by Martin Pool
 Transport activity now shows scheme and direction  | 
744  | 
        # for the benefit of progress making a short description of this
 | 
745  | 
        # transport
 | 
|
746  | 
self._scheme = 'bzr+ssh'  | 
|
| 
4100.1.1
by Martin Pool
 Cleanup and add SmartSSHClientMedium repr  | 
747  | 
|
748  | 
def __repr__(self):  | 
|
| 
4100.1.2
by Martin Pool
 review tweaks  | 
749  | 
return "%s(connected=%r, username=%r, host=%r, port=%r)" % (  | 
| 
4100.1.1
by Martin Pool
 Cleanup and add SmartSSHClientMedium repr  | 
750  | 
self.__class__.__name__,  | 
751  | 
self._connected,  | 
|
| 
4100.1.2
by Martin Pool
 review tweaks  | 
752  | 
self._username,  | 
753  | 
self._host,  | 
|
754  | 
self._port)  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
755  | 
|
756  | 
def _accept_bytes(self, bytes):  | 
|
757  | 
"""See SmartClientStreamMedium.accept_bytes."""  | 
|
758  | 
self._ensure_connection()  | 
|
759  | 
self._write_to.write(bytes)  | 
|
| 
3958.1.2
by Andrew Bennetts
 Report network activity from more client medium implementations.  | 
760  | 
self._report_activity(len(bytes), 'write')  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
761  | 
|
762  | 
def disconnect(self):  | 
|
763  | 
"""See SmartClientMedium.disconnect()."""  | 
|
764  | 
if not self._connected:  | 
|
765  | 
            return
 | 
|
766  | 
self._read_from.close()  | 
|
767  | 
self._write_to.close()  | 
|
768  | 
self._ssh_connection.close()  | 
|
769  | 
self._connected = False  | 
|
770  | 
||
771  | 
def _ensure_connection(self):  | 
|
772  | 
"""Connect this medium if not already connected."""  | 
|
773  | 
if self._connected:  | 
|
774  | 
            return
 | 
|
775  | 
if self._vendor is None:  | 
|
776  | 
vendor = ssh._get_ssh_vendor()  | 
|
777  | 
else:  | 
|
778  | 
vendor = self._vendor  | 
|
779  | 
self._ssh_connection = vendor.connect_ssh(self._username,  | 
|
780  | 
self._password, self._host, self._port,  | 
|
| 
1551.18.17
by Aaron Bentley
 Introduce bzr_remote_path configuration variable  | 
781  | 
command=[self._bzr_remote_path, 'serve', '--inet',  | 
782  | 
'--directory=/', '--allow-writes'])  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
783  | 
self._read_from, self._write_to = \  | 
784  | 
self._ssh_connection.get_filelike_channels()  | 
|
785  | 
self._connected = True  | 
|
786  | 
||
787  | 
def _flush(self):  | 
|
788  | 
"""See SmartClientStreamMedium._flush()."""  | 
|
789  | 
self._write_to.flush()  | 
|
790  | 
||
791  | 
def _read_bytes(self, count):  | 
|
792  | 
"""See SmartClientStreamMedium.read_bytes."""  | 
|
793  | 
if not self._connected:  | 
|
794  | 
raise errors.MediumNotConnected(self)  | 
|
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
795  | 
bytes_to_read = min(count, _MAX_READ_SIZE)  | 
| 
3958.1.2
by Andrew Bennetts
 Report network activity from more client medium implementations.  | 
796  | 
bytes = self._read_from.read(bytes_to_read)  | 
797  | 
self._report_activity(len(bytes), 'read')  | 
|
798  | 
return bytes  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
799  | 
|
800  | 
||
| 
3004.2.1
by Vincent Ladeuil
 Fix 150860 by leaving port as user specified it.  | 
801  | 
# Port 4155 is the default port for bzr://, registered with IANA.
 | 
| 
3665.4.1
by Jelmer Vernooij
 Support IPv6 in the smart server.  | 
802  | 
BZR_DEFAULT_INTERFACE = None  | 
| 
3004.2.1
by Vincent Ladeuil
 Fix 150860 by leaving port as user specified it.  | 
803  | 
BZR_DEFAULT_PORT = 4155  | 
804  | 
||
805  | 
||
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
806  | 
class SmartTCPClientMedium(SmartClientStreamMedium):  | 
807  | 
"""A client medium using TCP."""  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
808  | 
|
| 
3431.3.1
by Andrew Bennetts
 First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media.  | 
809  | 
def __init__(self, host, port, base):  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
810  | 
"""Creates a client that will connect on the first use."""  | 
| 
3431.3.3
by Andrew Bennetts
 Set 'base' in SmartClientMedium base class.  | 
811  | 
SmartClientStreamMedium.__init__(self, base)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
812  | 
self._connected = False  | 
813  | 
self._host = host  | 
|
814  | 
self._port = port  | 
|
815  | 
self._socket = None  | 
|
816  | 
||
817  | 
def _accept_bytes(self, bytes):  | 
|
818  | 
"""See SmartClientMedium.accept_bytes."""  | 
|
819  | 
self._ensure_connection()  | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
820  | 
osutils.send_all(self._socket, bytes, self._report_activity)  | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
821  | 
|
822  | 
def disconnect(self):  | 
|
823  | 
"""See SmartClientMedium.disconnect()."""  | 
|
824  | 
if not self._connected:  | 
|
825  | 
            return
 | 
|
826  | 
self._socket.close()  | 
|
827  | 
self._socket = None  | 
|
828  | 
self._connected = False  | 
|
829  | 
||
830  | 
def _ensure_connection(self):  | 
|
831  | 
"""Connect this medium if not already connected."""  | 
|
832  | 
if self._connected:  | 
|
833  | 
            return
 | 
|
| 
3004.2.1
by Vincent Ladeuil
 Fix 150860 by leaving port as user specified it.  | 
834  | 
if self._port is None:  | 
835  | 
port = BZR_DEFAULT_PORT  | 
|
836  | 
else:  | 
|
837  | 
port = int(self._port)  | 
|
| 
3711.2.2
by Jelmer Vernooij
 Avoid using AI_ADDRCONFIG since it's not portable.  | 
838  | 
try:  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
839  | 
sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC,  | 
| 
3711.2.2
by Jelmer Vernooij
 Avoid using AI_ADDRCONFIG since it's not portable.  | 
840  | 
socket.SOCK_STREAM, 0, 0)  | 
841  | 
except socket.gaierror, (err_num, err_msg):  | 
|
842  | 
raise errors.ConnectionError("failed to lookup %s:%d: %s" %  | 
|
843  | 
(self._host, port, err_msg))  | 
|
| 
3711.2.3
by Jelmer Vernooij
 Add comment.  | 
844  | 
        # Initialize err in case there are no addresses returned:
 | 
| 
3665.4.2
by Jelmer Vernooij
 Fall through to next available address if previous fails.  | 
845  | 
err = socket.error("no address found for %s" % self._host)  | 
| 
3665.4.1
by Jelmer Vernooij
 Support IPv6 in the smart server.  | 
846  | 
for (family, socktype, proto, canonname, sockaddr) in sockaddrs:  | 
847  | 
try:  | 
|
| 
3665.4.2
by Jelmer Vernooij
 Fall through to next available address if previous fails.  | 
848  | 
self._socket = socket.socket(family, socktype, proto)  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
849  | 
self._socket.setsockopt(socket.IPPROTO_TCP,  | 
| 
3665.4.2
by Jelmer Vernooij
 Fall through to next available address if previous fails.  | 
850  | 
socket.TCP_NODELAY, 1)  | 
| 
3665.4.1
by Jelmer Vernooij
 Support IPv6 in the smart server.  | 
851  | 
self._socket.connect(sockaddr)  | 
852  | 
except socket.error, err:  | 
|
| 
3665.4.2
by Jelmer Vernooij
 Fall through to next available address if previous fails.  | 
853  | 
if self._socket is not None:  | 
854  | 
self._socket.close()  | 
|
855  | 
self._socket = None  | 
|
856  | 
                continue
 | 
|
857  | 
            break
 | 
|
858  | 
if self._socket is None:  | 
|
859  | 
            # socket errors either have a (string) or (errno, string) as their
 | 
|
860  | 
            # args.
 | 
|
861  | 
if type(err.args) is str:  | 
|
862  | 
err_msg = err.args  | 
|
863  | 
else:  | 
|
864  | 
err_msg = err.args[1]  | 
|
865  | 
raise errors.ConnectionError("failed to connect to %s:%d: %s" %  | 
|
866  | 
(self._host, port, err_msg))  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
867  | 
self._connected = True  | 
868  | 
||
869  | 
def _flush(self):  | 
|
870  | 
"""See SmartClientStreamMedium._flush().  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
871  | 
|
872  | 
        For TCP we do no flushing. We may want to turn off TCP_NODELAY and
 | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
873  | 
        add a means to do a flush, but that can be done in the future.
 | 
874  | 
        """
 | 
|
875  | 
||
876  | 
def _read_bytes(self, count):  | 
|
877  | 
"""See SmartClientMedium.read_bytes."""  | 
|
878  | 
if not self._connected:  | 
|
879  | 
raise errors.MediumNotConnected(self)  | 
|
| 
3565.1.3
by Andrew Bennetts
 Define a _MAX_READ_SIZE constant as suggested by John's review.  | 
880  | 
        # We ignore the desired_count because on sockets it's more efficient to
 | 
881  | 
        # read large chunks (of _MAX_READ_SIZE bytes) at a time.
 | 
|
| 
3750.1.2
by Vincent Ladeuil
 Fixed as per Andrew's review.  | 
882  | 
try:  | 
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
883  | 
bytes = osutils.until_no_eintr(self._socket.recv, _MAX_READ_SIZE)  | 
| 
3750.1.2
by Vincent Ladeuil
 Fixed as per Andrew's review.  | 
884  | 
except socket.error, e:  | 
885  | 
if len(e.args) and e.args[0] == errno.ECONNRESET:  | 
|
886  | 
                # Callers expect an empty string in that case
 | 
|
887  | 
return ''  | 
|
888  | 
else:  | 
|
889  | 
                raise
 | 
|
| 
3958.1.1
by Andrew Bennetts
 Report traffic on smart media as transport activity.  | 
890  | 
else:  | 
891  | 
self._report_activity(len(bytes), 'read')  | 
|
892  | 
return bytes  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
893  | 
|
894  | 
||
895  | 
class SmartClientStreamMediumRequest(SmartClientMediumRequest):  | 
|
896  | 
"""A SmartClientMediumRequest that works with an SmartClientStreamMedium."""  | 
|
897  | 
||
898  | 
def __init__(self, medium):  | 
|
899  | 
SmartClientMediumRequest.__init__(self, medium)  | 
|
900  | 
        # check that we are safe concurrency wise. If some streams start
 | 
|
901  | 
        # allowing concurrent requests - i.e. via multiplexing - then this
 | 
|
902  | 
        # assert should be moved to SmartClientStreamMedium.get_request,
 | 
|
903  | 
        # and the setting/unsetting of _current_request likewise moved into
 | 
|
904  | 
        # that class : but its unneeded overhead for now. RBC 20060922
 | 
|
905  | 
if self._medium._current_request is not None:  | 
|
906  | 
raise errors.TooManyConcurrentRequests(self._medium)  | 
|
907  | 
self._medium._current_request = self  | 
|
908  | 
||
909  | 
def _accept_bytes(self, bytes):  | 
|
910  | 
"""See SmartClientMediumRequest._accept_bytes.  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
911  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
912  | 
        This forwards to self._medium._accept_bytes because we are operating
 | 
913  | 
        on the mediums stream.
 | 
|
914  | 
        """
 | 
|
915  | 
self._medium._accept_bytes(bytes)  | 
|
916  | 
||
917  | 
def _finished_reading(self):  | 
|
918  | 
"""See SmartClientMediumRequest._finished_reading.  | 
|
919  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
920  | 
        This clears the _current_request on self._medium to allow a new
 | 
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
921  | 
        request to be created.
 | 
922  | 
        """
 | 
|
| 
3376.2.4
by Martin Pool
 Remove every assert statement from bzrlib!  | 
923  | 
if self._medium._current_request is not self:  | 
924  | 
raise AssertionError()  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
925  | 
self._medium._current_request = None  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
926  | 
|
| 
2018.5.2
by Andrew Bennetts
 Start splitting bzrlib/transport/smart.py into a package.  | 
927  | 
def _finished_writing(self):  | 
928  | 
"""See SmartClientMediumRequest._finished_writing.  | 
|
929  | 
||
930  | 
        This invokes self._medium._flush to ensure all bytes are transmitted.
 | 
|
931  | 
        """
 | 
|
932  | 
self._medium._flush()  | 
|
933  |