~bzr-pqm/bzr/bzr.dev

5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2006-2011 Canonical Ltd
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
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
6133.4.10 by John Arbash Meinel
Handle the win32 not-a-socket errors. I think this is ~ready. At least for feedback.
27
import errno
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
28
import os
2018.5.162 by Andrew Bennetts
Add some missing _ensure_real calls, and a missing import.
29
import sys
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
30
import time
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
31
5222.2.9 by Robert Collins
Write up some doc about bzrlib.initialize.
32
import bzrlib
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(), """
6133.4.7 by John Arbash Meinel
Currently causes 5-10 failures in bt.per_branch.test_branch Remote out of 150 tests.
35
import select
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
36
import socket
4913.1.1 by John Arbash Meinel
Switch to using thread.get_ident() which is available on all python versions.
37
import thread
3731.2.4 by Andrew Bennetts
Minor tweaks.
38
import weakref
4889.2.2 by John Arbash Meinel
Add a -Dhpssthread debug flag to include thread.ident info.
39
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
40
from bzrlib import (
3731.2.1 by Andrew Bennetts
Show total HPSS calls (if any) on stderr when -Dhpss is active.
41
    debug,
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
42
    errors,
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
43
    trace,
3958.1.1 by Andrew Bennetts
Report traffic on smart media as transport activity.
44
    ui,
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
45
    urlutils,
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
46
    )
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
47
from bzrlib.i18n import gettext
6133.4.61 by John Arbash Meinel
Expose infrastructure so that we can test the Inet portion of the server.
48
from bzrlib.smart import client, protocol, request, signals, vfs
3066.2.1 by John Arbash Meinel
We don't require paramiko for bzr+ssh.
49
from bzrlib.transport import ssh
3530.1.1 by John Arbash Meinel
Make bzrlib.smart use lazy imports.
50
""")
6133.4.55 by John Arbash Meinel
Now we've implemented the basic structure.
51
from bzrlib import osutils
2018.5.17 by Andrew Bennetts
Paramaterise the commands handled by SmartServerRequestHandler.
52
5011.3.3 by Martin
Reintroduce EINTR handling only for socket object functions and general cleanup
53
# Throughout this module buffer size parameters are either limited to be at
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
54
# most _MAX_READ_SIZE, or are ignored and _MAX_READ_SIZE is used instead.
55
# For this module's purposes, MAX_SOCKET_CHUNK is a reasonable size for reads
56
# from non-sockets as well.
57
_MAX_READ_SIZE = osutils.MAX_SOCKET_CHUNK
3565.1.3 by Andrew Bennetts
Define a _MAX_READ_SIZE constant as suggested by John's review.
58
3245.4.16 by Andrew Bennetts
Remove duplication of request version identification logic in wsgi.py
59
def _get_protocol_factory_for_bytes(bytes):
60
    """Determine the right protocol factory for 'bytes'.
61
62
    This will return an appropriate protocol factory depending on the version
63
    of the protocol being used, as determined by inspecting the given bytes.
64
    The bytes should have at least one newline byte (i.e. be a whole line),
65
    otherwise it's possible that a request will be incorrectly identified as
66
    version 1.
67
68
    Typical use would be::
69
70
         factory, unused_bytes = _get_protocol_factory_for_bytes(bytes)
71
         server_protocol = factory(transport, write_func, root_client_path)
72
         server_protocol.accept_bytes(unused_bytes)
73
74
    :param bytes: a str of bytes of the start of the request.
75
    :returns: 2-tuple of (protocol_factory, unused_bytes).  protocol_factory is
76
        a callable that takes three args: transport, write_func,
77
        root_client_path.  unused_bytes are any bytes that were not part of a
78
        protocol version marker.
79
    """
3530.1.1 by John Arbash Meinel
Make bzrlib.smart use lazy imports.
80
    if bytes.startswith(protocol.MESSAGE_VERSION_THREE):
81
        protocol_factory = protocol.build_server_protocol_three
82
        bytes = bytes[len(protocol.MESSAGE_VERSION_THREE):]
83
    elif bytes.startswith(protocol.REQUEST_VERSION_TWO):
84
        protocol_factory = protocol.SmartServerRequestProtocolTwo
85
        bytes = bytes[len(protocol.REQUEST_VERSION_TWO):]
3245.4.16 by Andrew Bennetts
Remove duplication of request version identification logic in wsgi.py
86
    else:
3530.1.1 by John Arbash Meinel
Make bzrlib.smart use lazy imports.
87
        protocol_factory = protocol.SmartServerRequestProtocolOne
3245.4.16 by Andrew Bennetts
Remove duplication of request version identification logic in wsgi.py
88
    return protocol_factory, bytes
89
90
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
91
def _get_line(read_bytes_func):
92
    """Read bytes using read_bytes_func until a newline byte.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
93
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
94
    This isn't particularly efficient, so should only be used when the
95
    expected size of the line is quite short.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
96
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
97
    :returns: a tuple of two strs: (line, excess)
98
    """
99
    newline_pos = -1
100
    bytes = ''
101
    while newline_pos == -1:
102
        new_bytes = read_bytes_func(1)
103
        bytes += new_bytes
104
        if new_bytes == '':
105
            # Ran out of bytes before receiving a complete line.
106
            return bytes, ''
107
        newline_pos = bytes.find('\n')
108
    line = bytes[:newline_pos+1]
109
    excess = bytes[newline_pos+1:]
110
    return line, excess
111
112
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
113
class SmartMedium(object):
114
    """Base class for smart protocol media, both client- and server-side."""
115
116
    def __init__(self):
117
        self._push_back_buffer = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
118
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
119
    def _push_back(self, bytes):
120
        """Return unused bytes to the medium, because they belong to the next
121
        request(s).
122
123
        This sets the _push_back_buffer to the given bytes.
124
        """
125
        if self._push_back_buffer is not None:
126
            raise AssertionError(
127
                "_push_back called when self._push_back_buffer is %r"
128
                % (self._push_back_buffer,))
129
        if bytes == '':
130
            return
131
        self._push_back_buffer = bytes
132
133
    def _get_push_back_buffer(self):
134
        if self._push_back_buffer == '':
135
            raise AssertionError(
136
                '%s._push_back_buffer should never be the empty string, '
137
                'which can be confused with EOF' % (self,))
138
        bytes = self._push_back_buffer
139
        self._push_back_buffer = None
140
        return bytes
141
142
    def read_bytes(self, desired_count):
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
143
        """Read some bytes from this medium.
144
145
        :returns: some bytes, possibly more or less than the number requested
146
            in 'desired_count' depending on the medium.
147
        """
148
        if self._push_back_buffer is not None:
149
            return self._get_push_back_buffer()
3565.1.3 by Andrew Bennetts
Define a _MAX_READ_SIZE constant as suggested by John's review.
150
        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.
151
        return self._read_bytes(bytes_to_read)
152
153
    def _read_bytes(self, count):
154
        raise NotImplementedError(self._read_bytes)
155
156
    def _get_line(self):
157
        """Read bytes from this request's response until a newline byte.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
158
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
159
        This isn't particularly efficient, so should only be used when the
160
        expected size of the line is quite short.
161
162
        :returns: a string of bytes ending in a newline (byte 0x0A).
163
        """
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
164
        line, excess = _get_line(self.read_bytes)
