~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
3195.3.13 by Andrew Bennetts
Start writing call* methods for version 3 of the HPSS client protocol.
32
from bzrlib.util.bencode import bdecode, 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)
112
        
113
114
class SmartServerRequestProtocolOne(SmartProtocolBase):
115
    """Server-side encoding and decoding logic for smart version 1."""
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.
130
        
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:
172
                # nothing to do.XXX: this routine should be a single state 
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.
214
        
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.
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.
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
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
326
        self._in_buffer = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
327
        self.unused_data = ''
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
328
        self.bytes_left = None
3195.3.22 by Andrew Bennetts
Fix more tests.
329
        self._number_needed_bytes = None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
330
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
331
    def accept_bytes(self, bytes):
332
        """Decode as much of bytes as possible.
333
334
        If 'bytes' contains too much data it will be appended to
335
        self.unused_data.
336
337
        finished_reading will be set when no more data is required.  Further
338
        data will be appended to self.unused_data.
339
        """
340
        # accept_bytes is allowed to change the state
341
        current_state = self.state_accept
3195.3.22 by Andrew Bennetts
Fix more tests.
342
        self._number_needed_bytes = None
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
343
        self._in_buffer += bytes
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
344
        try:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
345
            # Run the function for the current state.
346
            self.state_accept()
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
347
            while current_state != self.state_accept:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
348
                # The current state has changed.  Run the function for the new
349
                # current state, so that it can:
350
                #   - decode any unconsumed bytes left in a buffer, and
351
                #   - signal how many more bytes are expected (via raising
352
                #     _NeedMoreBytes).
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
353
                current_state = self.state_accept
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
354
                self.state_accept()
3195.3.22 by Andrew Bennetts
Fix more tests.
355
        except _NeedMoreBytes, e:
356
            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
357
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
358
359
class ChunkedBodyDecoder(_StatefulDecoder):
360
    """Decoder for chunked body data.
361
2748.4.9 by Andrew Bennetts
Merge from hpss-protocol-docs.
362
    This is very similar the HTTP's chunked encoding.  See the description of
363
    streamed body data in `doc/developers/network-protocol.txt` for details.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
364
    """
365
366
    def __init__(self):
367
        _StatefulDecoder.__init__(self)
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
368
        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.
369
        self.chunk_in_progress = None
370
        self.chunks = collections.deque()
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
371
        self.error = False
372
        self.error_in_progress = None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
373
    
374
    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.
375
        # Note: the shortest possible chunk is 2 bytes: '0\n', and the
376
        # end-of-body marker is 4 bytes: 'END\n'.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
377
        if self.state_accept == self._state_accept_reading_chunk:
378
            # 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.
379
            # the rest of this chunk plus an END chunk.
380
            return self.bytes_left + 4
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
381
        elif self.state_accept == self._state_accept_expecting_length:
382
            if self._in_buffer == '':
383
                # We're expecting a chunk length.  There's at least two bytes
384
                # left: a digit plus '\n'.
385
                return 2
386
            else:
387
                # We're in the middle of reading a chunk length.  So there's at
388
                # least one byte left, the '\n' that terminates the length.
389
                return 1
390
        elif self.state_accept == self._state_accept_reading_unused:
391
            return 1
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
392
        elif self.state_accept == self._state_accept_expecting_header:
393
            return max(0, len('chunked\n') - len(self._in_buffer))
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
394
        else:
395
            raise AssertionError("Impossible state: %r" % (self.state_accept,))
396
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
397
    def read_next_chunk(self):
398
        try:
399
            return self.chunks.popleft()
400
        except IndexError:
401
            return None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
402
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
403
    def _extract_line(self):
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
404
        pos = self._in_buffer.find('\n')
405
        if pos == -1:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
406
            # We haven't read a complete line yet, so request more bytes before
407
            # we continue.
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
408
            raise _NeedMoreBytes(1)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
409
        line = self._in_buffer[:pos]
410
        # Trim the prefix (including '\n' delimiter) from the _in_buffer.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
411
        self._in_buffer = self._in_buffer[pos+1:]
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
412
        return line
413
414
    def _finished(self):
415
        self.unused_data = self._in_buffer
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
416
        self._in_buffer = ''
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
417
        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.
418
        if self.error:
419
            error_args = tuple(self.error_in_progress)
420
            self.chunks.append(request.FailedSmartServerResponse(error_args))
421
            self.error_in_progress = None
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
422
        self.finished_reading = True
423
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
424
    def _state_accept_expecting_header(self):
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
425
        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.
426
        if prefix == 'chunked':
2748.4.16 by Andrew Bennetts
Tweaks suggested by review.
427
            self.state_accept = self._state_accept_expecting_length
428
        else:
429
            raise errors.SmartProtocolError(
430
                'Bad chunked body header: "%s"' % (prefix,))
431
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
432
    def _state_accept_expecting_length(self):
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
433
        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.
