~bzr-pqm/bzr/bzr.dev

2018.5.157 by Andrew Bennetts
Remove unnecessary trivial divergences from bzr.dev.
1
# Copyright (C) 2006, 2007 Canonical Ltd
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
2018.5.19 by Andrew Bennetts
Add docstrings to all the new modules, and a few other places.
17
"""Wire-level encoding and decoding of requests and responses for the smart
18
client and server.
19
"""
20
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
21
import collections
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
22
from cStringIO import StringIO
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
23
import struct
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
24
import sys
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
25
import time
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
26
3195.3.13 by Andrew Bennetts
Start writing call* methods for version 3 of the HPSS client protocol.
27
import bzrlib
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
28
from bzrlib import debug
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
29
from bzrlib import errors
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
30
from bzrlib.smart import message, request
2621.3.1 by Andrew Bennetts
Log errors from the smart server in the trace file, to make debugging test failures (and live failures!) easier.
31
from bzrlib.trace import log_exception_quietly, mutter
3842.3.21 by Andrew Bennetts
Merge bzr.dev.
32
from bzrlib.util.bencode import bdecode_as_tuple, bencode
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
33
34
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
35
# Protocol version strings.  These are sent as prefixes of bzr requests and
36
# responses to identify the protocol version being used. (There are no version
37
# one strings because that version doesn't send any).
38
REQUEST_VERSION_TWO = 'bzr request 2\n'
39
RESPONSE_VERSION_TWO = 'bzr response 2\n'
40
3245.4.60 by Andrew Bennetts
Update the protocol v3 version string to say 'bzr 1.6'.
41
MESSAGE_VERSION_THREE = 'bzr message 3 (bzr 1.6)\n'
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
42
RESPONSE_VERSION_THREE = REQUEST_VERSION_THREE = MESSAGE_VERSION_THREE
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
43
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
44
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
45
def _recv_tuple(from_file):
46
    req_line = from_file.readline()
47
    return _decode_tuple(req_line)
48
49
50
def _decode_tuple(req_line):
3376.2.11 by Martin Pool
Compare to None using is/is not not ==
51
    if req_line is None or req_line == '':
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
52
        return None
53
    if req_line[-1] != '\n':
54
        raise errors.SmartProtocolError("request %r not terminated" % req_line)
55
    return tuple(req_line[:-1].split('\x01'))
56
57
58
def _encode_tuple(args):
59
    """Encode the tuple args to a bytestream."""
60
    return '\x01'.join(args) + '\n'
61
62
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
63
class Requester(object):
64
    """Abstract base class for an object that can issue requests on a smart
65
    medium.
66
    """
67
68
    def call(self, *args):
69
        """Make a remote call.
70
71
        :param args: the arguments of this call.
72
        """
73
        raise NotImplementedError(self.call)
74
75
    def call_with_body_bytes(self, args, body):
76
        """Make a remote call with a body.
77
78
        :param args: the arguments of this call.
79
        :type body: str
80
        :param body: the body to send with the request.
81
        """
82
        raise NotImplementedError(self.call_with_body_bytes)
83
84
    def call_with_body_readv_array(self, args, body):
85
        """Make a remote call with a readv array.
86
87
        :param args: the arguments of this call.
88
        :type body: iterable of (start, length) tuples.
89
        :param body: the readv ranges to send with this request.
90
        """
91
        raise NotImplementedError(self.call_with_body_readv_array)
92
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
93
    def set_headers(self, headers):
94
        raise NotImplementedError(self.set_headers)
95
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
96
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
97
class SmartProtocolBase(object):
98
    """Methods common to client and server"""
99
100
    # TODO: this only actually accomodates a single block; possibly should
101
    # support multiple chunks?
102
    def _encode_bulk_data(self, body):
103
        """Encode body as a bulk data chunk."""
104
        return ''.join(('%d\n' % len(body), body, 'done\n'))
105
106
    def _serialise_offsets(self, offsets):
107
        """Serialise a readv offset list."""
108
        txt = []
109
        for start, length in offsets:
110
            txt.append('%d,%d' % (start, length))
111
        return '\n'.join(txt)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
112
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
113
114
class SmartServerRequestProtocolOne(SmartProtocolBase):
115
    """Server-side encoding and decoding logic for smart version 1."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
116
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
117
    def __init__(self, backing_transport, write_func, root_client_path='/'):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
118
        self._backing_transport = backing_transport
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
119
        self._root_client_path = root_client_path
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
120
        self.unused_data = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
121
        self._finished = False
122
        self.in_buffer = ''
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
123
        self._has_dispatched = False
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
124
        self.request = None
125
        self._body_decoder = None
2664.4.6 by John Arbash Meinel
Restore a line that shouldn't have been removed
126
        self._write_func = write_func
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
127
128
    def accept_bytes(self, bytes):
129
        """Take bytes, and advance the internal state machine appropriately.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
130
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
131
        :param bytes: must be a byte string
132
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
133
        if not isinstance(bytes, str):
134
            raise ValueError(bytes)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
135
        self.in_buffer += bytes
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
136
        if not self._has_dispatched:
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
137
            if '\n' not in self.in_buffer:
138
                # no command line yet
139
                return
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
140
            self._has_dispatched = True
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
141
            try:
142
                first_line, self.in_buffer = self.in_buffer.split('\n', 1)
143
                first_line += '\n'
144
                req_args = _decode_tuple(first_line)
2018.5.14 by Andrew Bennetts
Move SmartTCPServer to smart/server.py, and SmartServerRequestHandler to smart/request.py.
145
                self.request = request.SmartServerRequestHandler(
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
146
                    self._backing_transport, commands=request.request_handlers,
147
                    root_client_path=self._root_client_path)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
148
                self.request.dispatch_command(req_args[0], req_args[1:])
149
                if self.request.finished_reading:
150
                    # trivial request
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
151
                    self.unused_data = self.in_buffer
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
152
                    self.in_buffer = ''
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
153
                    self._send_response(self.request.response)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
154
            except KeyboardInterrupt:
155
                raise
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
156
            except errors.UnknownSmartMethod, err:
157
                protocol_error = errors.SmartProtocolError(
158
                    "bad request %r" % (err.verb,))
159
                failure = request.FailedSmartServerResponse(
160
                    ('error', str(protocol_error)))
161
                self._send_response(failure)
162
                return
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
163
            except Exception, exception:
164
                # everything else: pass to client, flush, and quit
2621.3.1 by Andrew Bennetts
Log errors from the smart server in the trace file, to make debugging test failures (and live failures!) easier.
165
                log_exception_quietly()
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
166
                self._send_response(request.FailedSmartServerResponse(
167
                    ('error', str(exception))))
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
168
                return
169
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
170
        if self._has_dispatched:
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
171
            if self._finished:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
172
                # nothing to do.XXX: this routine should be a single state
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
173
                # machine too.
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
174
                self.unused_data += self.in_buffer
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
175
                self.in_buffer = ''
176
                return
177
            if self._body_decoder is None:
178
                self._body_decoder = LengthPrefixedBodyDecoder()
179
            self._body_decoder.accept_bytes(self.in_buffer)
180
            self.in_buffer = self._body_decoder.unused_data
181
            body_data = self._body_decoder.read_pending_data()