165
        self._push_back(excess)
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
166
        return line
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
167
3958.1.1 by Andrew Bennetts
Report traffic on smart media as transport activity.
168
    def _report_activity(self, bytes, direction):
169
        """Notify that this medium has activity.
170
171
        Implementations should call this from all methods that actually do IO.
172
        Be careful that it's not called twice, if one method is implemented on
173
        top of another.
174
175
        :param bytes: Number of bytes read or written.
176
        :param direction: 'read' or 'write' or None.
177
        """
178
        ui.ui_factory.report_transport_activity(self, bytes, direction)
179
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
180
6133.4.10 by John Arbash Meinel
Handle the win32 not-a-socket errors. I think this is ~ready. At least for feedback.
181
_bad_file_descriptor = (errno.EBADF,)
182
if sys.platform == 'win32':
183
    # Given on Windows if you pass a closed socket to select.select. Probably
184
    # also given if you pass a file handle to select.
185
    WSAENOTSOCK = 10038
186
    _bad_file_descriptor += (WSAENOTSOCK,)
187
188
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
189
class SmartServerStreamMedium(SmartMedium):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
190
    """Handles smart commands coming over a stream.
191
192
    The stream may be a pipe connected to sshd, or a tcp socket, or an
193
    in-process fifo for testing.
194
195
    One instance is created for each connected client; it can serve multiple
196
    requests in the lifetime of the connection.
197
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
198
    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.
199
    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.
200
201
    :ivar _push_back_buffer: a str of bytes that have been read from the stream
202
        but not used yet, or None if there are no buffered bytes.  Subclasses
203
        should make sure to exhaust this buffer before reading more bytes from
204
        the stream.  See also the _push_back method.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
205
    """
206
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
207
    _timer = time.time
208
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
209
    def __init__(self, backing_transport, root_client_path='/', timeout=None):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
210
        """Construct new server.
211
212
        :param backing_transport: Transport for the directory served.
213
        """
214
        # backing_transport could be passed to serve instead of __init__
215
        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.
216
        self.root_client_path = root_client_path
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
217
        self.finished = False
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
218
        if timeout is None:
6133.4.26 by John Arbash Meinel
get rid of the default timeout parameters.
219
            raise AssertionError('You must supply a timeout.')
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
220
        self._client_timeout = timeout
221
        self._client_poll_timeout = min(timeout / 10.0, 1.0)
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
222
        SmartMedium.__init__(self)
3236.3.5 by Andrew Bennetts
Add _get_push_back_buffer helper.
223
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
224
    def serve(self):
225
        """Serve requests until the client disconnects."""
226
        # Keep a reference to stderr because the sys module's globals get set to
227
        # None during interpreter shutdown.
228
        from sys import stderr
229
        try:
230
            while not self.finished:
2432.2.3 by Andrew Bennetts
Merge from bzr.dev.
231
                server_protocol = self._build_protocol()
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
232
                self._serve_one_request(server_protocol)
6133.4.11 by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere.
233
        except errors.ConnectionTimeout, e:
234
            trace.note('%s' % (e,))
6133.4.12 by John Arbash Meinel
Don't traceback for timeouts, and give better documentation about why we don't just select.
235
            trace.log_exception_quietly()
6133.5.2 by John Arbash Meinel
Rename _close to _disconnect_client. This makes it more obvious.
236
            self._disconnect_client()
6133.4.12 by John Arbash Meinel
Don't traceback for timeouts, and give better documentation about why we don't just select.
237
            # We reported it, no reason to make a big fuss.
238
            return
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
239
        except Exception, e:
240
            stderr.write("%s terminating on exception %s\n" % (self, e))
241
            raise
6133.4.61 by John Arbash Meinel
Expose infrastructure so that we can test the Inet portion of the server.
242
        self._disconnect_client()
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
243
6133.4.44 by John Arbash Meinel
Move the code into bzrlib.smart.signals.
244
    def _stop_gracefully(self):
245
        """When we finish this message, stop looking for more."""
246
        trace.mutter('Stopping %s' % (self,))
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
247
        self.finished = True
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
248
6133.5.2 by John Arbash Meinel
Rename _close to _disconnect_client. This makes it more obvious.
249
    def _disconnect_client(self):
6133.4.11 by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere.
250
        """Close the current connection. We stopped due to a timeout/etc."""
251
        # The default implementation is a no-op, because that is all we used to
252
        # do when disconnecting from a client. I suppose we never had the
253
        # *server* initiate a disconnect, before
254
255
    def _wait_for_bytes_with_timeout(self, timeout_seconds):
256
        """Wait for more bytes to be read, but timeout if none available.
257
258
        This allows us to detect idle connections, and stop trying to read from
259
        them, without setting the socket itself to non-blocking. This also
260
        allows us to specify when we watch for idle timeouts.
261
262
        :return: Did we timeout? (True if we timed out, False if there is data
263
            to be read)
264
        """
265
        raise NotImplementedError(self._wait_for_bytes_with_timeout)
266
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
267
    def _build_protocol(self):
2432.2.8 by Andrew Bennetts
NEWS entry, greatly improved docstring in bzrlib.smart.
268
        """Identifies the version of the incoming request, and returns an
269
        a protocol object that can interpret it.
270
271
        If more bytes than the version prefix of the request are read, they will
272
        be fed into the protocol before it is returned.
273
274
        :returns: a SmartServerRequestProtocol.
275
        """
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
276
        self._wait_for_bytes_with_timeout(self._client_timeout)
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
277
        if self.finished:
278
            # We're stopping, so don't try to do any more work
279
            return None
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
280
        bytes = self._get_line()
3245.4.16 by Andrew Bennetts
Remove duplication of request version identification logic in wsgi.py
281
        protocol_factory, unused_bytes = _get_protocol_factory_for_bytes(bytes)
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
282
        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.
283
            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
284
        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.
285
        return protocol
286
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
287
    def _wait_on_descriptor(self, fd, timeout_seconds):
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
288
        """select() on a file descriptor, waiting for nonblocking read()
289
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
290
        This will raise a ConnectionTimeout exception if we do not get a
291
        readable handle before timeout_seconds.
292
        :return: None
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
293
        """
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
294
        t_end = self._timer() + timeout_seconds
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
295
        poll_timeout = min(timeout_seconds, self._client_poll_timeout)
296
        rs = xs = None
6133.4.43 by John Arbash Meinel
Initial implementation of SIGHUP for bzr serve. bug #795025.
297
        while not rs and not xs and self._timer() < t_end:
298
            if self.finished:
299
                return
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
300
            try:
6133.4.39 by John Arbash Meinel
pass fd in the 'check for errors' section of select.
301
                rs, _, xs = select.select([fd], [], [fd], poll_timeout)
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
302
            except (select.error, socket.error) as e:
303
                err = getattr(e, 'errno', None)
304
                if err is None and getattr(e, 'args', None) is not None:
305
                    # select.error doesn't have 'errno', it just has args[0]
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
306
                    err = e.args[0]
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
307
                if err in _bad_file_descriptor:
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
308
                    return # Not a socket indicates read() will fail