434
        if prefix == 'ERR':
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
435
            self.error = True
436
            self.error_in_progress = []
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
437
            self._state_accept_expecting_length()
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
438
            return
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
439
        elif prefix == 'END':
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
440
            # We've read the end-of-body marker.
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
441
            # Any further bytes are unused data, including the bytes left in
442
            # the _in_buffer.
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
443
            self._finished()
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
444
            return
2748.4.7 by Andrew Bennetts
Change the end-of-body marker to something clearer than a zero-length chunk.
445
        else:
446
            self.bytes_left = int(prefix, 16)
447
            self.chunk_in_progress = ''
448
            self.state_accept = self._state_accept_reading_chunk
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
449
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
450
    def _state_accept_reading_chunk(self):
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
451
        in_buffer_len = len(self._in_buffer)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
452
        self.chunk_in_progress += self._in_buffer[:self.bytes_left]
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
453
        self._in_buffer = self._in_buffer[self.bytes_left:]
454
        self.bytes_left -= in_buffer_len
455
        if self.bytes_left <= 0:
456
            # Finished with chunk
457
            self.bytes_left = None
2748.4.6 by Andrew Bennetts
Use chunks for stream errors, rather than the response tuple format.
458
            if self.error:
459
                self.error_in_progress.append(self.chunk_in_progress)
460
            else:
461
                self.chunks.append(self.chunk_in_progress)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
462
            self.chunk_in_progress = None
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
463
            self.state_accept = self._state_accept_expecting_length
464
        
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
465
    def _state_accept_reading_unused(self):
466
        self.unused_data += self._in_buffer
467
        self._in_buffer = ''
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
468
469
470
class LengthPrefixedBodyDecoder(_StatefulDecoder):
471
    """Decodes the length-prefixed bulk data."""
472
    
473
    def __init__(self):
474
        _StatefulDecoder.__init__(self)
475
        self.state_accept = self._state_accept_expecting_length
476
        self.state_read = self._state_read_no_data
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
477
        self._body = ''
2748.4.1 by Andrew Bennetts
Implement a ChunkedBodyDecoder.
478
        self._trailer_buffer = ''
479
    
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
480
    def next_read_size(self):
481
        if self.bytes_left is not None:
482
            # Ideally we want to read all the remainder of the body and the
483
            # trailer in one go.
484
            return self.bytes_left + 5
485
        elif self.state_accept == self._state_accept_reading_trailer:
486
            # Just the trailer left
487
            return 5 - len(self._trailer_buffer)
488
        elif self.state_accept == self._state_accept_expecting_length:
489
            # There's still at least 6 bytes left ('\n' to end the length, plus
490
            # 'done\n').
491
            return 6
492
        else:
493
            # Reading excess data.  Either way, 1 byte at a time is fine.
494
            return 1
495
        
496
    def read_pending_data(self):
497
        """Return any pending data that has been decoded."""
498
        return self.state_read()
499
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
500
    def _state_accept_expecting_length(self):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
501
        pos = self._in_buffer.find('\n')
502
        if pos == -1:
503
            return
504
        self.bytes_left = int(self._in_buffer[:pos])
505
        self._in_buffer = self._in_buffer[pos+1:]
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
506
        self.state_accept = self._state_accept_reading_body
507
        self.state_read = self._state_read_body_buffer
508
509
    def _state_accept_reading_body(self):
510
        self._body += self._in_buffer
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
511
        self.bytes_left -= len(self._in_buffer)
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
512
        self._in_buffer = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
513
        if self.bytes_left <= 0:
514
            # Finished with body
515
            if self.bytes_left != 0:
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
516
                self._trailer_buffer = self._body[self.bytes_left:]
517
                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
518
            self.bytes_left = None
519
            self.state_accept = self._state_accept_reading_trailer
520
        
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
521
    def _state_accept_reading_trailer(self):
522
        self._trailer_buffer += self._in_buffer
523
        self._in_buffer = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
524
        # TODO: what if the trailer does not match "done\n"?  Should this raise
525
        # a ProtocolViolation exception?
526
        if self._trailer_buffer.startswith('done\n'):
527
            self.unused_data = self._trailer_buffer[len('done\n'):]
528
            self.state_accept = self._state_accept_reading_unused
529
            self.finished_reading = True
530
    
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
531
    def _state_accept_reading_unused(self):
532
        self.unused_data += self._in_buffer
533
        self._in_buffer = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
534
535
    def _state_read_no_data(self):
536
        return ''
537
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
538
    def _state_read_body_buffer(self):
539
        result = self._body
540
        self._body = ''
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
541
        return result
542
543
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
544
class SmartClientRequestProtocolOne(SmartProtocolBase, Requester,
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
545
                                    message.ResponseHandler):
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
546
    """The client-side protocol for smart version 1."""
547
548
    def __init__(self, request):
549
        """Construct a SmartClientRequestProtocolOne.
550
551
        :param request: A SmartClientMediumRequest to serialise onto and
552
            deserialise from.
553
        """