182
            self.request.accept_body(body_data)
183
            if self._body_decoder.finished_reading:
184
                self.request.end_of_body()
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
185
                if not self.request.finished_reading:
186
                    raise AssertionError("no more body, request not finished")
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
187
            if self.request.response is not None:
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
188
                self._send_response(self.request.response)
3245.4.21 by Andrew Bennetts
Remove 'excess_buffer' attribute and another crufty comment.
189
                self.unused_data = self.in_buffer
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
190
                self.in_buffer = ''
191
            else:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
192
                if self.request.finished_reading:
193
                    raise AssertionError(
194
                        "no response and we have finished reading.")
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
195
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
196
    def _send_response(self, response):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
197
        """Send a smart server response down the output stream."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
198
        if self._finished:
199
            raise AssertionError('response already sent')
2432.4.3 by Robert Collins
Refactor the HPSS Response code to take SmartServerResponse rather than args and body.
200
        args = response.args
201
        body = response.body
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
202
        self._finished = True
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
203
        self._write_protocol_version()
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
204
        self._write_success_or_failure_prefix(response)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
205
        self._write_func(_encode_tuple(args))
206
        if body is not None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
207
            if not isinstance(body, str):
208
                raise ValueError(body)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
209
            bytes = self._encode_bulk_data(body)
210
            self._write_func(bytes)
211
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
212
    def _write_protocol_version(self):
213
        """Write any prefixes this protocol requires.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
214
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
215
        Version one doesn't send protocol versions.
216
        """
217
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
218
    def _write_success_or_failure_prefix(self, response):
219
        """Write the protocol specific success/failure prefix.
220
221
        For SmartServerRequestProtocolOne this is omitted but we
222
        call is_successful to ensure that the response is valid.
223
        """
224
        response.is_successful()
225
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
226
    def next_read_size(self):
227
        if self._finished:
228
            return 0
229
        if self._body_decoder is None:
230
            return 1
231
        else:
232
            return self._body_decoder.next_read_size()
233
234
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
235
class SmartServerRequestProtocolTwo(SmartServerRequestProtocolOne):
236
    r"""Version two of the server side of the smart protocol.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
237
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
238
    This prefixes responses with the value of RESPONSE_VERSION_TWO.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
239
    """
240
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
241
    response_marker = RESPONSE_VERSION_TWO
242
    request_marker = REQUEST_VERSION_TWO
243
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
244
    def _write_success_or_failure_prefix(self, response):
245
        """Write the protocol specific success/failure prefix."""
246
        if response.is_successful():
247
            self._write_func('success\n')
248
        else:
249
            self._write_func('failed\n')
250
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
251
    def _write_protocol_version(self):
252
        r"""Write any prefixes this protocol requires.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
253
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
254
        Version two sends the value of RESPONSE_VERSION_TWO.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
255
        """
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
256
        self._write_func(self.response_marker)
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
257
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
258
    def _send_response(self, response):
259
        """Send a smart server response down the output stream."""
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
260
        if (self._finished):
261
            raise AssertionError('response already sent')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
262
        self._finished = True
263
        self._write_protocol_version()
264
        self._write_success_or_failure_prefix(response)
265
        self._write_func(_encode_tuple(response.args))
266
        if response.body is not None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
267
            if not isinstance(response.body, str):
268
                raise AssertionError('body must be a str')
269
            if not (response.body_stream is None):
270
                raise AssertionError(
271
                    'body_stream and body cannot both be set')
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
272
            bytes = self._encode_bulk_data(response.body)
273
            self._write_func(bytes)
274
        elif response.body_stream is not None:
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
275
            _send_stream(response.body_stream, self._write_func)
276
277
278
def _send_stream(stream, write_func):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
279
    write_func('chunked\n')
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
280
    _send_chunks(stream, write_func)
281
    write_func('END\n')
2748.4.4 by Andrew Bennetts
Extract a _send_chunks function to make testing easier.
282
283
284
def _send_chunks(stream, write_func):
285
    for chunk in stream:
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
286
        if isinstance(chunk, str):
287
            bytes = "%x\n%s" % (len(chunk), chunk)
288
            write_func(bytes)
289
        elif isinstance(chunk, request.FailedSmartServerResponse):
2748.4.10 by Andrew Bennetts
Fix chunking serialisation to be current with the latest changes to the protocol, and improve the tests to make it harder to have them desynchronised.
290
            write_func('ERR\n')
291
            _send_chunks(chunk.args, write_func)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
292
            return
293
        else:
2535.4.19 by Andrew Bennetts
Fix some trivial NameErrors in error handling.
294
            raise errors.BzrError(
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
295
                'Chunks must be str or FailedSmartServerResponse, got %r'
2535.4.19 by Andrew Bennetts
Fix some trivial NameErrors in error handling.
296
                % chunk)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
297
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
298
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
299
class _NeedMoreBytes(Exception):
300
    """Raise this inside a _StatefulDecoder to stop decoding until more bytes
301
    have been received.
302
    """
303
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.
304
    def __init__(self, count=None):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
305
        """Constructor.
306
307
        :param count: the total number of bytes needed by the current state.
308
            May be None if the number of bytes needed is unknown.
309
        """
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.
310
        self.count = count
311
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
312
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
313
class _StatefulDecoder(object):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
314
    """Base class for writing state machines to decode byte streams.
315
316
    Subclasses should provide a self.state_accept attribute that accepts bytes
317
    and, if appropriate, updates self.state_accept to a different function.
318
    accept_bytes will call state_accept as often as necessary to make sure the
319
    state machine has progressed as far as possible before it returns.
320
321
    See ProtocolThreeDecoder for an example subclass.
322
    """
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
323
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
324
    def __init__(self):
325
        self.finished_reading = False
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
326
        self._in_buffer_list = []
327
        self._in_buffer_len = 0
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
328
        self.unused_data = ''
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
329
        self.bytes_left = None
3195.3.22 by Andrew Bennetts
Fix more tests.
330
        self._number_needed_bytes = None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
331
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
332
    def _get_in_buffer(self):
333
        if len(self._in_buffer_list) == 1:
334
            return self._in_buffer_list[0]
335
        in_buffer = ''.join(self._in_buffer_list)
3649.5.5 by John Arbash Meinel
Fix the test suite.
336
        if len(in_buffer) != self._in_buffer_len:
337
            raise AssertionError(
338
                "Length of buffer did not match expected value: %s != %s"
339
                % self._in_buffer_len, len(in_buffer))
3649.5.2 by John Arbash Meinel
When we are waiting on a big stream, allow
340
        self._in_buffer_list = [in_buffer]
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
341
        return in_buffer
342
3649.5.2 by John Arbash Meinel
When we are waiting on a big stream, allow
343
    def _get_in_bytes(self, count):
344
        """Grab X bytes from the input_buffer.
345
346
        Callers should have already checked that self._in_buffer_len is >
347
        count. Note, this does not consume the bytes from the buffer. The
348
        caller will still need to call _get_in_buffer() and then
349
        _set_in_buffer() if they actually need to consume the bytes.