6133.4.41 by John Arbash Meinel
Re-order the loop a bit. Move the exception handling into the loop, so that we can handle EINTR.
309
                elif err == errno.EINTR:
310
                    # Interrupted, keep looping.
311
                    continue
312
                raise
6133.4.40 by John Arbash Meinel
Treat an 'errfds' as just something we want to try and read from later.
313
        if rs or xs:
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
314
            return
315
        raise errors.ConnectionTimeout('disconnecting client after %.1f seconds'
316
                                       % (timeout_seconds,))
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
317
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
318
    def _serve_one_request(self, protocol):
319
        """Read one request from input, process, send back a response.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
320
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
321
        :param protocol: a SmartServerRequestProtocol.
322
        """
6175.1.5 by John Arbash Meinel
Suppress ConnectionTimeout as a server-side exception.
323
        if protocol is None:
324
            return
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
325
        try:
326
            self._serve_one_request_unguarded(protocol)
327
        except KeyboardInterrupt:
328
            raise
329
        except Exception, e:
330
            self.terminate_due_to_error()
331
332
    def terminate_due_to_error(self):
333
        """Called when an unhandled exception from the protocol occurs."""
334
        raise NotImplementedError(self.terminate_due_to_error)
335
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
336
    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.
337
        """Get some bytes from the medium.
338
339
        :param desired_count: number of bytes we want to read.
340
        """
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
341
        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.
342
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
343
344
class SmartServerSocketStreamMedium(SmartServerStreamMedium):
345
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
346
    def __init__(self, sock, backing_transport, root_client_path='/',
347
                 timeout=None):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
348
        """Constructor.
349
350
        :param sock: the socket the server will read from.  It will be put
351
            into blocking mode.
352
        """
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.
353
        SmartServerStreamMedium.__init__(
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
354
            self, backing_transport, root_client_path=root_client_path,
355
            timeout=timeout)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
356
        sock.setblocking(True)
357
        self.socket = sock
6133.4.62 by John Arbash Meinel
Add a nicer repr for shutting down.
358
        # Get the getpeername now, as we might be closed later when we care.
359
        try:
360
            self._client_info = sock.getpeername()
361
        except socket.error:
362
            self._client_info = '<unknown>'
363
364
    def __str__(self):
365
        return '%s(client=%s)' % (self.__class__.__name__, self._client_info)
366
367
    def __repr__(self):
368
        return '%s.%s(client=%s)' % (self.__module__, self.__class__.__name__,
369
            self._client_info)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
370
371
    def _serve_one_request_unguarded(self, protocol):
372
        while protocol.next_read_size():
3565.1.3 by Andrew Bennetts
Define a _MAX_READ_SIZE constant as suggested by John's review.
373
            # We can safely try to read large chunks.  If there is less data
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
374
            # than MAX_SOCKET_CHUNK ready, the socket will just return a
375
            # short read immediately rather than block.
376
            bytes = self.read_bytes(osutils.MAX_SOCKET_CHUNK)
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.
377
            if bytes == '':
378
                self.finished = True
379
                return
380
            protocol.accept_bytes(bytes)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
381
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
382
        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.
383
6133.5.2 by John Arbash Meinel
Rename _close to _disconnect_client. This makes it more obvious.
384
    def _disconnect_client(self):
6133.4.11 by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere.
385
        """Close the current connection. We stopped due to a timeout/etc."""
386
        self.socket.close()
387
6133.4.1 by John Arbash Meinel
Add a _wait_for_bytes_with_timeout helper function.
388
    def _wait_for_bytes_with_timeout(self, timeout_seconds):
389
        """Wait for more bytes to be read, but timeout if none available.
390
391
        This allows us to detect idle connections, and stop trying to read from
392
        them, without setting the socket itself to non-blocking. This also
393
        allows us to specify when we watch for idle timeouts.
6133.4.2 by John Arbash Meinel
Implement waiting for Pipe mediums, including handling ones
394
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
395
        :return: None, this will raise ConnectionTimeout if we time out before
396
            data is available.
6133.4.1 by John Arbash Meinel
Add a _wait_for_bytes_with_timeout helper function.
397
        """
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
398
        return self._wait_on_descriptor(self.socket, timeout_seconds)
6133.4.1 by John Arbash Meinel
Add a _wait_for_bytes_with_timeout helper function.
399
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
400
    def _read_bytes(self, desired_count):
5011.3.11 by Andrew Bennetts
Consolidate changes, try to minimise unnecessary changes and tidy up those that kept.
401
        return osutils.read_bytes_from_socket(
402
            self.socket, self._report_activity)
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
403
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
404
    def terminate_due_to_error(self):
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
405
        # TODO: This should log to a server log file, but no such thing
406
        # exists yet.  Andrew Bennetts 2006-09-29.
5011.3.1 by Martin
Revert second-phase EINTR changes
407
        self.socket.close()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
408
        self.finished = True
409
410
    def _write_out(self, bytes):
4889.2.1 by John Arbash Meinel
Make -Dhpss log debug information for the server process.
411
        tstart = osutils.timer_func()
5011.3.9 by Andrew Bennetts
Remove _send_bytes_chunked.
412
        osutils.send_all(self.socket, bytes, self._report_activity)
4889.2.1 by John Arbash Meinel
Make -Dhpss log debug information for the server process.
413
        if 'hpss' in debug.debug_flags:
4913.1.1 by John Arbash Meinel
Switch to using thread.get_ident() which is available on all python versions.
414
            thread_id = thread.get_ident()
4889.2.3 by John Arbash Meinel
Get rid of -Dhpssthread, just always include it.
415
            trace.mutter('%12s: [%s] %d bytes to the socket in %.3fs'
416
                         % ('wrote', thread_id, len(bytes),
4889.2.2 by John Arbash Meinel
Add a -Dhpssthread debug flag to include thread.ident info.
417
                            osutils.timer_func() - tstart))
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
418
419
420
class SmartServerPipeStreamMedium(SmartServerStreamMedium):
421
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
422
    def __init__(self, in_file, out_file, backing_transport, timeout=None):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
423
        """Construct new server.
424
425
        :param in_file: Python file from which requests can be read.
426
        :param out_file: Python file to write responses.
427
        :param backing_transport: Transport for the directory served.
428
        """
6133.4.15 by John Arbash Meinel
Start working on exposing timeout as a configuration item.
429
        SmartServerStreamMedium.__init__(self, backing_transport,
430
            timeout=timeout)
2018.5.161 by Andrew Bennetts
Reinstate forcing binary mode on windows in SmartServerStreamMedium.
431
        if sys.platform == 'win32':
432
            # force binary mode for files
433
            import msvcrt
434
            for f in (in_file, out_file):
435
                fileno = getattr(f, 'fileno', None)
436
                if fileno:
437
                    msvcrt.setmode(fileno(), os.O_BINARY)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
438
        self._in = in_file
439
        self._out = out_file
440
6133.4.61 by John Arbash Meinel
Expose infrastructure so that we can test the Inet portion of the server.
441
    def serve(self):
442
        """See SmartServerStreamMedium.serve"""
443
        # This is the regular serve, except it adds signal trapping for soft
444
        # shutdown.
445
        stop_gracefully = self._stop_gracefully
446
        signals.register_on_hangup(id(self), stop_gracefully)