554
        self._request = request
555
        self._body_buffer = None
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
556
        self._request_start_time = None
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
557
        self._last_verb = None
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
558
        self._headers = None
559
560
    def set_headers(self, headers):
561
        self._headers = dict(headers)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
562
563
    def call(self, *args):
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
564
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
565
            mutter('hpss call:   %s', repr(args)[1:-1])
3104.4.2 by Andrew Bennetts
All tests passing.
566
            if getattr(self._request._medium, 'base', None) is not None:
567
                mutter('             (to %s)', self._request._medium.base)
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
568
            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.
569
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
570
        self._request.finished_writing()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
571
        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
572
573
    def call_with_body_bytes(self, args, body):
574
        """Make a remote call of args with body bytes 'body'.
575
576
        After calling this, call read_response_tuple to find the result out.
577
        """
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
578
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
579
            mutter('hpss call w/body: %s (%r...)', repr(args)[1:-1], body[:20])
3104.4.2 by Andrew Bennetts
All tests passing.
580
            if getattr(self._request._medium, '_path', None) is not None:
581
                mutter('                  (to %s)', self._request._medium._path)
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
582
            mutter('              %d bytes', len(body))
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
583
            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.
584
            if 'hpssdetail' in debug.debug_flags:
585
                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.
586
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
587
        bytes = self._encode_bulk_data(body)
588
        self._request.accept_bytes(bytes)
589
        self._request.finished_writing()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
590
        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
591
592
    def call_with_body_readv_array(self, args, body):
593
        """Make a remote call with a readv array.
594
595
        The body is encoded with one line per readv offset pair. The numbers in
596
        each pair are separated by a comma, and no trailing \n is emitted.
597
        """
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
598
        if 'hpss' in debug.debug_flags:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
599
            mutter('hpss call w/readv: %s', repr(args)[1:-1])
3104.4.2 by Andrew Bennetts
All tests passing.
600
            if getattr(self._request._medium, '_path', None) is not None:
601
                mutter('                  (to %s)', self._request._medium._path)
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
602
            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.
603
        self._write_args(args)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
604
        readv_bytes = self._serialise_offsets(body)
605
        bytes = self._encode_bulk_data(readv_bytes)
606
        self._request.accept_bytes(bytes)
607
        self._request.finished_writing()
2664.4.2 by John Arbash Meinel
Add debug timings for operations that have to send data
608
        if 'hpss' in debug.debug_flags:
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
609
            mutter('              %d bytes in readv request', len(readv_bytes))
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
610
        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
611
612
    def cancel_read_body(self):
613
        """After expecting a body, a response code may indicate one otherwise.
614
615
        This method lets the domain client inform the protocol that no body
616
        will be transmitted. This is a terminal method: after calling it the
617
        protocol is not able to be used further.
618
        """
619
        self._request.finished_reading()
620
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
621
    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
622
        result = self._recv_tuple()
2593.3.1 by Andrew Bennetts
Add a -Dhpss debug flag.
623
        if 'hpss' in debug.debug_flags:
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
624
            if self._request_start_time is not None:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
625
                mutter('   result:   %6.3fs  %s',
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
626
                       time.time() - self._request_start_time,
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
627
                       repr(result)[1:-1])
2664.4.1 by John Arbash Meinel
Add timing information for call/response groups for hpss
628
                self._request_start_time = None
629
            else:
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
630
                mutter('   result:   %s', repr(result)[1:-1])
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
631
        return result
632
633
    def read_response_tuple(self, expect_body=False):
634
        """Read a response tuple from the wire.
635
636
        This should only be called once.
637
        """
638
        result = self._read_response_tuple()
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
639
        self._response_is_unknown_method(result)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
640
        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
641
        if not expect_body:
642
            self._request.finished_reading()
643
        return result
644
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
645
    def _raise_args_if_error(self, result_tuple):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
646
        # Later protocol versions have an explicit flag in the protocol to say
647
        # if an error response is "failed" or not.  In version 1 we don't have
648
        # that luxury.  So here is a complete list of errors that can be
649
        # returned in response to existing version 1 smart requests.  Responses
650
        # starting with these codes are always "failed" responses.
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
651
        v1_error_codes = [
652
            'norepository',
653
            'NoSuchFile',
654
            'FileExists',
655
            'DirectoryNotEmpty',
656
            'ShortReadvError',
657
            'UnicodeEncodeError',
658
            'UnicodeDecodeError',
659
            'ReadOnlyError',
660
            'nobranch',
661
            'NoSuchRevision',
662
            'nosuchrevision',
663
            'LockContention',
664
            'UnlockableTransport',
665
            'LockFailed',
666
            'TokenMismatch',
667
            'ReadError',
668
            'PermissionDenied',
669
            ]
670
        if result_tuple[0] in v1_error_codes:
671
            self._request.finished_reading()
672
            raise errors.ErrorFromSmartServer(result_tuple)
