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