350
        """
351
        # check if we can yield the bytes from just the first entry in our list
3649.5.5 by John Arbash Meinel
Fix the test suite.
352
        if len(self._in_buffer_list) == 0:
353
            raise AssertionError('Callers must be sure we have buffered bytes'
354
                ' before calling _get_in_bytes')
3649.5.2 by John Arbash Meinel
When we are waiting on a big stream, allow
355
        if len(self._in_buffer_list[0]) > count:
356
            return self._in_buffer_list[0][:count]
357
        # We can't yield it from the first buffer, so collapse all buffers, and
358
        # yield it from that
359
        in_buf = self._get_in_buffer()
360
        return in_buf[:count]
361
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
362
    def _set_in_buffer(self, new_buf):
363
        if new_buf is not None:
364
            self._in_buffer_list = [new_buf]
365
            self._in_buffer_len = len(new_buf)
366
        else:
367
            self._in_buffer_list = []
368
            self._in_buffer_len = 0
369
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
370
    def accept_bytes(self, bytes):
371
        """Decode as much of bytes as possible.
372
373
        If 'bytes' contains too much data it will be appended to
374
        self.unused_data.
375
376
        finished_reading will be set when no more data is required.  Further
377
        data will be appended to self.unused_data.
378
        """
379
        # accept_bytes is allowed to change the state
3195.3.22 by Andrew Bennetts
Fix more tests.
380
        self._number_needed_bytes = None
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
381
        # lsprof puts a very large amount of time on this specific call for
382
        # large readv arrays
383
        self._in_buffer_list.append(bytes)
384
        self._in_buffer_len += len(bytes)
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
385
        try:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
386
            # Run the function for the current state.
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
387
            current_state = self.state_accept
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
388
            self.state_accept()
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
389
            while current_state != self.state_accept:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
390
                # The current state has changed.  Run the function for the new
391
                # current state, so that it can:
392
                #   - decode any unconsumed bytes left in a buffer, and
393
                #   - signal how many more bytes are expected (via raising
394
                #     _NeedMoreBytes).
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
395
                current_state = self.state_accept
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
396
                self.state_accept()
3195.3.22 by Andrew Bennetts
Fix more tests.
397
        except _NeedMoreBytes, e:
398
            self._number_needed_bytes = e.count
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
399
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
400
401
class ChunkedBodyDecoder(_StatefulDecoder):
402
    """Decoder for chunked body data.
403
2748.4.9 by Andrew Bennetts
Merge from hpss-protocol-docs.
404
    This is very similar the HTTP's chunked encoding.  See the description of
405
    streamed body data in `doc/developers/network-protocol.txt` for details.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
406
    """
407
408
    def __init__(self):
409
        _StatefulDecoder.__init__(self)
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
410
        self.state_accept = self._state_accept_expecting_header
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
411
        self.chunk_in_progress = None
412
        self.chunks = collections.deque()
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
413
        self.error = False
414
        self.error_in_progress = None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
415
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
416
    def next_read_size(self):
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
417
        # Note: the shortest possible chunk is 2 bytes: '0\n', and the
418
        # end-of-body marker is 4 bytes: 'END\n'.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
419
        if self.state_accept == self._state_accept_reading_chunk:
420
            # We're expecting more chunk content.  So we're expecting at least
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
421
            # the rest of this chunk plus an END chunk.
422
            return self.bytes_left + 4
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
423
        elif self.state_accept == self._state_accept_expecting_length:
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
424
            if self._in_buffer_len == 0:
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
425
                # We're expecting a chunk length.  There's at least two bytes
426
                # left: a digit plus '\n'.
427
                return 2
428
            else:
429
                # We're in the middle of reading a chunk length.  So there's at
430
                # least one byte left, the '\n' that terminates the length.
431
                return 1
432
        elif self.state_accept == self._state_accept_reading_unused:
433
            return 1
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
434
        elif self.state_accept == self._state_accept_expecting_header:
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
435
            return max(0, len('chunked\n') - self._in_buffer_len)
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
436
        else:
437
            raise AssertionError("Impossible state: %r" % (self.state_accept,))
438
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
439
    def read_next_chunk(self):
440
        try:
441
            return self.chunks.popleft()
442
        except IndexError:
443
            return None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
444
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
445
    def _extract_line(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
446
        in_buf = self._get_in_buffer()
447
        pos = in_buf.find('\n')
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
448
        if pos == -1:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
449
            # We haven't read a complete line yet, so request more bytes before
450
            # we continue.
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
451
            raise _NeedMoreBytes(1)
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
452
        line = in_buf[:pos]
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
453
        # Trim the prefix (including '\n' delimiter) from the _in_buffer.
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
454
        self._set_in_buffer(in_buf[pos+1:])
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
455
        return line
456
457
    def _finished(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
458
        self.unused_data = self._get_in_buffer()
459
        self._in_buffer_list = []
460
        self._in_buffer_len = 0
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
461
        self.state_accept = self._state_accept_reading_unused
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
462
        if self.error:
463
            error_args = tuple(self.error_in_progress)
464
            self.chunks.append(request.FailedSmartServerResponse(error_args))
465
            self.error_in_progress = None
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
466
        self.finished_reading = True
467
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
468
    def _state_accept_expecting_header(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
469
        prefix = self._extract_line()
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
470
        if prefix == 'chunked':
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
471
            self.state_accept = self._state_accept_expecting_length
472
        else:
473
            raise errors.SmartProtocolError(
474
                'Bad chunked body header: "%s"' % (prefix,))
475
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
476
    def _state_accept_expecting_length(self):
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
477
        prefix = self._extract_line()
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
478
        if prefix == 'ERR':
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
479
            self.error = True
480
            self.error_in_progress = []
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
481
            self._state_accept_expecting_length()
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
482
            return
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
483
        elif prefix == 'END':
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
484
            # We've read the end-of-body marker.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
485
            # Any further bytes are unused data, including the bytes left in
486
            # the _in_buffer.
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
487
            self._finished()
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
488
            return
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
489
        else:
490
            self.bytes_left = int(prefix, 16)
491
            self.chunk_in_progress = ''
492
            self.state_accept = self._state_accept_reading_chunk
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
493
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
494
    def _state_accept_reading_chunk(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
495
        in_buf = self._get_in_buffer()
496
        in_buffer_len = len(in_buf)
497
        self.chunk_in_progress += in_buf[:self.bytes_left]
498
        self._set_in_buffer(in_buf[self.bytes_left:])
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
499
        self.bytes_left -= in_buffer_len
500
        if self.bytes_left <= 0:
501
            # Finished with chunk
502
            self.bytes_left = None
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
503
            if self.error:
504
                self.error_in_progress.append(self.chunk_in_progress)
505
            else:
506
                self.chunks.append(self.chunk_in_progress)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
507
            self.chunk_in_progress = None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
508
            self.state_accept = self._state_accept_expecting_length
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
509
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
510
    def _state_accept_reading_unused(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
511
        self.unused_data += self._get_in_buffer()
512
        self._in_buffer_list = []
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
513
514
515
class LengthPrefixedBodyDecoder(_StatefulDecoder):
516
    """Decodes the length-prefixed bulk data."""
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
517
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
518
    def __init__(self):
519
        _StatefulDecoder.__init__(self)
520
        self.state_accept = self._state_accept_expecting_length
521
        self.state_read = self._state_read_no_data
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
522
        self._body = ''
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
523
        self._trailer_buffer = ''
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
524
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
525
    def next_read_size(self):
526
        if self.bytes_left is not None:
527
            # Ideally we want to read all the remainder of the body and the
528
            # trailer in one go.
529
            return self.bytes_left + 5
530
        elif self.state_accept == self._state_accept_reading_trailer:
531
            # Just the trailer left
532
            return 5 - len(self._trailer_buffer)
533
        elif self.state_accept == self._state_accept_expecting_length:
534
            # There's still at least 6 bytes left ('\n' to end the length, plus
535
            # 'done\n').
536
            return 6
537
        else:
538
            # Reading excess data.  Either way, 1 byte at a time is fine.
539
            return 1
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
540
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
541
    def read_pending_data(self):
542
        """Return any pending data that has been decoded."""
543
        return self.state_read()
544
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
545
    def _state_accept_expecting_length(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
546
        in_buf = self._get_in_buffer()
547
        pos = in_buf.find('\n')
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
548
        if pos == -1:
549
            return
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
550
        self.bytes_left = int(in_buf[:pos])
551
        self._set_in_buffer(in_buf[pos+1:])
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
552
        self.state_accept = self._state_accept_reading_body
553
        self.state_read = self._state_read_body_buffer
554
555
    def _state_accept_reading_body(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
556
        in_buf = self._get_in_buffer()
557
        self._body += in_buf
558
        self.bytes_left -= len(in_buf)
559
        self._set_in_buffer(None)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
560
        if self.bytes_left <= 0:
561
            # Finished with body
562
            if self.bytes_left != 0:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
563
                self._trailer_buffer = self._body[self.bytes_left:]
564
                self._body = self._body[:self.bytes_left]
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
565
            self.bytes_left = None
566
            self.state_accept = self._state_accept_reading_trailer
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
567
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
568
    def _state_accept_reading_trailer(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
569
        self._trailer_buffer += self._get_in_buffer()
570
        self._set_in_buffer(None)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
571
        # TODO: what if the trailer does not match "done\n"?  Should this raise
572
        # a ProtocolViolation exception?
573
        if self._trailer_buffer.startswith('done\n'):
574
            self.unused_data = self._trailer_buffer[len('done\n'):]
575
            self.state_accept = self._state_accept_reading_unused
576
            self.finished_reading = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
577
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
578
    def _state_accept_reading_unused(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
579
        self.unused_data += self._get_in_buffer()
580
        self._set_in_buffer(None)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
581
582
    def _state_read_no_data(self):
583
        return ''
584
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
585
    def _state_read_body_buffer(self):
586
        result = self._body
587
        self._body = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
588
        return result
589
590
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
591
class SmartClientRequestProtocolOne(SmartProtocolBase, Requester,
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
592
                                    message.ResponseHandler):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
593
    """The client-side protocol for smart version 1."""
594
595
    def __init__(self, request):
596
        """Construct a SmartClientRequestProtocolOne.