447
        try:
448
            return super(SmartServerPipeStreamMedium, self).serve()
449
        finally:
450
            signals.unregister_on_hangup(id(self))
451
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
452
    def _serve_one_request_unguarded(self, protocol):
453
        while True:
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
454
            # We need to be careful not to read past the end of the current
455
            # request, or else the read from the pipe will block, so we use
456
            # protocol.next_read_size().
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
457
            bytes_to_read = protocol.next_read_size()
458
            if bytes_to_read == 0:
459
                # Finished serving this request.
5011.3.1 by Martin
Revert second-phase EINTR changes
460
                self._out.flush()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
461
                return
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
462
            bytes = self.read_bytes(bytes_to_read)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
463
            if bytes == '':
464
                # Connection has been closed.
465
                self.finished = True
5011.3.1 by Martin
Revert second-phase EINTR changes
466
                self._out.flush()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
467
                return
468
            protocol.accept_bytes(bytes)
469
6133.5.2 by John Arbash Meinel
Rename _close to _disconnect_client. This makes it more obvious.
470
    def _disconnect_client(self):
6133.4.11 by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere.
471
        self._in.close()
6133.4.63 by John Arbash Meinel
Flush before we close _out.
472
        self._out.flush()
6133.4.11 by John Arbash Meinel
It turns out that if we don't explicitly close the socket, it hangs around somewhere.
473
        self._out.close()
474
6133.4.2 by John Arbash Meinel
Implement waiting for Pipe mediums, including handling ones
475
    def _wait_for_bytes_with_timeout(self, timeout_seconds):
476
        """Wait for more bytes to be read, but timeout if none available.
477
478
        This allows us to detect idle connections, and stop trying to read from
479
        them, without setting the socket itself to non-blocking. This also
480
        allows us to specify when we watch for idle timeouts.
481
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
482
        :return: None, this will raise ConnectionTimeout if we time out before
483
            data is available.
6133.4.2 by John Arbash Meinel
Implement waiting for Pipe mediums, including handling ones
484
        """
6133.4.10 by John Arbash Meinel
Handle the win32 not-a-socket errors. I think this is ~ready. At least for feedback.
485
        if (getattr(self._in, 'fileno', None) is None
486
            or sys.platform == 'win32'):
487
            # You can't select() file descriptors on Windows.
6133.4.42 by John Arbash Meinel
Change the code to just raise ConnectionTimeout.
488
            return
6133.4.8 by John Arbash Meinel
Refactor a bit. Use a common _wait_for_descriptor code.
489
        return self._wait_on_descriptor(self._in, timeout_seconds)
6133.4.2 by John Arbash Meinel
Implement waiting for Pipe mediums, including handling ones
490
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
491
    def _read_bytes(self, desired_count):
5011.3.1 by Martin
Revert second-phase EINTR changes
492
        return self._in.read(desired_count)
2432.2.2 by Andrew Bennetts
Smart server mediums now detect which protocol version a request is and dispatch accordingly.
493
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
494
    def terminate_due_to_error(self):
495
        # TODO: This should log to a server log file, but no such thing
496
        # exists yet.  Andrew Bennetts 2006-09-29.
5011.3.1 by Martin
Revert second-phase EINTR changes
497
        self._out.close()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
498
        self.finished = True
499
500
    def _write_out(self, bytes):
5011.3.1 by Martin
Revert second-phase EINTR changes
501
        self._out.write(bytes)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
502
503
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
504
class SmartClientMediumRequest(object):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
505
    """A request on a SmartClientMedium.
506
507
    Each request allows bytes to be provided to it via accept_bytes, and then
508
    the response bytes to be read via read_bytes.
509
510
    For instance:
511
    request.accept_bytes('123')
512
    request.finished_writing()
513
    result = request.read_bytes(3)
514
    request.finished_reading()
515
516
    It is up to the individual SmartClientMedium whether multiple concurrent
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
517
    requests can exist. See SmartClientMedium.get_request to obtain instances
518
    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.
519
    details on concurrency and pipelining.
520
    """
521
522
    def __init__(self, medium):
523
        """Construct a SmartClientMediumRequest for the medium medium."""
524
        self._medium = medium
525
        # we track state by constants - we may want to use the same
526
        # pattern as BodyReader if it gets more complex.
527
        # valid states are: "writing", "reading", "done"
528
        self._state = "writing"
529
530
    def accept_bytes(self, bytes):
531
        """Accept bytes for inclusion in this request.
532
4031.3.1 by Frank Aspell
Fixing various typos
533
        This method may not be called after finished_writing() has been
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
534
        called.  It depends upon the Medium whether or not the bytes will be
535
        immediately transmitted. Message based Mediums will tend to buffer the
536
        bytes until finished_writing() is called.
537
538
        :param bytes: A bytestring.
539
        """
540
        if self._state != "writing":
541
            raise errors.WritingCompleted(self)
542
        self._accept_bytes(bytes)
543
544
    def _accept_bytes(self, bytes):
545
        """Helper for accept_bytes.
546
547
        Accept_bytes checks the state of the request to determing if bytes
548
        should be accepted. After that it hands off to _accept_bytes to do the
549
        actual acceptance.
550
        """
551
        raise NotImplementedError(self._accept_bytes)
552
553
    def finished_reading(self):
554
        """Inform the request that all desired data has been read.
555
556
        This will remove the request from the pipeline for its medium (if the
557
        medium supports pipelining) and any further calls to methods on the
558
        request will raise ReadingCompleted.
559
        """
560
        if self._state == "writing":
561
            raise errors.WritingNotComplete(self)
562
        if self._state != "reading":
563
            raise errors.ReadingCompleted(self)
564
        self._state = "done"
565
        self._finished_reading()
566
567
    def _finished_reading(self):
568
        """Helper for finished_reading.
569
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
570
        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.
571
        finished_reading is allowed, and if it is hands off to _finished_reading
572
        to perform the action.
573
        """
574
        raise NotImplementedError(self._finished_reading)
575
576
    def finished_writing(self):
577
        """Finish the writing phase of this request.
578
579
        This will flush all pending data for this request along the medium.
580
        After calling finished_writing, you may not call accept_bytes anymore.
581
        """
582
        if self._state != "writing":
583
            raise errors.WritingCompleted(self)
584
        self._state = "reading"
585
        self._finished_writing()
586
587
    def _finished_writing(self):
588
        """Helper for finished_writing.
589
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
590
        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.
591
        finished_writing is allowed, and if it is hands off to _finished_writing
592
        to perform the action.
593
        """
594
        raise NotImplementedError(self._finished_writing)
595
596
    def read_bytes(self, count):
597
        """Read bytes from this requests response.
598
599
        This method will block and wait for count bytes to be read. It may not
600
        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.
601
        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.
602
        based mediums like HTTP.
603
        """
604
        if self._state == "writing":
605
            raise errors.WritingNotComplete(self)
606
        if self._state != "reading":
607
            raise errors.ReadingCompleted(self)
608
        return self._read_bytes(count)
609
610
    def _read_bytes(self, count):
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
611
        """Helper for SmartClientMediumRequest.read_bytes.
612
613
        read_bytes checks the state of the request to determing if bytes
614
        should be read. After that it hands off to _read_bytes to do the
615
        actual read.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
616
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
617
        By default this forwards to self._medium.read_bytes because we are
618
        operating on the medium's stream.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
619
        """
