92
86
should only be used for testing purposes; normally this is
93
87
determined from the medium.
95
super(RemoteTransport, self).__init__(
96
url, _from_transport=_from_transport)
89
super(RemoteTransport, self).__init__(url,
90
_from_transport=_from_transport)
98
92
# The medium is the connection, except when we need to share it with
99
93
# other objects (RemoteBzrDir, RemoteRepository etc). In these cases
100
94
# what we want to share is really the shared connection.
102
if (_from_transport is not None
103
and isinstance(_from_transport, RemoteTransport)):
104
_client = _from_transport._client
105
elif _from_transport is None:
96
if _from_transport is None:
106
97
# If no _from_transport is specified, we need to intialize the
108
99
credentials = None
168
152
def get_smart_medium(self):
169
153
return self._get_connection()
155
@deprecated_method(one_four)
156
def get_shared_medium(self):
157
return self._get_shared_connection()
171
159
def _remote_path(self, relpath):
172
160
"""Returns the Unicode version of the absolute path for relpath."""
173
161
return self._combine_paths(self._path, relpath)
175
163
def _call(self, method, *args):
176
resp = self._call2(method, *args)
177
self._ensure_ok(resp)
165
resp = self._call2(method, *args)
166
except errors.ErrorFromSmartServer, err:
167
self._translate_error(err.error_tuple)
168
self._translate_error(resp)
179
170
def _call2(self, method, *args):
180
171
"""Call a method on the remote server."""
182
173
return self._client.call(method, *args)
183
174
except errors.ErrorFromSmartServer, err:
184
# The first argument, if present, is always a path.
186
context = {'relpath': args[0]}
189
self._translate_error(err, **context)
175
self._translate_error(err.error_tuple)
191
177
def _call_with_body_bytes(self, method, args, body):
192
178
"""Call a method on the remote server with body bytes."""
194
180
return self._client.call_with_body_bytes(method, args, body)
195
181
except errors.ErrorFromSmartServer, err:
196
# The first argument, if present, is always a path.
198
context = {'relpath': args[0]}
201
self._translate_error(err, **context)
182
self._translate_error(err.error_tuple)
203
184
def has(self, relpath):
204
185
"""Indicate whether a remote file of the given name exists or not.
330
312
offsets = list(offsets)
332
314
sorted_offsets = sorted(offsets)
315
# turn the list of offsets into a stack
316
offset_stack = iter(offsets)
317
cur_offset_and_size = offset_stack.next()
333
318
coalesced = list(self._coalesce_offsets(sorted_offsets,
334
319
limit=self._max_readv_combine,
335
fudge_factor=self._bytes_to_read_before_seek,
336
max_size=self._max_readv_bytes))
338
# now that we've coallesced things, avoid making enormous requests
343
if c.length + cur_len > self._max_readv_bytes:
344
requests.append(cur_request)
348
cur_request.append(c)
351
requests.append(cur_request)
352
if 'hpss' in debug.debug_flags:
353
trace.mutter('%s.readv %s offsets => %s coalesced'
354
' => %s requests (%s)',
355
self.__class__.__name__, len(offsets), len(coalesced),
356
len(requests), sum(map(len, requests)))
320
fudge_factor=self._bytes_to_read_before_seek))
323
result = self._client.call_with_body_readv_array(
324
('readv', self._remote_path(relpath),),
325
[(c.start, c.length) for c in coalesced])
326
resp, response_handler = result
327
except errors.ErrorFromSmartServer, err:
328
self._translate_error(err.error_tuple)
330
if resp[0] != 'readv':
331
# This should raise an exception
332
response_handler.cancel_read_body()
333
raise errors.UnexpectedSmartServerResponse(resp)
335
# FIXME: this should know how many bytes are needed, for clarity.
336
data = response_handler.read_body_bytes()
357
337
# Cache the results, but only until they have been fulfilled
359
# turn the list of offsets into a single stack to iterate
360
offset_stack = iter(offsets)
361
# using a list so it can be modified when passing down and coming back
362
next_offset = [offset_stack.next()]
363
for cur_request in requests:
365
result = self._client.call_with_body_readv_array(
366
('readv', self._remote_path(relpath),),
367
[(c.start, c.length) for c in cur_request])
368
resp, response_handler = result
369
except errors.ErrorFromSmartServer, err:
370
self._translate_error(err, relpath)
372
if resp[0] != 'readv':
373
# This should raise an exception
374
response_handler.cancel_read_body()
375
raise errors.UnexpectedSmartServerResponse(resp)
377
for res in self._handle_response(offset_stack, cur_request,
383
def _handle_response(self, offset_stack, coalesced, response_handler,
384
data_map, next_offset):
385
cur_offset_and_size = next_offset[0]
386
# FIXME: this should know how many bytes are needed, for clarity.
387
data = response_handler.read_body_bytes()
389
339
for c_offset in coalesced:
390
340
if len(data) < c_offset.length:
391
341
raise errors.ShortReadvError(relpath, c_offset.start,
392
342
c_offset.length, actual=len(data))
393
343
for suboffset, subsize in c_offset.ranges:
394
344
key = (c_offset.start+suboffset, subsize)
395
this_data = data[data_offset+suboffset:
396
data_offset+suboffset+subsize]
397
# Special case when the data is in-order, rather than packing
398
# into a map and then back out again. Benchmarking shows that
399
# this has 100% hit rate, but leave in the data_map work just
401
# TODO: Could we get away with using buffer() to avoid the
402
# memory copy? Callers would need to realize they may
403
# not have a real string.
404
if key == cur_offset_and_size:
405
yield cur_offset_and_size[0], this_data
406
cur_offset_and_size = next_offset[0] = offset_stack.next()
408
data_map[key] = this_data
409
data_offset += c_offset.length
345
data_map[key] = data[suboffset:suboffset+subsize]
346
data = data[c_offset.length:]
411
348
# Now that we've read some data, see if we can yield anything back
412
349
while cur_offset_and_size in data_map:
413
350
this_data = data_map.pop(cur_offset_and_size)
414
351
yield cur_offset_and_size[0], this_data
415
cur_offset_and_size = next_offset[0] = offset_stack.next()
352
cur_offset_and_size = offset_stack.next()
417
354
def rename(self, rel_from, rel_to):
418
355
self._call('rename',
427
364
def rmdir(self, relpath):
428
365
resp = self._call('rmdir', self._remote_path(relpath))
430
def _ensure_ok(self, resp):
432
raise errors.UnexpectedSmartServerResponse(resp)
434
def _translate_error(self, err, relpath=None):
435
remote._translate_error(err, path=relpath)
367
def _translate_error(self, resp, orig_path=None):
368
"""Raise an exception from a response"""
375
elif what == 'NoSuchFile':
376
if orig_path is not None:
377
error_path = orig_path
380
raise errors.NoSuchFile(error_path)
381
elif what == 'error':
382
raise errors.SmartProtocolError(unicode(resp[1]))
383
elif what == 'FileExists':
384
raise errors.FileExists(resp[1])
385
elif what == 'DirectoryNotEmpty':
386
raise errors.DirectoryNotEmpty(resp[1])
387
elif what == 'ShortReadvError':
388
raise errors.ShortReadvError(resp[1], int(resp[2]),
389
int(resp[3]), int(resp[4]))
390
elif what in ('UnicodeEncodeError', 'UnicodeDecodeError'):
391
encoding = str(resp[1]) # encoding must always be a string
395
reason = str(resp[5]) # reason must always be a string
396
if val.startswith('u:'):
397
val = val[2:].decode('utf-8')
398
elif val.startswith('s:'):
399
val = val[2:].decode('base64')
400
if what == 'UnicodeDecodeError':
401
raise UnicodeDecodeError(encoding, val, start, end, reason)
402
elif what == 'UnicodeEncodeError':
403
raise UnicodeEncodeError(encoding, val, start, end, reason)
404
elif what == "ReadOnlyError":
405
raise errors.TransportNotPossible('readonly transport')
406
elif what == "ReadError":
407
if orig_path is not None:
408
error_path = orig_path
411
raise errors.ReadError(error_path)
412
elif what == "PermissionDenied":
413
if orig_path is not None:
414
error_path = orig_path
417
raise errors.PermissionDenied(error_path)
419
raise errors.SmartProtocolError('unexpected smart server error: %r' % (resp,))
437
421
def disconnect(self):
438
422
self.get_smart_medium().disconnect()
424
def delete_tree(self, relpath):
425
raise errors.TransportNotPossible('readonly transport')
440
427
def stat(self, relpath):
441
428
resp = self._call2('stat', self._remote_path(relpath))
442
429
if resp[0] == 'stat':
443
430
return _SmartStat(int(resp[1]), int(resp[2], 8))
444
raise errors.UnexpectedSmartServerResponse(resp)
432
self._translate_error(resp)
446
434
## def lock_read(self, relpath):
447
435
## """Lock the given file for shared (read) access.
510
500
def _build_medium(self):
501
# ssh will prompt the user for a password if needed and if none is
502
# provided but it will not give it back, so no credentials can be
511
504
location_config = config.LocationConfig(self.base)
512
505
bzr_remote_path = location_config.get_bzr_remote_path()
515
auth = config.AuthenticationConfig()
516
user = auth.get_user('ssh', self._host, self._port)
517
506
client_medium = medium.SmartSSHClientMedium(self._host, self._port,
518
user, self._password, self.base,
507
self._user, self._password, self.base,
519
508
bzr_remote_path=bzr_remote_path)
520
return client_medium, (user, self._password)
509
return client_medium, None
523
512
class RemoteHTTPTransport(RemoteTransport):
524
513
"""Just a way to connect between a bzr+http:// url and http://.
526
515
This connection operates slightly differently than the RemoteSSHTransport.
527
516
It uses a plain http:// transport underneath, which defines what remote
528
517
.bzr/smart URL we are connected to. From there, all paths that are sent are
577
566
_from_transport=self,
578
567
http_transport=self._http_transport)
580
def _redirected_to(self, source, target):
581
"""See transport._redirected_to"""
582
redirected = self._http_transport._redirected_to(source, target)
583
if (redirected is not None
584
and isinstance(redirected, type(self._http_transport))):
585
return RemoteHTTPTransport('bzr+' + redirected.external_url(),
586
http_transport=redirected)
588
# Either None or a transport for a different protocol
592
class HintingSSHTransport(transport.Transport):
593
"""Simple transport that handles ssh:// and points out bzr+ssh://."""
595
def __init__(self, url):
596
raise errors.UnsupportedProtocol(url,
597
'bzr supports bzr+ssh to operate over ssh, use "bzr+%s".' % url)
600
570
def get_test_permutations():
601
571
"""Return (transport, server) permutations for testing."""
602
572
### We may need a little more test framework support to construct an
603
573
### appropriate RemoteTransport in the future.
604
from bzrlib.tests import test_server
605
return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]
574
from bzrlib.smart import server
575
return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]
added
removed
bzrlib/transport/remote.py