597
598
        :param request: A SmartClientMediumRequest to serialise onto and
599
            deserialise from.
600
        """
601
        self._request = request
602
        self._body_buffer = None
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
603
        self._request_start_time = None
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
604
        self._last_verb = None
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
605
        self._headers = None
606
607
    def set_headers(self, headers):
608
        self._headers = dict(headers)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
609
610
    def call(self, *args):
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
611
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
612
            mutter('hpss call:   %s', repr(args)[1:-1])
3104.4.2 by Andrew Bennetts
All tests passing.
613
            if getattr(self._request._medium, 'base', None) is not None:
614
                mutter('             (to %s)', self._request._medium.base)
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
615
            self._request_start_time = time.time()
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
616
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
617
        self._request.finished_writing()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
618
        self._last_verb = args[0]
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
619
620
    def call_with_body_bytes(self, args, body):
621
        """Make a remote call of args with body bytes 'body'.
622
623
        After calling this, call read_response_tuple to find the result out.
624
        """
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
625
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
626
            mutter('hpss call w/body: %s (%r...)', repr(args)[1:-1], body[:20])
3104.4.2 by Andrew Bennetts
All tests passing.
627
            if getattr(self._request._medium, '_path', None) is not None:
628
                mutter('                  (to %s)', self._request._medium._path)
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
629
            mutter('              %d bytes', len(body))
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
630
            self._request_start_time = time.time()
3211.5.1 by Robert Collins
Change the smart server get_parents method to take a graph search to exclude already recieved parents from. This prevents history shortcuts causing huge numbers of duplicates.
631
            if 'hpssdetail' in debug.debug_flags:
632
                mutter('hpss body content: %s', body)
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
633
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
634
        bytes = self._encode_bulk_data(body)
635
        self._request.accept_bytes(bytes)
636
        self._request.finished_writing()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
637
        self._last_verb = args[0]
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
638
639
    def call_with_body_readv_array(self, args, body):
640
        """Make a remote call with a readv array.
641
642
        The body is encoded with one line per readv offset pair. The numbers in
643
        each pair are separated by a comma, and no trailing \n is emitted.
644
        """
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
645
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
646
            mutter('hpss call w/readv: %s', repr(args)[1:-1])
3104.4.2 by Andrew Bennetts
All tests passing.
647
            if getattr(self._request._medium, '_path', None) is not None:
648
                mutter('                  (to %s)', self._request._medium._path)
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
649
            self._request_start_time = time.time()
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
650
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
651
        readv_bytes = self._serialise_offsets(body)
652
        bytes = self._encode_bulk_data(readv_bytes)
653
        self._request.accept_bytes(bytes)
654
        self._request.finished_writing()
2664.4.2 by John Arbash Meinel
Add debug timings for operations that have to send data
655
        if 'hpss' in debug.debug_flags:
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
656
            mutter('              %d bytes in readv request', len(readv_bytes))
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
657
        self._last_verb = args[0]
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
658
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
659
    def call_with_body_stream(self, args, stream):
660
        # Protocols v1 and v2 don't support body streams.  So it's safe to
661
        # assume that a v1/v2 server doesn't support whatever method we're
662
        # trying to call with a body stream.
3842.3.7 by Andrew Bennetts
Implement a simple fallback (that buffers the whole record stream) for dealing with older servers.
663
        self._request.finished_writing()
664
        self._request.finished_reading()
3842.3.5 by Andrew Bennetts
Remove some debugging cruft, make more tests pass.
665
        raise errors.UnknownSmartMethod(args[0])
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
666
667
    def cancel_read_body(self):
668
        """After expecting a body, a response code may indicate one otherwise.
669
670
        This method lets the domain client inform the protocol that no body
671
        will be transmitted. This is a terminal method: after calling it the
672
        protocol is not able to be used further.
673
        """
674
        self._request.finished_reading()
675
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
676
    def _read_response_tuple(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
677
        result = self._recv_tuple()
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
678
        if 'hpss' in debug.debug_flags:
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
679
            if self._request_start_time is not None:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
680
                mutter('   result:   %6.3fs  %s',
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
681
                       time.time() - self._request_start_time,
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
682
                       repr(result)[1:-1])
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
683
                self._request_start_time = None
684
            else:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
685
                mutter('   result:   %s', repr(result)[1:-1])
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
686
        return result
687
688
    def read_response_tuple(self, expect_body=False):
689
        """Read a response tuple from the wire.