3565.1.2 by Andrew Bennetts
Delete some more code, fix some bugs, add more comments.
620
        return self._medium.read_bytes(count)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
621
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
622
    def read_line(self):
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
623
        line = self._read_line()
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
624
        if not line.endswith('\n'):
625
            # end of file encountered reading from server
626
            raise errors.ConnectionReset(
4509.2.3 by Martin Pool
Test tweaks for ConnectionReset message change
627
                "Unexpected end of message. Please check connectivity "
628
                "and permissions, and report a bug if problems persist.")
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
629
        return line
630
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
631
    def _read_line(self):
632
        """Helper for SmartClientMediumRequest.read_line.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
633
3606.4.1 by Andrew Bennetts
Fix NotImplementedError when probing for smart protocol via HTTP.
634
        By default this forwards to self._medium._get_line because we are
635
        operating on the medium's stream.
636
        """
637
        return self._medium._get_line()
638
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
639
6060.7.1 by Jelmer Vernooij
Add vfs refuser.
640
class _VfsRefuser(object):
641
    """An object that refuses all VFS requests.
642
643
    """
644
645
    def __init__(self):
646
        client._SmartClient.hooks.install_named_hook(
6060.7.2 by Jelmer Vernooij
Fix hook installation
647
            'call', self.check_vfs, 'vfs refuser')
6060.7.1 by Jelmer Vernooij
Add vfs refuser.
648
649
    def check_vfs(self, params):
650
        try:
651
            request_method = request.request_handlers.get(params.method)
652
        except KeyError:
653
            # A method we don't know about doesn't count as a VFS method.
654
            return
6060.7.4 by Jelmer Vernooij
Update NEWS
655
        if issubclass(request_method, vfs.VfsRequest):
656
            raise errors.HpssVfsRequestNotAllowed(params.method, params.args)
6060.7.1 by Jelmer Vernooij
Add vfs refuser.
657
658
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
659
class _DebugCounter(object):
660
    """An object that counts the HPSS calls made to each client medium.
661
5222.2.9 by Robert Collins
Write up some doc about bzrlib.initialize.
662
    When a medium is garbage-collected, or failing that when
663
    bzrlib.global_state exits, the total number of calls made on that medium
664
    are reported via trace.note.
3731.2.1 by Andrew Bennetts
Show total HPSS calls (if any) on stderr when -Dhpss is active.
665
    """
666
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
667
    def __init__(self):
668
        self.counts = weakref.WeakKeyDictionary()
669
        client._SmartClient.hooks.install_named_hook(
670
            'call', self.increment_call_count, 'hpss call counter')
5310.1.1 by Vincent Ladeuil
Fix typo but we may want to use addCleanup instead indeed.
671
        bzrlib.global_state.cleanups.add_cleanup(self.flush_all)
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
672
673
    def track(self, medium):
674
        """Start tracking calls made to a medium.
675
676
        This only keeps a weakref to the medium, so shouldn't affect the
677
        medium's lifetime.
678
        """
679
        medium_repr = repr(medium)
680
        # Add this medium to the WeakKeyDictionary
4326.2.3 by Jonathan Lange
Use as a dict.
681
        self.counts[medium] = dict(count=0, vfs_count=0,
682
                                   medium_repr=medium_repr)
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
683
        # Weakref callbacks are fired in reverse order of their association
684
        # with the referenced object.  So we add a weakref *after* adding to
685
        # the WeakKeyDict so that we can report the value from it before the
686
        # entry is removed by the WeakKeyDict's own callback.
687
        ref = weakref.ref(medium, self.done)
688
689
    def increment_call_count(self, params):
690
        # Increment the count in the WeakKeyDictionary
691
        value = self.counts[params.medium]
4326.2.3 by Jonathan Lange
Use as a dict.
692
        value['count'] += 1
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
693
        try:
694
            request_method = request.request_handlers.get(params.method)
695
        except KeyError:
4547.3.1 by Andrew Bennetts
Fix minor bug in -Dhpss that would cause a KeyError when issuing a request for a method not registered in request_handlers.
696
            # A method we don't know about doesn't count as a VFS method.
4476.3.15 by Andrew Bennetts
Partially working fallback for pre-1.17 servers.
697
            return
4326.2.1 by Jonathan Lange
Show the number of VFS calls in -Dhpss output.
698
        if issubclass(request_method, vfs.VfsRequest):
4326.2.3 by Jonathan Lange
Use as a dict.
699
            value['vfs_count'] += 1
3731.2.1 by Andrew Bennetts
Show total HPSS calls (if any) on stderr when -Dhpss is active.
700
701
    def done(self, ref):
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
702
        value = self.counts[ref]
4326.2.3 by Jonathan Lange
Use as a dict.
703
        count, vfs_count, medium_repr = (
704
            value['count'], value['vfs_count'], value['medium_repr'])
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
705
        # In case this callback is invoked for the same ref twice (by the
706
        # weakref callback and by the atexit function), set the call count back
707
        # to 0 so this item won't be reported twice.
4326.2.3 by Jonathan Lange
Use as a dict.
708
        value['count'] = 0
709
        value['vfs_count'] = 0
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
710
        if count != 0:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
711
            trace.note(gettext('HPSS calls: {0} ({1} vfs) {2}').format(
712
                       count, vfs_count, medium_repr))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
713
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
714
    def flush_all(self):
715
        for ref in list(self.counts.keys()):
716
            self.done(ref)
717
718
_debug_counter = None
6060.7.2 by Jelmer Vernooij
Fix hook installation
719
_vfs_refuser = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
720
721
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
722
class SmartClientMedium(SmartMedium):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
723
    """Smart client is a medium for sending smart protocol requests over."""
724
3431.3.3 by Andrew Bennetts
Set 'base' in SmartClientMedium base class.
725
    def __init__(self, base):
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
726
        super(SmartClientMedium, self).__init__()
3431.3.3 by Andrew Bennetts
Set 'base' in SmartClientMedium base class.
727
        self.base = base
3241.1.4 by Andrew Bennetts
Use get_smart_medium as suggested by Robert, and deal with the fallout.
728
        self._protocol_version_error = None
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
729
        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).
730
        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.
731
        # 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.
732
        # requests until we get an error saying otherwise.
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
733
        # _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.
734
        # 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.
735
        self._remote_version_is_before = None
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
736
        # 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.
737
        if 'hpss' in debug.debug_flags:
3731.2.5 by Andrew Bennetts
Rework hpss call counter.
738
            global _debug_counter
739
            if _debug_counter is None:
740
                _debug_counter = _DebugCounter()
741
            _debug_counter.track(self)
6060.7.5 by Jelmer Vernooij
Rename hpss_no_vfs to hpss_client_no_vfs.
742
        if 'hpss_client_no_vfs' in debug.debug_flags:
6060.7.1 by Jelmer Vernooij
Add vfs refuser.
743
            global _vfs_refuser
744
            if _vfs_refuser is None:
745
                _vfs_refuser = _VfsRefuser()
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
746
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
747
    def _is_remote_before(self, version_tuple):