673
3297.3.1 by Andrew Bennetts
Raise UnknownSmartMethod automatically from read_response_tuple.
674
    def _response_is_unknown_method(self, result_tuple):
675
        """Raise UnexpectedSmartServerResponse if the response is an 'unknonwn
676
        method' response to the request.
677
        
678
        :param response: The response from a smart client call_expecting_body
679
            call.
680
        :param verb: The verb used in that call.
681
        :raises: UnexpectedSmartServerResponse
682
        """
683
        if (result_tuple == ('error', "Generic bzr smart protocol error: "
684
                "bad request '%s'" % self._last_verb) or
685
              result_tuple == ('error', "Generic bzr smart protocol error: "
686
                "bad request u'%s'" % self._last_verb)):
687
            # The response will have no body, so we've finished reading.
688
            self._request.finished_reading()
689
            raise errors.UnknownSmartMethod(self._last_verb)
690
        
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
691
    def read_body_bytes(self, count=-1):
692
        """Read bytes from the body, decoding into a byte stream.
693
        
694
        We read all bytes at once to ensure we've checked the trailer for 
695
        errors, and then feed the buffer back as read_body_bytes is called.
696
        """
697
        if self._body_buffer is not None:
698
            return self._body_buffer.read(count)
699
        _body_decoder = LengthPrefixedBodyDecoder()
700
3170.5.1 by Andrew Bennetts
Fix the other half of bug #115781: don't read more than 64k at a time either.
701
        # Read no more than 64k at a time so that we don't risk error 10055 (no
702
        # buffer space available) on Windows.
703
        max_read = 64 * 1024
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
704
        while not _body_decoder.finished_reading:
3170.5.1 by Andrew Bennetts
Fix the other half of bug #115781: don't read more than 64k at a time either.
705
            bytes_wanted = min(_body_decoder.next_read_size(), max_read)
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
706
            bytes = self._request.read_bytes(bytes_wanted)
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
707
            if bytes == '':
708
                # end of file encountered reading from server