690
691
        This should only be called once.
692
        """
693
        result = self._read_response_tuple()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
694
        self._response_is_unknown_method(result)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
695
        self._raise_args_if_error(result)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
696
        if not expect_body:
697
            self._request.finished_reading()
698
        return result
699
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
700
    def _raise_args_if_error(self, result_tuple):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
701
        # Later protocol versions have an explicit flag in the protocol to say
702
        # if an error response is "failed" or not.  In version 1 we don't have
703
        # that luxury.  So here is a complete list of errors that can be
704
        # returned in response to existing version 1 smart requests.  Responses
705
        # starting with these codes are always "failed" responses.
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
706
        v1_error_codes = [
707
            'norepository',
708
            'NoSuchFile',
709
            'FileExists',
710
            'DirectoryNotEmpty',
711
            'ShortReadvError',
712
            'UnicodeEncodeError',
713
            'UnicodeDecodeError',
714
            'ReadOnlyError',
715
            'nobranch',
716
            'NoSuchRevision',
717
            'nosuchrevision',
718
            'LockContention',
719
            'UnlockableTransport',
720
            'LockFailed',
721
            'TokenMismatch',
722
            'ReadError',
723
            'PermissionDenied',
724
            ]
725
        if result_tuple[0] in v1_error_codes:
726
            self._request.finished_reading()
727
            raise errors.ErrorFromSmartServer(result_tuple)
728
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
729
    def _response_is_unknown_method(self, result_tuple):
730
        """Raise UnexpectedSmartServerResponse if the response is an 'unknonwn
731
        method' response to the request.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
732
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
733
        :param response: The response from a smart client call_expecting_body
734
            call.
735
        :param verb: The verb used in that call.
736
        :raises: UnexpectedSmartServerResponse
737
        """
738
        if (result_tuple == ('error', "Generic bzr smart protocol error: "
739
                "bad request '%s'" % self._last_verb) or
740
              result_tuple == ('error', "Generic bzr smart protocol error: "
741
                "bad request u'%s'" % self._last_verb)):
742
            # The response will have no body, so we've finished reading.
743
            self._request.finished_reading()
744
            raise errors.UnknownSmartMethod(self._last_verb)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
745
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
746
    def read_body_bytes(self, count=-1):
747
        """Read bytes from the body, decoding into a byte stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
748
749
        We read all bytes at once to ensure we've checked the trailer for
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
750
        errors, and then feed the buffer back as read_body_bytes is called.
751
        """
752
        if self._body_buffer is not None:
753
            return self._body_buffer.read(count)
754
        _body_decoder = LengthPrefixedBodyDecoder()
755
756
        while not _body_decoder.finished_reading:
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
757
            bytes = self._request.read_bytes(_body_decoder.next_read_size())
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
758
            if bytes == '':
759
                # end of file encountered reading from server
760
                raise errors.ConnectionReset(
761
                    "Connection lost while reading response body.")
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
762
            _body_decoder.accept_bytes(bytes)
763
        self._request.finished_reading()
764
        self._body_buffer = StringIO(_body_decoder.read_pending_data())
765
        # XXX: TODO check the trailer result.
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
766
        if 'hpss' in debug.debug_flags:
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
767
            mutter('              %d body bytes read',
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
768
                   len(self._body_buffer.getvalue()))
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
769
        return self._body_buffer.read(count)
770
771
    def _recv_tuple(self):
772
        """Receive a tuple from the medium request."""
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
773
        return _decode_tuple(self._request.read_line())
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
774
775
    def query_version(self):
776
        """Return protocol version number of the server."""
777
        self.call('hello')
778
        resp = self.read_response_tuple()
779
        if resp == ('ok', '1'):
780
            return 1
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
781
        elif resp == ('ok', '2'):
782
            return 2
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
783
        else:
784
            raise errors.SmartProtocolError("bad response %r" % (resp,))
785
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
786
    def _write_args(self, args):
787
        self._write_protocol_version()
788
        bytes = _encode_tuple(args)
789
        self._request.accept_bytes(bytes)
790
791
    def _write_protocol_version(self):
792
        """Write any prefixes this protocol requires.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
793
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
794
        Version one doesn't send protocol versions.
795
        """
796
797
798
class SmartClientRequestProtocolTwo(SmartClientRequestProtocolOne):
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
799
    """Version two of the client side of the smart protocol.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
800
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
801
    This prefixes the request with the value of REQUEST_VERSION_TWO.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
802
    """
803
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
804
    response_marker = RESPONSE_VERSION_TWO
805
    request_marker = REQUEST_VERSION_TWO
806
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
807
    def read_response_tuple(self, expect_body=False):
808
        """Read a response tuple from the wire.
809
810
        This should only be called once.
811
        """
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
812
        version = self._request.read_line()
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
813
        if version != self.response_marker:
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).
814
            self._request.finished_reading()
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
815
            raise errors.UnexpectedProtocolVersionMarker(version)
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
816
        response_status = self._request.read_line()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
817
        result = SmartClientRequestProtocolOne._read_response_tuple(self)
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
818
        self._response_is_unknown_method(result)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
819
        if response_status == 'success\n':
820
            self.response_status = True
821
            if not expect_body:
822
                self._request.finished_reading()
823
            return result
824
        elif response_status == 'failed\n':
825
            self.response_status = False
826
            self._request.finished_reading()
827
            raise errors.ErrorFromSmartServer(result)
828
        else:
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
829
            raise errors.SmartProtocolError(
830
                'bad protocol status %r' % response_status)
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
831
832
    def _write_protocol_version(self):
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
833
        """Write any prefixes this protocol requires.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
834
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
835
        Version two sends the value of REQUEST_VERSION_TWO.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
836
        """
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
837
        self._request.accept_bytes(self.request_marker)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
838
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
839
    def read_streamed_body(self):
840
        """Read bytes from the body, decoding into a byte stream.