3502.1.1 by Matt Nordhoff
Fix a docstring typo, and a two-expression ``raise`` statement
748
        """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.
749
750
        Typical use::
751
752
            needed_version = (1, 2)
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
753
            if medium._is_remote_before(needed_version):
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
754
                fallback_to_pre_1_2_rpc()
755
            else:
756
                try:
757
                    do_1_2_rpc()
758
                except UnknownSmartMethod:
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
759
                    medium._remember_remote_is_before(needed_version)
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
760
                    fallback_to_pre_1_2_rpc()
761
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
762
        :seealso: _remember_remote_is_before
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
763
        """
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
764
        if self._remote_version_is_before is None:
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
765
            # So far, the remote side seems to support everything
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
766
            return False
767
        return version_tuple >= self._remote_version_is_before
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
768
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
769
    def _remember_remote_is_before(self, version_tuple):
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
770
        """Tell this medium that the remote side is older the given version.
771
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
772
        :seealso: _is_remote_before
3453.4.1 by Andrew Bennetts
Better infrastructure on SmartClientMedium for tracking the remote version.
773
        """
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
774
        if (self._remote_version_is_before is not None and
775
            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.
776
            # We have been told that the remote side is older than some version
777
            # which is newer than a previously supplied older-than version.
778
            # This indicates that some smart verb call is not guarded
779
            # appropriately (it should simply not have been tried).
4797.49.1 by Andrew Bennetts
First, fix _remember_remote_is_before to never raise AssertionError for what is a very minor bug.
780
            trace.mutter(
3453.4.9 by Andrew Bennetts
Rename _remote_is_not to _remember_remote_is_before.
781
                "_remember_remote_is_before(%r) called, but "
782
                "_remember_remote_is_before(%r) was called previously."
4797.49.1 by Andrew Bennetts
First, fix _remember_remote_is_before to never raise AssertionError for what is a very minor bug.
783
                , version_tuple, self._remote_version_is_before)
784
            if 'hpss' in debug.debug_flags:
785
                ui.ui_factory.show_warning(
786
                    "_remember_remote_is_before(%r) called, but "
787
                    "_remember_remote_is_before(%r) was called previously."
788
                    % (version_tuple, self._remote_version_is_before))
789
            return
3453.4.10 by Andrew Bennetts
Change _is_remote_at_least to _is_remote_before.
790
        self._remote_version_is_before = version_tuple
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
791
792
    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).
793
        """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.
794
        if self._protocol_version_error is not None:
795
            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).
796
        if not self._done_hello:
3241.1.4 by Andrew Bennetts
Use get_smart_medium as suggested by Robert, and deal with the fallout.
797
            try:
798
                medium_request = self.get_request()
799
                # Send a 'hello' request in protocol version one, for maximum
800
                # backwards compatibility.
3530.1.2 by John Arbash Meinel
missed one of the imports
801
                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).
802
                client_protocol.query_version()
803
                self._done_hello = True
3241.1.4 by Andrew Bennetts
Use get_smart_medium as suggested by Robert, and deal with the fallout.
804
            except errors.SmartProtocolError, e:
805
                # Cache the error, just like we would cache a successful
806
                # result.
807
                self._protocol_version_error = e
808
                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).
809
        return '2'
810
811
    def should_probe(self):
812
        """Should RemoteBzrDirFormat.probe_transport send a smart request on
813
        this medium?
814
815
        Some transports are unambiguously smart-only; there's no need to check
816
        if the transport is able to carry smart requests, because that's all
817
        it is for.  In those cases, this method should return False.
818
819
        But some HTTP transports can sometimes fail to carry smart requests,
820
        but still be usuable for accessing remote bzrdirs via plain file
821
        accesses.  So for those transports, their media should return True here
822
        so that RemoteBzrDirFormat can determine if it is appropriate for that
823
        transport.
824
        """
825
        return False
3241.1.1 by Andrew Bennetts
Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
826
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
827
    def disconnect(self):
828
        """If this medium maintains a persistent connection, close it.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
829
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
830
        The default implementation does nothing.
831
        """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
832
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
833
    def remote_path_from_transport(self, transport):
834
        """Convert transport into a path suitable for using in a request.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
835
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
836
        Note that the resulting remote path doesn't encode the host name or
837
        anything but path, so it is only safe to use it in requests sent over
838
        the medium from the matching transport.
839
        """
840
        medium_base = urlutils.join(self.base, '/')
841
        rel_url = urlutils.relative_url(medium_base, transport.base)
6379.4.2 by Jelmer Vernooij
Add urlutils.quote / urlutils.unquote.
842
        return urlutils.unquote(rel_url)
3431.3.11 by Andrew Bennetts
Push remote_path_from_transport logic into SmartClientMedium, removing special-casing of bzr+http from _SmartClient.
843
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
844
845
class SmartClientStreamMedium(SmartClientMedium):
846
    """Stream based medium common class.
847
848
    SmartClientStreamMediums operate on a stream. All subclasses use a common
849
    SmartClientStreamMediumRequest for their requests, and should implement
850
    _accept_bytes and _read_bytes to allow the request objects to send and
851
    receive bytes.
852
    """
853
3431.3.3 by Andrew Bennetts
Set 'base' in SmartClientMedium base class.
854
    def __init__(self, base):
855
        SmartClientMedium.__init__(self, base)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
856
        self._current_request = None
857
858
    def accept_bytes(self, bytes):
859
        self._accept_bytes(bytes)
860
861
    def __del__(self):
862
        """The SmartClientStreamMedium knows how to close the stream when it is
863
        finished with it.
864
        """
865
        self.disconnect()
866
867
    def _flush(self):
868
        """Flush the output stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
869
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
870
        This method is used by the SmartClientStreamMediumRequest to ensure that
871
        all data for a request is sent, to avoid long timeouts or deadlocks.
872
        """
873
        raise NotImplementedError(self._flush)
874
875
    def get_request(self):
876
        """See SmartClientMedium.get_request().
877
878
        SmartClientStreamMedium always returns a SmartClientStreamMediumRequest
879
        for get_request.
880
        """
881
        return SmartClientStreamMediumRequest(self)
882
4797.85.21 by John Arbash Meinel
Finally, we have something that can at least handle simple reconnects.
883
    def reset(self):
884
        """We have been disconnected, reset current state.
885
886
        This resets things like _current_request and connected state.
887
        """
888
        self.disconnect()
889
        self._current_request = None
890
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
891
892
class SmartSimplePipesClientMedium(SmartClientStreamMedium):
893
    """A client medium using simple pipes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
894
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
895
    This client does not manage the pipes: it assumes they will always be open.