709
                raise errors.ConnectionReset(
710
                    "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
711
            _body_decoder.accept_bytes(bytes)
712
        self._request.finished_reading()
713
        self._body_buffer = StringIO(_body_decoder.read_pending_data())
714
        # XXX: TODO check the trailer result.
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
715
        if 'hpss' in debug.debug_flags:
2664.4.4 by John Arbash Meinel
Switch around what bytes get logged.
716
            mutter('              %d body bytes read',
2664.4.3 by John Arbash Meinel
Update to include a bit better formatting
717
                   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
718
        return self._body_buffer.read(count)
719
720
    def _recv_tuple(self):
721
        """Receive a tuple from the medium request."""
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
722
        return _decode_tuple(self._recv_line())
723
724
    def _recv_line(self):
725
        """Read an entire line from the medium request."""
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
726
        line = ''
727
        while not line or line[-1] != '\n':
728
            # TODO: this is inefficient - but tuples are short.
729
            new_char = self._request.read_bytes(1)
2930.1.1 by Ian Clatworthy
error msg instead of assert when connection over bzr+ssh fails (#115601)
730
            if new_char == '':
731
                # end of file encountered reading from server
2930.1.2 by Ian Clatworthy
Review feedback from poolie and spiv
732
                raise errors.ConnectionReset(
733
                    "please check connectivity and permissions",
734
                    "(and try -Dhpss if further diagnosis is required)")
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
735
            line += new_char
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
736
        return line
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
737
738
    def query_version(self):
739
        """Return protocol version number of the server."""
740
        self.call('hello')
741
        resp = self.read_response_tuple()
742
        if resp == ('ok', '1'):
743
            return 1
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
744
        elif resp == ('ok', '2'):
745
            return 2
2018.5.3 by Andrew Bennetts
Split up more smart server code, this time into bzrlib/transport/smart/protocol.py
746
        else:
747
            raise errors.SmartProtocolError("bad response %r" % (resp,))
748
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
749
    def _write_args(self, args):
750
        self._write_protocol_version()
751
        bytes = _encode_tuple(args)
752
        self._request.accept_bytes(bytes)
753
754
    def _write_protocol_version(self):
755
        """Write any prefixes this protocol requires.
756
        
757
        Version one doesn't send protocol versions.
758
        """
759
760
761
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.
762
    """Version two of the client side of the smart protocol.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
763
    
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
764
    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.
765
    """
766
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.
767
    response_marker = RESPONSE_VERSION_TWO
768
    request_marker = REQUEST_VERSION_TWO
769
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
770
    def read_response_tuple(self, expect_body=False):
771
        """Read a response tuple from the wire.
772
773
        This should only be called once.
774
        """
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
775
        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.
776
        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).
777
            self._request.finished_reading()
3245.4.43 by Andrew Bennetts
Improve tests for automatic detection of protocol version.
778
            raise errors.UnexpectedProtocolVersionMarker(version)
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
779
        response_status = self._recv_line()
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
780
        result = SmartClientRequestProtocolOne._read_response_tuple(self)
3245.4.55 by Andrew Bennetts
Test improvements suggested by John's review.
781
        self._response_is_unknown_method(result)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
782
        if response_status == 'success\n':
783
            self.response_status = True
784
            if not expect_body:
785
                self._request.finished_reading()
786
            return result
787
        elif response_status == 'failed\n':
788
            self.response_status = False
789
            self._request.finished_reading()
790
            raise errors.ErrorFromSmartServer(result)
791
        else:
2432.4.6 by Robert Collins
Include success/failure feedback in SmartProtocolTwo responses to allow robust handling in the future.
792
            raise errors.SmartProtocolError(
793
                '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.
794
795
    def _write_protocol_version(self):
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
796
        """Write any prefixes this protocol requires.
2432.2.1 by Andrew Bennetts
Add Smart{Client,Server}RequestProtocolTwo, that prefix args tuples with a version marker.
797
        
2432.2.7 by Andrew Bennetts
Use less confusing version strings, and define REQUEST_VERSION_TWO/RESPONSE_VERSION_TWO constants for them.
798
        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.
799
        """
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.
800
        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
801
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
802
    def read_streamed_body(self):
803
        """Read bytes from the body, decoding into a byte stream.
804
        """
3170.5.1 by Andrew Bennetts
Fix the other half of bug #115781: don't read more than 64k at a time either.
805
        # Read no more than 64k at a time so that we don't risk error 10055 (no
806
        # buffer space available) on Windows.
807
        max_read = 64 * 1024
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
808
        _body_decoder = ChunkedBodyDecoder()
809
        while not _body_decoder.finished_reading:
3170.5.1 by Andrew Bennetts
Fix the other half of bug #115781: don't read more than 64k at a time either.
810
            bytes_wanted = min(_body_decoder.next_read_size(), max_read)
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
811
            bytes = self._request.read_bytes(bytes_wanted)
3464.4.1 by Andrew Bennetts
Fix infinite busy-loop caused by connection loss during read of response body in HPSS v1 and v2.
812
            if bytes == '':
813
                # end of file encountered reading from server
814
                raise errors.ConnectionReset(
815
                    "Connection lost while reading streamed body.")
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
816
            _body_decoder.accept_bytes(bytes)
2748.4.5 by Andrew Bennetts
Allow an error to interrupt (and terminate) a streamed response body.
817
            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.
818
                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.
819
                    mutter('              %d byte chunk read',
2535.4.3 by Andrew Bennetts
Remove some useless mutters.
820
                           len(body_bytes))
2748.4.2 by Andrew Bennetts
Add protocol (version two) support for streaming bodies (using chunking) in responses.
821
                yield body_bytes
822
        self._request.finished_reading()
823
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.
824
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
825
def build_server_protocol_three(backing_transport, write_func,
826
                                root_client_path):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
827
    request_handler = request.SmartServerRequestHandler(
3245.4.14 by Andrew Bennetts
Merge from bzr.dev (via loom thread).
828
        backing_transport, commands=request.request_handlers,
829
        root_client_path=root_client_path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
830
    responder = ProtocolThreeResponder(write_func)
831
    message_handler = message.ConventionalRequestHandler(request_handler, responder)
3245.4.7 by Andrew Bennetts
Rename _ProtocolThreeBase to ProtocolThreeDecoder, remove SmartServerRequestProtocolThree.
832
    return ProtocolThreeDecoder(message_handler)
833
834
835
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.
836
837
    response_marker = RESPONSE_VERSION_THREE
838
    request_marker = REQUEST_VERSION_THREE
839
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
840
    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.
841
        _StatefulDecoder.__init__(self)
3245.4.59 by Andrew Bennetts
Various tweaks in response to Martin's review.
842
        self._has_dispatched = False
3195.3.5 by Andrew Bennetts
Start writing the client-side protocol logic for HPSS v3.
843
        # Initial state
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
844
        if expect_version_marker:
845
            self.state_accept = self._state_accept_expecting_protocol_version
846
            # We're expecting at least the protocol version marker + some
847
            # headers.
848
            self._number_needed_bytes = len(MESSAGE_VERSION_THREE) + 4
849
        else:
850
            self.state_accept = self._state_accept_expecting_headers
851
            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.
852
        self.decoding_failed = False
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
853
        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.
854
3195.3.8 by Andrew Bennetts
Use _NeedMoreBytes to improve earlier protocol implementations a little, and make test_errors_are_logged pass.
855
    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.
856
        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.
857
        try:
858
            _StatefulDecoder.accept_bytes(self, bytes)
859
        except KeyboardInterrupt:
860
            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.
861
        except errors.SmartMessageHandlerError, exception:
862
            # We do *not* set self.decoding_failed here.  The message handler
863
            # has raised an error, but the decoder is still able to parse bytes
864
            # and determine when this message ends.
865
            log_exception_quietly()
866
            self.message_handler.protocol_error(exception.exc_value)
867
            # The state machine is ready to continue decoding, but the
868
            # exception has interrupted the loop that runs the state machine.
869
            # So we call accept_bytes again to restart it.
870
            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.
871
        except Exception, exception:
3245.4.50 by Andrew Bennetts
Clarify the code a little.
872
            # The decoder itself has raised an exception.  We cannot continue
873
            # 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.
874
            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).
875
            if isinstance(exception, errors.UnexpectedProtocolVersionMarker):
876
                # This happens during normal operation when the client tries a
877
                # protocol version the server doesn't understand, so no need to
878
                # log a traceback every time.
3245.4.51 by Andrew Bennetts
Add another comment.
879
                # Note that this can only happen when
880
                # expect_version_marker=True, which is only the case on the
881
                # 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).
882
                pass
883
            else:
884
                log_exception_quietly()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
885
            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.
886
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.
887
    def _extract_length_prefixed_bytes(self):
888
        if len(self._in_buffer) < 4:
889
            # A length prefix by itself is 4 bytes, and we don't even have that
890
            # 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.
891
            raise _NeedMoreBytes(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.
892
        (length,) = struct.unpack('!L', self._in_buffer[:4])
893
        end_of_bytes = 4 + length
894
        if len(self._in_buffer) < end_of_bytes:
895
            # We haven't yet read as many bytes as the length-prefix says there
896
            # 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.
897
            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.
898
        # Extract the bytes from the buffer.
899
        bytes = self._in_buffer[4:end_of_bytes]
900
        self._in_buffer = self._in_buffer[end_of_bytes:]
901
        return bytes
902
903
    def _extract_prefixed_bencoded_data(self):
904
        prefixed_bytes = self._extract_length_prefixed_bytes()
905
        try:
906
            decoded = bdecode(prefixed_bytes)
907
        except ValueError:
908
            raise errors.SmartProtocolError(
909
                'Bytes %r not bencoded' % (prefixed_bytes,))
910
        return decoded
911
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
912
    def _extract_single_byte(self):
913
        if self._in_buffer == '':
914
            # The buffer is empty
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
915
            raise _NeedMoreBytes(1)
3195.3.7 by Andrew Bennetts
Make the '_extract_* helpers more robust by adding a _NeedMoreBytes exception to _StatefulDecoder.
916
        one_byte = self._in_buffer[0]
917
        self._in_buffer = self._in_buffer[1:]
918
        return one_byte
919
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
920
    def _state_accept_expecting_protocol_version(self):
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
921
        needed_bytes = len(MESSAGE_VERSION_THREE) - len(self._in_buffer)
922
        if needed_bytes > 0:
3245.4.46 by Andrew Bennetts
Apply John's review comments.
923
            # We don't have enough bytes to check if the protocol version
924
            # marker is right.  But we can check if it is already wrong by
925
            # checking that the start of MESSAGE_VERSION_THREE matches what
926
            # we've read so far.
927
            # [In fact, if the remote end isn't bzr we might never receive
928
            # len(MESSAGE_VERSION_THREE) bytes.  So if the bytes we have so far
929
            # are wrong then we should just raise immediately rather than
930
            # stall.]
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
931
            if not MESSAGE_VERSION_THREE.startswith(self._in_buffer):
932
                # We have enough bytes to know the protocol version is wrong
933
                raise errors.UnexpectedProtocolVersionMarker(self._in_buffer)
934
            raise _NeedMoreBytes(len(MESSAGE_VERSION_THREE))
935
        if not self._in_buffer.startswith(MESSAGE_VERSION_THREE):
936
            raise errors.UnexpectedProtocolVersionMarker(self._in_buffer)
937
        self._in_buffer = self._in_buffer[len(MESSAGE_VERSION_THREE):]
938
        self.state_accept = self._state_accept_expecting_headers
939
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
940
    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.
941
        decoded = self._extract_prefixed_bencoded_data()
942
        if type(decoded) is not dict:
943
            raise errors.SmartProtocolError(
944
                'Header object %r is not a dict' % (decoded,))
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
945
        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.
946
        try:
947
            self.message_handler.headers_received(decoded)
948
        except:
949
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.10 by Andrew Bennetts
Remove a little more duplication.
950
    
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
951
    def _state_accept_expecting_message_part(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
952
        message_part_kind = self._extract_single_byte()
953
        if message_part_kind == 'o':
954
            self.state_accept = self._state_accept_expecting_one_byte
955
        elif message_part_kind == 's':
956
            self.state_accept = self._state_accept_expecting_structure
957
        elif message_part_kind == 'b':
958
            self.state_accept = self._state_accept_expecting_bytes
959
        elif message_part_kind == 'e':
960
            self.done()
961
        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.
962
            raise errors.SmartProtocolError(
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
963
                'Bad message kind byte: %r' % (message_part_kind,))
964
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
965
    def _state_accept_expecting_one_byte(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
966
        byte = self._extract_single_byte()
967
        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.
968
        try:
969
            self.message_handler.byte_part_received(byte)
970
        except:
971
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
972
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
973
    def _state_accept_expecting_bytes(self):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
974
        # XXX: this should not buffer whole message part, but instead deliver
975
        # 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.
976
        prefixed_bytes = self._extract_length_prefixed_bytes()
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
977
        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.
978
        try:
979
            self.message_handler.bytes_part_received(prefixed_bytes)
980
        except:
981
            raise errors.SmartMessageHandlerError(sys.exc_info())
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
982
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
983
    def _state_accept_expecting_structure(self):
3195.3.16 by Andrew Bennetts
Update tests for revised v3 spec.
984
        structure = self._extract_prefixed_bencoded_data()
985
        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.
986
        try:
987
            self.message_handler.structure_part_received(structure)
988
        except:
989
            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.
990
991
    def done(self):
3195.3.5 by Andrew Bennetts
Start writing the client-side protocol logic for HPSS v3.
992
        self.unused_data = self._in_buffer
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
993
        self._in_buffer = ''
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.
994
        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.
995
        try:
996
            self.message_handler.end_received()
997
        except:
998
            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.
999
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1000
    def _state_accept_reading_unused(self):
1001
        self.unused_data += self._in_buffer
1002
        self._in_buffer = ''
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.
1003
1004
    def next_read_size(self):
1005
        if self.state_accept == self._state_accept_reading_unused:
1006
            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.
1007
        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.
1008
            # An exception occured while processing this message, probably from
1009
            # self.message_handler.  We're not sure that this state machine is
1010
            # in a consistent state, so just signal that we're done (i.e. give
1011
            # up).
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
1012
            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.
1013
        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.
1014
            if self._number_needed_bytes is not None:
1015
                return self._number_needed_bytes - len(self._in_buffer)
1016
            else:
3245.4.28 by Andrew Bennetts
Remove another XXX, and include test ID in smart server thread names.
1017
                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.
1018
1019
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1020
class _ProtocolThreeEncoder(object):
1021
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1022
    response_marker = request_marker = MESSAGE_VERSION_THREE
1023
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1024
    def __init__(self, write_func):
3441.3.2 by Andrew Bennetts
Simplify buffering logic in _ProtocolThreeEncoder.
1025
        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.
1026
        self._real_write_func = write_func
1027
1028
    def _write_func(self, bytes):
3441.3.2 by Andrew Bennetts
Simplify buffering logic in _ProtocolThreeEncoder.
1029
        self._buf += bytes
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.
1030
1031
    def flush(self):
1032
        if self._buf:
1033
            self._real_write_func(self._buf)
1034
            self._buf = ''
1035
3245.4.18 by Andrew Bennetts
Remove a bunch of cruft, especially the SmartClientRequestProtocolThree class.
1036
    def _serialise_offsets(self, offsets):
1037
        """Serialise a readv offset list."""
1038
        txt = []
1039
        for start, length in offsets:
1040
            txt.append('%d,%d' % (start, length))
1041
        return '\n'.join(txt)
1042
        
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1043
    def _write_protocol_version(self):
1044
        self._write_func(MESSAGE_VERSION_THREE)
1045
1046
    def _write_prefixed_bencode(self, structure):
1047
        bytes = bencode(structure)
1048
        self._write_func(struct.pack('!L', len(bytes)))
1049
        self._write_func(bytes)
1050
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1051
    def _write_headers(self, headers):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1052
        self._write_prefixed_bencode(headers)
1053
1054
    def _write_structure(self, args):
1055
        self._write_func('s')
3195.3.23 by Andrew Bennetts
Improve the error handling, fixing more tests.
1056
        utf8_args = []
1057
        for arg in args:
1058
            if type(arg) is unicode:
1059
                utf8_args.append(arg.encode('utf8'))
1060
            else:
1061
                utf8_args.append(arg)
1062
        self._write_prefixed_bencode(utf8_args)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1063
1064
    def _write_end(self):
1065
        self._write_func('e')
3441.3.2 by Andrew Bennetts
Simplify buffering logic in _ProtocolThreeEncoder.
1066
        self.flush()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1067
1068
    def _write_prefixed_body(self, bytes):
1069
        self._write_func('b')
1070
        self._write_func(struct.pack('!L', len(bytes)))
1071
        self._write_func(bytes)
1072
1073
    def _write_error_status(self):
1074
        self._write_func('oE')
1075
1076
    def _write_success_status(self):
1077
        self._write_func('oS')
1078
1079
1080
class ProtocolThreeResponder(_ProtocolThreeEncoder):
1081
1082
    def __init__(self, write_func):
1083
        _ProtocolThreeEncoder.__init__(self, write_func)
1084
        self.response_sent = False
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1085
        self._headers = {'Software version': bzrlib.__version__}
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1086
1087
    def send_error(self, exception):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1088
        if self.response_sent:
1089
            raise AssertionError(
1090
                "send_error(%s) called, but response already sent."
1091
                % (exception,))
3245.4.29 by Andrew Bennetts
Add/tidy some comments, remove dud test_errors_are_logged test, add explicit UnknownSmartMethod to v3.
1092
        if isinstance(exception, errors.UnknownSmartMethod):
3245.4.37 by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)).
1093
            failure = request.FailedSmartServerResponse(
1094
                ('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.
1095
            self.send_response(failure)
1096
            return
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1097
        self.response_sent = True
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1098
        self._write_protocol_version()
1099
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1100
        self._write_error_status()
1101
        self._write_structure(('error', str(exception)))
1102
        self._write_end()
1103
1104
    def send_response(self, response):
3245.4.54 by Andrew Bennetts
Improve _StatefulDecoder after John's review.
1105
        if self.response_sent:
1106
            raise AssertionError(
1107
                "send_response(%r) called, but response already sent."
1108
                % (response,))
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1109
        self.response_sent = True
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1110
        self._write_protocol_version()
1111
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1112
        if response.is_successful():
1113
            self._write_success_status()
1114
        else:
1115
            self._write_error_status()
1116
        self._write_structure(response.args)
1117
        if response.body is not None:
1118
            self._write_prefixed_body(response.body)
1119
        elif response.body_stream is not None:
1120
            for chunk in response.body_stream:
1121
                self._write_prefixed_body(chunk)
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.
1122
                self.flush()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1123
        self._write_end()
1124
        
1125
3245.4.26 by Andrew Bennetts
Rename 'setProtoAndMedium' to more accurate 'setProtoAndMediumRequest', add ABCs for Requesters and ResponseHandlers.
1126
class ProtocolThreeRequester(_ProtocolThreeEncoder, Requester):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1127
1128
    def __init__(self, medium_request):
1129
        _ProtocolThreeEncoder.__init__(self, medium_request.accept_bytes)
1130
        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.
1131
        self._headers = {}
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1132
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1133
    def set_headers(self, headers):
3245.4.46 by Andrew Bennetts
Apply John's review comments.
1134
        self._headers = headers.copy()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1135
        
1136
    def call(self, *args):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1137
        if 'hpss' in debug.debug_flags:
1138
            mutter('hpss call:   %s', repr(args)[1:-1])
1139
            base = getattr(self._medium_request._medium, 'base', None)
1140
            if base is not None:
1141
                mutter('             (to %s)', base)
1142
            self._request_start_time = time.time()
1143
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1144
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1145
        self._write_structure(args)
1146
        self._write_end()
1147
        self._medium_request.finished_writing()
1148
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1149
    def call_with_body_bytes(self, args, body):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1150
        """Make a remote call of args with body bytes 'body'.
1151
1152
        After calling this, call read_response_tuple to find the result out.
1153
        """
1154
        if 'hpss' in debug.debug_flags:
1155
            mutter('hpss call w/body: %s (%r...)', repr(args)[1:-1], body[:20])
3245.4.3 by Andrew Bennetts
Fix crash in -Dhpss.
1156
            path = getattr(self._medium_request._medium, '_path', None)
1157
            if path is not None:
1158
                mutter('                  (to %s)', path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1159
            mutter('              %d bytes', len(body))
1160
            self._request_start_time = time.time()
1161
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1162
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1163
        self._write_structure(args)
1164
        self._write_prefixed_body(body)
1165
        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.
1166
        self._medium_request.finished_writing()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1167
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1168
    def call_with_body_readv_array(self, args, body):
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1169
        """Make a remote call with a readv array.
1170
1171
        The body is encoded with one line per readv offset pair. The numbers in
1172
        each pair are separated by a comma, and no trailing \n is emitted.
1173
        """
1174
        if 'hpss' in debug.debug_flags:
1175
            mutter('hpss call w/readv: %s', repr(args)[1:-1])
3245.4.3 by Andrew Bennetts
Fix crash in -Dhpss.
1176
            path = getattr(self._medium_request._medium, '_path', None)
1177
            if path is not None:
1178
                mutter('                  (to %s)', path)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1179
            self._request_start_time = time.time()
1180
        self._write_protocol_version()
3245.4.42 by Andrew Bennetts
Make _SmartClient automatically detect and use the highest protocol version compatible with the server.
1181
        self._write_headers(self._headers)
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1182
        self._write_structure(args)
1183
        readv_bytes = self._serialise_offsets(body)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1184
        if 'hpss' in debug.debug_flags:
1185
            mutter('              %d bytes in readv request', len(readv_bytes))
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1186
        self._write_prefixed_body(readv_bytes)
3245.4.24 by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions.
1187
        self._write_end()
1188
        self._medium_request.finished_writing()
3195.3.17 by Andrew Bennetts
Some tests now passing using protocol 3.
1189