841
        """
3170.5.1 by Andrew Bennetts
Fix the other half of bug #115781: don't read more than 64k at a time either.
842
        # Read no more than 64k at a time so that we don't risk error 10055 (no
843
        # buffer space available) on Windows.
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
844
        _body_decoder = ChunkedBodyDecoder()
845
        while not _body_decoder.finished_reading:
3565.1.1 by Andrew Bennetts
Read no more then 64k at a time in the smart protocol code.
846
            bytes = self._request.read_bytes(_body_decoder.next_read_size())
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
847
            if bytes == '':
848
                # end of file encountered reading from server
849
                raise errors.ConnectionReset(
850
                    "Connection lost while reading streamed body.")
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
851
            _body_decoder.accept_bytes(bytes)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
852
            for body_bytes in iter(_body_decoder.read_next_chunk, None):
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
853
                if 'hpss' in debug.debug_flags and type(body_bytes) is str:
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
854
                    mutter('              %d byte chunk read',
2535.4.3 by Andrew Bennetts
Remove some useless mutters.
855
                           len(body_bytes))
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
856
                yield body_bytes
857
        self._request.finished_reading()
858
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
859
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
860
def build_server_protocol_three(backing_transport, write_func,
861
                                root_client_path):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
862
    request_handler = request.SmartServerRequestHandler(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
863
        backing_transport, commands=request.request_handlers,
864
        root_client_path=root_client_path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
865
    responder = ProtocolThreeResponder(write_func)
866
    message_handler = message.ConventionalRequestHandler(request_handler, responder)
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
867
    return ProtocolThreeDecoder(message_handler)
868
869
870
class ProtocolThreeDecoder(_StatefulDecoder):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
871
872
    response_marker = RESPONSE_VERSION_THREE
873
    request_marker = REQUEST_VERSION_THREE
874
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
875
    def __init__(self, message_handler, expect_version_marker=False):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
876
        _StatefulDecoder.__init__(self)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
877
        self._has_dispatched = False
3195.3.5 by Andrew Bennetts
Start writing the client-side protocol logic for HPSS v3.
878
        # Initial state
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
879
        if expect_version_marker:
880
            self.state_accept = self._state_accept_expecting_protocol_version
881
            # We're expecting at least the protocol version marker + some
882
            # headers.
883
            self._number_needed_bytes = len(MESSAGE_VERSION_THREE) + 4
884
        else:
885
            self.state_accept = self._state_accept_expecting_headers
886
            self._number_needed_bytes = 4
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
887
        self.decoding_failed = False
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
888
        self.request_handler = self.message_handler = message_handler
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
889
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
890
    def accept_bytes(self, bytes):
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.
891
        self._number_needed_bytes = None
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
892
        try:
893
            _StatefulDecoder.accept_bytes(self, bytes)
894
        except KeyboardInterrupt:
895
            raise
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
896
        except errors.SmartMessageHandlerError, exception:
897
            # We do *not* set self.decoding_failed here.  The message handler
898
            # has raised an error, but the decoder is still able to parse bytes
899
            # and determine when this message ends.
900
            log_exception_quietly()
901
            self.message_handler.protocol_error(exception.exc_value)
902
            # The state machine is ready to continue decoding, but the
903
            # exception has interrupted the loop that runs the state machine.
904
            # So we call accept_bytes again to restart it.
905
            self.accept_bytes('')
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
906
        except Exception, exception:
3245.4.50 by Andrew Bennetts
Clarify the code a little.
907
            # The decoder itself has raised an exception.  We cannot continue
908
            # decoding.
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
909
            self.decoding_failed = True
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).
910
            if isinstance(exception, errors.UnexpectedProtocolVersionMarker):
911
                # This happens during normal operation when the client tries a
912
                # protocol version the server doesn't understand, so no need to
913
                # log a traceback every time.
3245.4.51 by Andrew Bennetts
Add another comment.
914
                # Note that this can only happen when
915
                # expect_version_marker=True, which is only the case on the
916
                # client side.
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).
917
                pass
918
            else:
919
                log_exception_quietly()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
920
            self.message_handler.protocol_error(exception)
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
921
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
922
    def _extract_length_prefixed_bytes(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
923
        if self._in_buffer_len < 4:
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
924
            # A length prefix by itself is 4 bytes, and we don't even have that
925
            # many yet.
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.
926
            raise _NeedMoreBytes(4)
3649.5.2 by John Arbash Meinel
When we are waiting on a big stream, allow
927
        (length,) = struct.unpack('!L', self._get_in_bytes(4))
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
928
        end_of_bytes = 4 + length
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
929
        if self._in_buffer_len < end_of_bytes:
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
930
            # We haven't yet read as many bytes as the length-prefix says there
931
            # are.
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.
932
            raise _NeedMoreBytes(end_of_bytes)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
933
        # Extract the bytes from the buffer.
3649.5.2 by John Arbash Meinel
When we are waiting on a big stream, allow
934
        in_buf = self._get_in_buffer()
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
935
        bytes = in_buf[4:end_of_bytes]
936
        self._set_in_buffer(in_buf[end_of_bytes:])
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
937
        return bytes
938
939
    def _extract_prefixed_bencoded_data(self):
940
        prefixed_bytes = self._extract_length_prefixed_bytes()
941
        try:
3842.3.21 by Andrew Bennetts
Merge bzr.dev.
942
            decoded = bdecode_as_tuple(prefixed_bytes)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
943
        except ValueError:
944
            raise errors.SmartProtocolError(
945
                'Bytes %r not bencoded' % (prefixed_bytes,))
946
        return decoded
947
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
948
    def _extract_single_byte(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
949
        if self._in_buffer_len == 0:
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
950
            # The buffer is empty
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
951
            raise _NeedMoreBytes(1)
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
952
        in_buf = self._get_in_buffer()
953
        one_byte = in_buf[0]
954
        self._set_in_buffer(in_buf[1:])
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
955
        return one_byte
956
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
957
    def _state_accept_expecting_protocol_version(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
958
        needed_bytes = len(MESSAGE_VERSION_THREE) - self._in_buffer_len
959
        in_buf = self._get_in_buffer()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
960
        if needed_bytes > 0:
3245.4.46 by Andrew Bennetts
Apply John's review comments.
961
            # We don't have enough bytes to check if the protocol version
962
            # marker is right.  But we can check if it is already wrong by
963
            # checking that the start of MESSAGE_VERSION_THREE matches what
964
            # we've read so far.
965
            # [In fact, if the remote end isn't bzr we might never receive
966
            # len(MESSAGE_VERSION_THREE) bytes.  So if the bytes we have so far
967
            # are wrong then we should just raise immediately rather than
968
            # stall.]
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
969
            if not MESSAGE_VERSION_THREE.startswith(in_buf):
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
970
                # We have enough bytes to know the protocol version is wrong
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
971
                raise errors.UnexpectedProtocolVersionMarker(in_buf)
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
972
            raise _NeedMoreBytes(len(MESSAGE_VERSION_THREE))
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
973
        if not in_buf.startswith(MESSAGE_VERSION_THREE):
974
            raise errors.UnexpectedProtocolVersionMarker(in_buf)
975
        self._set_in_buffer(in_buf[len(MESSAGE_VERSION_THREE):])
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
976
        self.state_accept = self._state_accept_expecting_headers
977
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
978
    def _state_accept_expecting_headers(self):
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
979
        decoded = self._extract_prefixed_bencoded_data()
980
        if type(decoded) is not dict:
981
            raise errors.SmartProtocolError(
982
                'Header object %r is not a dict' % (decoded,))
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
983
        self.state_accept = self._state_accept_expecting_message_part
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
984
        try:
985
            self.message_handler.headers_received(decoded)
986
        except:
987
            raise errors.SmartMessageHandlerError(sys.exc_info())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
988
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
989
    def _state_accept_expecting_message_part(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
990
        message_part_kind = self._extract_single_byte()
991
        if message_part_kind == 'o':
992
            self.state_accept = self._state_accept_expecting_one_byte
993
        elif message_part_kind == 's':
994
            self.state_accept = self._state_accept_expecting_structure
995
        elif message_part_kind == 'b':
996
            self.state_accept = self._state_accept_expecting_bytes
997
        elif message_part_kind == 'e':
998
            self.done()
999
        else:
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1000
            raise errors.SmartProtocolError(
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1001
                'Bad message kind byte: %r' % (message_part_kind,))
1002
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1003
    def _state_accept_expecting_one_byte(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1004
        byte = self._extract_single_byte()
1005
        self.state_accept = self._state_accept_expecting_message_part
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
1006
        try:
1007
            self.message_handler.byte_part_received(byte)
1008
        except:
1009
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1010
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1011
    def _state_accept_expecting_bytes(self):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1012
        # XXX: this should not buffer whole message part, but instead deliver
1013
        # the bytes as they arrive.
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.
1014
        prefixed_bytes = self._extract_length_prefixed_bytes()
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1015
        self.state_accept = self._state_accept_expecting_message_part
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
1016
        try:
1017
            self.message_handler.bytes_part_received(prefixed_bytes)
1018
        except:
1019
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1020
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1021
    def _state_accept_expecting_structure(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
1022
        structure = self._extract_prefixed_bencoded_data()
1023
        self.state_accept = self._state_accept_expecting_message_part
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
1024
        try:
1025
            self.message_handler.structure_part_received(structure)
1026
        except:
1027
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1028
1029
    def done(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
1030
        self.unused_data = self._get_in_buffer()
1031
        self._set_in_buffer(None)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1032
        self.state_accept = self._state_accept_reading_unused
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
1033
        try:
1034
            self.message_handler.end_received()
1035
        except:
1036
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1037
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1038
    def _state_accept_reading_unused(self):
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
1039
        self.unused_data = self._get_in_buffer()
1040
        self._set_in_buffer(None)
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1041
1042
    def next_read_size(self):
1043
        if self.state_accept == self._state_accept_reading_unused:
1044
            return 0
3245.4.49 by Andrew Bennetts
Distinguish between errors in decoding a message into message parts from errors in handling decoded message parts, and use that to make sure that entire requests are read even when they result in exceptions.
1045
        elif self.decoding_failed:
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
1046
            # An exception occured while processing this message, probably from
1047
            # self.message_handler.  We're not sure that this state machine is
1048
            # in a consistent state, so just signal that we're done (i.e. give
1049
            # up).
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
1050
            return 0
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1051
        else:
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.
1052
            if self._number_needed_bytes is not None:
3649.5.1 by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list
1053
                return self._number_needed_bytes - self._in_buffer_len
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.
1054
            else:
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
1055
                raise AssertionError("don't know how many bytes are expected!")
3195.3.2 by Andrew Bennetts
Checkpoint first rough cut of SmartServerRequestProtocolThree, this implementation reuses the _StatefulDecoder class. Plus some attempts to start tidying the smart protocol tests.
1056
1057
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1058
class _ProtocolThreeEncoder(object):
1059
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1060
    response_marker = request_marker = MESSAGE_VERSION_THREE
1061
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1062
    def __init__(self, write_func):
4078.1.1 by Andrew Bennetts
Slightly better buffering logic when generating protocol v3 messages, especially during streamed bodies.
1063
        self._buf = []
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
1064
        self._real_write_func = write_func
1065
1066
    def _write_func(self, bytes):
4078.1.1 by Andrew Bennetts
Slightly better buffering logic when generating protocol v3 messages, especially during streamed bodies.
1067
        self._buf.append(bytes)
1068
        if len(self._buf) > 100:
1069
            self.flush()
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
1070
1071
    def flush(self):
1072
        if self._buf:
4078.1.1 by Andrew Bennetts
Slightly better buffering logic when generating protocol v3 messages, especially during streamed bodies.
1073
            self._real_write_func(''.join(self._buf))
1074
            del self._buf[:]
3441.3.1 by Andrew Bennetts
Buffer encoding of v3 messages to minimise write/send calls. Doubles the speed of pushing over TCP with 500ms latency loopback.
1075
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1076
    def _serialise_offsets(self, offsets):
1077
        """Serialise a readv offset list."""
1078
        txt = []
1079
        for start, length in offsets:
1080
            txt.append('%d,%d' % (start, length))
1081
        return '\n'.join(txt)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1082
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1083
    def _write_protocol_version(self):
1084
        self._write_func(MESSAGE_VERSION_THREE)
1085
1086
    def _write_prefixed_bencode(self, structure):
1087
        bytes = bencode(structure)
1088
        self._write_func(struct.pack('!L', len(bytes)))
1089
        self._write_func(bytes)
1090
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1091
    def _write_headers(self, headers):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1092
        self._write_prefixed_bencode(headers)
1093
1094
    def _write_structure(self, args):
1095
        self._write_func('s')
3195.3.23 by Andrew Bennetts
Improve the error handling, fixing more tests.
1096
        utf8_args = []
1097
        for arg in args:
1098
            if type(arg) is unicode:
1099
                utf8_args.append(arg.encode('utf8'))
1100
            else:
1101
                utf8_args.append(arg)
1102
        self._write_prefixed_bencode(utf8_args)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1103
1104
    def _write_end(self):
1105
        self._write_func('e')
3441.3.2 by Andrew Bennetts
Simplify buffering logic in _ProtocolThreeEncoder.
1106
        self.flush()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1107
1108
    def _write_prefixed_body(self, bytes):
1109
        self._write_func('b')
1110
        self._write_func(struct.pack('!L', len(bytes)))
1111
        self._write_func(bytes)
1112
3842.3.4 by Andrew Bennetts
TestStacking.test_fetch_copies_from_stacked_on now passes using the VersionedFile.insert_record_stream RPC; lots of debugging cruft needs removal though.
1113
    def _write_chunked_body_start(self):
1114
        self._write_func('oC')
1115
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1116
    def _write_error_status(self):
1117
        self._write_func('oE')
1118
1119
    def _write_success_status(self):
1120
        self._write_func('oS')
1121
1122
1123
class ProtocolThreeResponder(_ProtocolThreeEncoder):
1124
1125
    def __init__(self, write_func):
1126
        _ProtocolThreeEncoder.__init__(self, write_func)
1127
        self.response_sent = False
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1128
        self._headers = {'Software version': bzrlib.__version__}
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1129
1130
    def send_error(self, exception):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1131
        if self.response_sent:
1132
            raise AssertionError(
1133
                "send_error(%s) called, but response already sent."
1134
                % (exception,))
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
1135
        if isinstance(exception, errors.UnknownSmartMethod):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
1136
            failure = request.FailedSmartServerResponse(
1137
                ('UnknownMethod', exception.verb))
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
1138
            self.send_response(failure)
1139
            return
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1140
        self.response_sent = True
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1141
        self._write_protocol_version()
1142
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1143
        self._write_error_status()
1144
        self._write_structure(('error', str(exception)))
1145
        self._write_end()
1146
1147
    def send_response(self, response):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1148
        if self.response_sent:
1149
            raise AssertionError(
1150
                "send_response(%r) called, but response already sent."
1151
                % (response,))
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1152
        self.response_sent = True
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1153
        self._write_protocol_version()
1154
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1155
        if response.is_successful():
1156
            self._write_success_status()
1157
        else:
1158
            self._write_error_status()
1159
        self._write_structure(response.args)
1160
        if response.body is not None:
1161
            self._write_prefixed_body(response.body)
1162
        elif response.body_stream is not None:
4064.1.3 by Andrew Bennetts
Fix bug in _iter_with_errors; it should not report StopIteration as an exception.
1163
            for exc_info, chunk in _iter_with_errors(response.body_stream):
1164
                if exc_info is not None:
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
1165
                    self._write_error_status()
4064.1.3 by Andrew Bennetts
Fix bug in _iter_with_errors; it should not report StopIteration as an exception.
1166
                    error_struct = request._translate_error(exc_info[1])
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
1167
                    self._write_structure(error_struct)
1168
                    break
1169
                else:
4070.9.2 by Andrew Bennetts
Rough prototype of allowing a SearchResult to be passed to fetch, and using that to improve network conversations.
1170
                    if isinstance(chunk, request.FailedSmartServerResponse):
1171
                        self._write_error_status()
1172
                        self._write_structure(chunk.args)
1173
                        break
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
1174
                    self._write_prefixed_body(chunk)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1175
        self._write_end()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1176
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1177
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
1178
def _iter_with_errors(iterable):
1179
    """Handle errors from iterable.next().