896
    """
897
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.
898
    def __init__(self, readable_pipe, writeable_pipe, base):
3431.3.3 by Andrew Bennetts
Set 'base' in SmartClientMedium base class.
899
        SmartClientStreamMedium.__init__(self, base)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
900
        self._readable_pipe = readable_pipe
901
        self._writeable_pipe = writeable_pipe
902
903
    def _accept_bytes(self, bytes):
904
        """See SmartClientStreamMedium.accept_bytes."""
4797.85.10 by John Arbash Meinel
Wrap the call to .write() to raise ConnectionReset on failure.
905
        try:
5050.78.5 by John Arbash Meinel
Merge the 2.1-client-read-reconnect-819604 (bug #819604) to bzr-2.2
906
            self._writeable_pipe.write(bytes)
4797.85.10 by John Arbash Meinel
Wrap the call to .write() to raise ConnectionReset on failure.
907
        except IOError, e:
908
            if e.errno in (errno.EINVAL, errno.EPIPE):
909
                raise errors.ConnectionReset(
4797.93.1 by John Arbash Meinel
Implement retrying a request as long as we haven't started consuming the body stream.
910
                    "Error trying to write to subprocess:\n%s" % (e,))
4797.85.11 by John Arbash Meinel
Maybe we can just use a regular pipe for testing, rather than spawning a subprocess.
911
            raise
3958.1.2 by Andrew Bennetts
Report network activity from more client medium implementations.
912
        self._report_activity(len(bytes), 'write')
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
913
914
    def _flush(self):
915
        """See SmartClientStreamMedium._flush()."""
4797.85.13 by John Arbash Meinel
Document the behavior of flush.
916
        # Note: If flush were to fail, we'd like to raise ConnectionReset, etc.
917
        #       However, testing shows that even when the child process is
918
        #       gone, this doesn't error.
5011.3.1 by Martin
Revert second-phase EINTR changes
919
        self._writeable_pipe.flush()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
920
921
    def _read_bytes(self, count):
922
        """See SmartClientStreamMedium._read_bytes."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
923
        bytes_to_read = min(count, _MAX_READ_SIZE)
924
        bytes = self._readable_pipe.read(bytes_to_read)
3958.1.2 by Andrew Bennetts
Report network activity from more client medium implementations.
925
        self._report_activity(len(bytes), 'read')
926
        return bytes
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
927
928
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
929
class SSHParams(object):
5284.5.5 by Andrew Bennetts
Fix SSHParams docs.
930
    """A set of parameters for starting a remote bzr via SSH."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
931
932
    def __init__(self, host, port=None, username=None, password=None,
933
            bzr_remote_path='bzr'):
934
        self.host = host
935
        self.port = port
936
        self.username = username
937
        self.password = password
938
        self.bzr_remote_path = bzr_remote_path
939
940
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
941
class SmartSSHClientMedium(SmartClientStreamMedium):
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
942
    """A client medium using SSH.