1180
1181
    Use like::
1182
1183
        for exc_info, value in _iter_with_errors(iterable):
1184
            ...
1185
1186
    This is a safer alternative to::
1187
1188
        try:
1189
            for value in iterable:
1190
               ...
1191
        except:
1192
            ...
1193
1194
    Because the latter will catch errors from the for-loop body, not just
1195
    iterable.next()
1196
1197
    If an error occurs, exc_info will be a exc_info tuple, and the generator
1198
    will terminate.  Otherwise exc_info will be None, and value will be the
1199
    value from iterable.next().  Note that KeyboardInterrupt and SystemExit
1200
    will not be itercepted.
1201
    """
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
1202
    iterator = iter(iterable)
1203
    while True:
1204
        try:
1205
            yield None, iterator.next()
4064.1.3 by Andrew Bennetts
Fix bug in _iter_with_errors; it should not report StopIteration as an exception.
1206
        except StopIteration:
1207
            return
4064.1.2 by Andrew Bennetts
Refactor server-side error translation, improve tests.
1208
        except (KeyboardInterrupt, SystemExit):
1209
            raise
1210
        except Exception:
4064.1.1 by Andrew Bennetts
Add TestResponseEncodingProtocolThree.test_send_broken_body_stream, and make it pass.
1211
            yield sys.exc_info(), None
1212
            return
1213
1214
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
1215
class ProtocolThreeRequester(_ProtocolThreeEncoder, Requester):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1216
1217
    def __init__(self, medium_request):
1218
        _ProtocolThreeEncoder.__init__(self, medium_request.accept_bytes)
1219
        self._medium_request = medium_request
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1220
        self._headers = {}
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1221
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1222
    def set_headers(self, headers):
3245.4.46 by Andrew Bennetts
Apply John's review comments.
1223
        self._headers = headers.copy()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1224
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1225
    def call(self, *args):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1226
        if 'hpss' in debug.debug_flags:
1227
            mutter('hpss call:   %s', repr(args)[1:-1])
1228
            base = getattr(self._medium_request._medium, 'base', None)
1229
            if base is not None:
1230
                mutter('             (to %s)', base)
1231
            self._request_start_time = time.time()
1232
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1233
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1234
        self._write_structure(args)
1235
        self._write_end()
1236
        self._medium_request.finished_writing()
1237
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1238
    def call_with_body_bytes(self, args, body):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1239
        """Make a remote call of args with body bytes 'body'.
1240
1241
        After calling this, call read_response_tuple to find the result out.
1242
        """
1243
        if 'hpss' in debug.debug_flags:
3842.3.2 by Andrew Bennetts
Revert the RemoteVersionedFiles.get_parent_map implementation, leaving just the skeleton of RemoteVersionedFiles.
1244
            mutter('hpss call w/body: %s (%r...)', repr(args)[1:-1], body[:20])
3245.4.3 by Andrew Bennetts
Fix crash in -Dhpss.
1245
            path = getattr(self._medium_request._medium, '_path', None)
1246
            if path is not None:
1247
                mutter('                  (to %s)', path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1248
            mutter('              %d bytes', len(body))
1249
            self._request_start_time = time.time()
1250
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1251
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1252
        self._write_structure(args)
1253
        self._write_prefixed_body(body)
1254
        self._write_end()
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.
1255
        self._medium_request.finished_writing()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1256
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1257
    def call_with_body_readv_array(self, args, body):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1258
        """Make a remote call with a readv array.
1259
1260
        The body is encoded with one line per readv offset pair. The numbers in
1261
        each pair are separated by a comma, and no trailing \n is emitted.
1262
        """
1263
        if 'hpss' in debug.debug_flags:
1264
            mutter('hpss call w/readv: %s', repr(args)[1:-1])
3245.4.3 by Andrew Bennetts
Fix crash in -Dhpss.
1265
            path = getattr(self._medium_request._medium, '_path', None)
1266
            if path is not None:
1267
                mutter('                  (to %s)', path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1268
            self._request_start_time = time.time()
1269
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1270
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1271
        self._write_structure(args)
1272
        readv_bytes = self._serialise_offsets(body)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1273
        if 'hpss' in debug.debug_flags:
1274
            mutter('              %d bytes in readv request', len(readv_bytes))
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1275
        self._write_prefixed_body(readv_bytes)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1276
        self._write_end()
1277
        self._medium_request.finished_writing()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1278
3842.3.4 by Andrew Bennetts
TestStacking.test_fetch_copies_from_stacked_on now passes using the VersionedFile.insert_record_stream RPC; lots of debugging cruft needs removal though.
1279
    def call_with_body_stream(self, args, stream):
1280
        if 'hpss' in debug.debug_flags:
1281
            mutter('hpss call w/body stream: %r', args)
1282
            path = getattr(self._medium_request._medium, '_path', None)
1283
            if path is not None:
1284
                mutter('                  (to %s)', path)
1285
            self._request_start_time = time.time()
1286
        self._write_protocol_version()
1287
        self._write_headers(self._headers)
1288
        self._write_structure(args)
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
1289
        # TODO: notice if the server has sent an early error reply before we
1290
        #       have finished sending the stream.  We would notice at the end
1291
        #       anyway, but if the medium can deliver it early then it's good
1292
        #       to short-circuit the whole request...
4064.1.3 by Andrew Bennetts
Fix bug in _iter_with_errors; it should not report StopIteration as an exception.
1293
        for exc_info, part in _iter_with_errors(stream):
1294
            if exc_info is not None:
1295
                # Iterating the stream failed.  Cleanly abort the request.
1296
                self._write_error_status()
1297
                # Currently the client unconditionally sends ('error',) as the
1298
                # error args.
1299
                self._write_structure(('error',))
1300
                self._write_end()
1301
                self._medium_request.finished_writing()
1302
                raise exc_info[0], exc_info[1], exc_info[2]
1303
            else:
3923.5.5 by Andrew Bennetts
Cleanly abort the request if an error occurs while iterating a body stream.
1304
                self._write_prefixed_body(part)
1305
                self.flush()
3842.3.4 by Andrew Bennetts
TestStacking.test_fetch_copies_from_stacked_on now passes using the VersionedFile.insert_record_stream RPC; lots of debugging cruft needs removal though.
1306
        self._write_end()
1307
        self._medium_request.finished_writing()
1308