4797.85.20 by John Arbash Meinel
Pull in the code from bzr.dev that changes SmartSSHClientMedium
943
5050.78.5 by John Arbash Meinel
Merge the 2.1-client-read-reconnect-819604 (bug #819604) to bzr-2.2
944
    It delegates IO to a SmartSimplePipesClientMedium or
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
945
    SmartClientAlreadyConnectedSocketMedium (depending on platform).
946
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
947
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
948
    def __init__(self, base, ssh_params, vendor=None):
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
949
        """Creates a client that will connect on the first use.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
950
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
951
        :param ssh_params: A SSHParams instance.
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
952
        :param vendor: An optional override for the ssh vendor to use. See
953
            bzrlib.transport.ssh for details on ssh vendors.
954
        """
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
955
        self._real_medium = None
956
        self._ssh_params = ssh_params
4964.2.5 by Martin Pool
Make sure variables used in repr are set early in initialization
957
        # for the benefit of progress making a short description of this
958
        # transport
959
        self._scheme = 'bzr+ssh'
4100.1.5 by Martin Pool
Fix crash in SSHSmartClientStreamMedium repr.
960
        # SmartClientStreamMedium stores the repr of this object in its
961
        # _DebugCounter so we have to store all the values used in our repr
962
        # method before calling the super init.
963
        SmartClientStreamMedium.__init__(self, base)
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
964
        self._vendor = vendor
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
965
        self._ssh_connection = None
4100.1.1 by Martin Pool
Cleanup and add SmartSSHClientMedium repr
966
967
    def __repr__(self):
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
968
        if self._ssh_params.port is None:
4964.2.4 by Martin Pool
Tweak SSHSmartClientMedium to look better when there's no port
969
            maybe_port = ''
970
        else:
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
971
            maybe_port = ':%s' % self._ssh_params.port
6242.1.1 by Jelmer Vernooij
Cope with username being None in SmartSSHMedium.__repr__.
972
        if self._ssh_params.username is None:
973
            maybe_user = ''
974
        else:
975
            maybe_user = '%s@' % self._ssh_params.username
976
        return "%s(%s://%s%s%s/)" % (
4100.1.1 by Martin Pool
Cleanup and add SmartSSHClientMedium repr
977
            self.__class__.__name__,
4964.2.3 by Martin Pool
Tweak SmartSSHClientMedium repr
978
            self._scheme,
6242.1.1 by Jelmer Vernooij
Cope with username being None in SmartSSHMedium.__repr__.
979
            maybe_user,
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
980
            self._ssh_params.host,
4964.2.4 by Martin Pool
Tweak SSHSmartClientMedium to look better when there's no port
981
            maybe_port)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
982
983
    def _accept_bytes(self, bytes):
984
        """See SmartClientStreamMedium.accept_bytes."""
985
        self._ensure_connection()
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
986
        self._real_medium.accept_bytes(bytes)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
987
988
    def disconnect(self):
989
        """See SmartClientMedium.disconnect()."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
990
        if self._real_medium is not None:
991
            self._real_medium.disconnect()
992
            self._real_medium = None
993
        if self._ssh_connection is not None:
994
            self._ssh_connection.close()
995
            self._ssh_connection = None
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
996
997
    def _ensure_connection(self):
998
        """Connect this medium if not already connected."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
999
        if self._real_medium is not None:
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1000
            return
1001
        if self._vendor is None:
1002
            vendor = ssh._get_ssh_vendor()
1003
        else:
1004
            vendor = self._vendor
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1005
        self._ssh_connection = vendor.connect_ssh(self._ssh_params.username,
1006
                self._ssh_params.password, self._ssh_params.host,
1007
                self._ssh_params.port,
1008
                command=[self._ssh_params.bzr_remote_path, 'serve', '--inet',
1551.18.17 by Aaron Bentley
Introduce bzr_remote_path configuration variable
1009
                         '--directory=/', '--allow-writes'])
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1010
        io_kind, io_object = self._ssh_connection.get_sock_or_pipes()
1011
        if io_kind == 'socket':
1012
            self._real_medium = SmartClientAlreadyConnectedSocketMedium(
1013
                self.base, io_object)
1014
        elif io_kind == 'pipes':
1015
            read_from, write_to = io_object
1016
            self._real_medium = SmartSimplePipesClientMedium(
1017
                read_from, write_to, self.base)
1018
        else:
1019
            raise AssertionError(
1020
                "Unexpected io_kind %r from %r"
1021
                % (io_kind, self._ssh_connection))
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1022
1023
    def _flush(self):
1024
        """See SmartClientStreamMedium._flush()."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1025
        self._real_medium._flush()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1026
1027
    def _read_bytes(self, count):
1028
        """See SmartClientStreamMedium.read_bytes."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1029
        if self._real_medium is None:
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1030
            raise errors.MediumNotConnected(self)
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
1031
        return self._real_medium.read_bytes(count)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1032
1033
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1034
# Port 4155 is the default port for bzr://, registered with IANA.
3665.4.1 by Jelmer Vernooij
Support IPv6 in the smart server.
1035
BZR_DEFAULT_INTERFACE = None
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1036
BZR_DEFAULT_PORT = 4155
1037
1038
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1039
class SmartClientSocketMedium(SmartClientStreamMedium):
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
1040
    """A client medium using a socket.
1041
    
1042
    This class isn't usable directly.  Use one of its subclasses instead.
1043
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1044
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1045
    def __init__(self, base):
3431.3.3 by Andrew Bennetts
Set 'base' in SmartClientMedium base class.
1046
        SmartClientStreamMedium.__init__(self, base)
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1047
        self._socket = None
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1048
        self._connected = False
1049
1050
    def _accept_bytes(self, bytes):
1051
        """See SmartClientMedium.accept_bytes."""
1052
        self._ensure_connection()
5011.3.9 by Andrew Bennetts
Remove _send_bytes_chunked.
1053
        osutils.send_all(self._socket, bytes, self._report_activity)
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1054
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
1055
    def _ensure_connection(self):
1056
        """Connect this medium if not already connected."""
1057
        raise NotImplementedError(self._ensure_connection)
1058
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1059
    def _flush(self):
1060
        """See SmartClientStreamMedium._flush().
1061
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
1062
        For sockets we do no flushing. For TCP sockets we may want to turn off
1063
        TCP_NODELAY and add a means to do a flush, but that can be done in the
1064
        future.
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1065
        """
1066
1067
    def _read_bytes(self, count):
1068
        """See SmartClientMedium.read_bytes."""
1069
        if not self._connected:
1070
            raise errors.MediumNotConnected(self)
1071
        return osutils.read_bytes_from_socket(
1072
            self._socket, self._report_activity)
1073
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1074
    def disconnect(self):
1075
        """See SmartClientMedium.disconnect()."""
1076
        if not self._connected:
1077
            return
5011.3.1 by Martin
Revert second-phase EINTR changes
1078
        self._socket.close()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1079
        self._socket = None
1080
        self._connected = False
1081
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1082
1083
class SmartTCPClientMedium(SmartClientSocketMedium):
5284.5.6 by Andrew Bennetts
Tweaks prompted by Robert's review.
1084
    """A client medium that creates a TCP connection."""
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1085
1086
    def __init__(self, host, port, base):
1087
        """Creates a client that will connect on the first use."""
1088
        SmartClientSocketMedium.__init__(self, base)
1089
        self._host = host
1090
        self._port = port
1091
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1092
    def _ensure_connection(self):
1093
        """Connect this medium if not already connected."""
1094
        if self._connected:
1095
            return
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1096
        if self._port is None:
1097
            port = BZR_DEFAULT_PORT
1098
        else:
1099
            port = int(self._port)
3711.2.2 by Jelmer Vernooij
Avoid using AI_ADDRCONFIG since it's not portable.
1100
        try:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1101
            sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC,
3711.2.2 by Jelmer Vernooij
Avoid using AI_ADDRCONFIG since it's not portable.
1102
                socket.SOCK_STREAM, 0, 0)
1103
        except socket.gaierror, (err_num, err_msg):
1104
            raise errors.ConnectionError("failed to lookup %s:%d: %s" %
1105
                    (self._host, port, err_msg))
3711.2.3 by Jelmer Vernooij
Add comment.
1106
        # Initialize err in case there are no addresses returned:
3665.4.2 by Jelmer Vernooij
Fall through to next available address if previous fails.
1107
        err = socket.error("no address found for %s" % self._host)
3665.4.1 by Jelmer Vernooij
Support IPv6 in the smart server.
1108
        for (family, socktype, proto, canonname, sockaddr) in sockaddrs:
1109
            try:
3665.4.2 by Jelmer Vernooij
Fall through to next available address if previous fails.
1110
                self._socket = socket.socket(family, socktype, proto)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1111
                self._socket.setsockopt(socket.IPPROTO_TCP,
3665.4.2 by Jelmer Vernooij
Fall through to next available address if previous fails.
1112
                                        socket.TCP_NODELAY, 1)
3665.4.1 by Jelmer Vernooij
Support IPv6 in the smart server.
1113
                self._socket.connect(sockaddr)
1114
            except socket.error, err:
3665.4.2 by Jelmer Vernooij
Fall through to next available address if previous fails.
1115
                if self._socket is not None:
1116
                    self._socket.close()
1117
                self._socket = None
1118
                continue
1119
            break
1120
        if self._socket is None:
1121
            # socket errors either have a (string) or (errno, string) as their
1122
            # args.
1123
            if type(err.args) is str:
1124
                err_msg = err.args
1125
            else:
1126
                err_msg = err.args[1]
1127
            raise errors.ConnectionError("failed to connect to %s:%d: %s" %
1128
                    (self._host, port, err_msg))
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1129
        self._connected = True
1130
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1131
1132
class SmartClientAlreadyConnectedSocketMedium(SmartClientSocketMedium):
5284.5.3 by Andrew Bennetts
Docstring tweaks.
1133
    """A client medium for an already connected socket.
5284.5.1 by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more.
1134
    
1135
    Note that this class will assume it "owns" the socket, so it will close it
1136
    when its disconnect method is called.
1137
    """
1138
1139
    def __init__(self, base, sock):
1140
        SmartClientSocketMedium.__init__(self, base)
1141
        self._socket = sock
1142
        self._connected = True
1143
1144
    def _ensure_connection(self):
1145
        # Already connected, by definition!  So nothing to do.
1146
        pass
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1147
1148
1149
class SmartClientStreamMediumRequest(SmartClientMediumRequest):
1150
    """A SmartClientMediumRequest that works with an SmartClientStreamMedium."""
1151
1152
    def __init__(self, medium):
1153
        SmartClientMediumRequest.__init__(self, medium)
1154
        # check that we are safe concurrency wise. If some streams start
1155
        # allowing concurrent requests - i.e. via multiplexing - then this
1156
        # assert should be moved to SmartClientStreamMedium.get_request,
1157
        # and the setting/unsetting of _current_request likewise moved into
1158
        # that class : but its unneeded overhead for now. RBC 20060922
1159
        if self._medium._current_request is not None:
1160
            raise errors.TooManyConcurrentRequests(self._medium)
1161
        self._medium._current_request = self
1162
1163
    def _accept_bytes(self, bytes):
1164
        """See SmartClientMediumRequest._accept_bytes.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1165
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1166
        This forwards to self._medium._accept_bytes because we are operating
1167
        on the mediums stream.
1168
        """
1169
        self._medium._accept_bytes(bytes)
1170
1171
    def _finished_reading(self):
1172
        """See SmartClientMediumRequest._finished_reading.
1173
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1174
        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.
1175
        request to be created.
1176
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1177
        if self._medium._current_request is not self:
1178
            raise AssertionError()
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1179
        self._medium._current_request = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1180
2018.5.2 by Andrew Bennetts
Start splitting bzrlib/transport/smart.py into a package.
1181
    def _finished_writing(self):
1182
        """See SmartClientMediumRequest._finished_writing.
1183
1184
        This invokes self._medium._flush to ensure all bytes are transmitted.
1185
        """
1186
        self._medium._flush()