75
65
root_client_path. unused_bytes are any bytes that were not part of a
76
66
protocol version marker.
78
if bytes.startswith(protocol.MESSAGE_VERSION_THREE):
79
protocol_factory = protocol.build_server_protocol_three
80
bytes = bytes[len(protocol.MESSAGE_VERSION_THREE):]
81
elif bytes.startswith(protocol.REQUEST_VERSION_TWO):
82
protocol_factory = protocol.SmartServerRequestProtocolTwo
83
bytes = bytes[len(protocol.REQUEST_VERSION_TWO):]
68
if bytes.startswith(MESSAGE_VERSION_THREE):
69
protocol_factory = build_server_protocol_three
70
bytes = bytes[len(MESSAGE_VERSION_THREE):]
71
elif bytes.startswith(REQUEST_VERSION_TWO):
72
protocol_factory = SmartServerRequestProtocolTwo
73
bytes = bytes[len(REQUEST_VERSION_TWO):]
85
protocol_factory = protocol.SmartServerRequestProtocolOne
75
protocol_factory = SmartServerRequestProtocolOne
86
76
return protocol_factory, bytes
89
def _get_line(read_bytes_func):
90
"""Read bytes using read_bytes_func until a newline byte.
92
This isn't particularly efficient, so should only be used when the
93
expected size of the line is quite short.
95
:returns: a tuple of two strs: (line, excess)
99
while newline_pos == -1:
100
new_bytes = read_bytes_func(1)
103
# Ran out of bytes before receiving a complete line.
105
newline_pos = bytes.find('\n')
106
line = bytes[:newline_pos+1]
107
excess = bytes[newline_pos+1:]
111
class SmartMedium(object):
112
"""Base class for smart protocol media, both client- and server-side."""
115
self._push_back_buffer = None
117
def _push_back(self, bytes):
118
"""Return unused bytes to the medium, because they belong to the next
121
This sets the _push_back_buffer to the given bytes.
123
if self._push_back_buffer is not None:
124
raise AssertionError(
125
"_push_back called when self._push_back_buffer is %r"
126
% (self._push_back_buffer,))
129
self._push_back_buffer = bytes
131
def _get_push_back_buffer(self):
132
if self._push_back_buffer == '':
133
raise AssertionError(
134
'%s._push_back_buffer should never be the empty string, '
135
'which can be confused with EOF' % (self,))
136
bytes = self._push_back_buffer
137
self._push_back_buffer = None
140
def read_bytes(self, desired_count):
141
"""Read some bytes from this medium.
143
:returns: some bytes, possibly more or less than the number requested
144
in 'desired_count' depending on the medium.
146
if self._push_back_buffer is not None:
147
return self._get_push_back_buffer()
148
bytes_to_read = min(desired_count, _MAX_READ_SIZE)
149
return self._read_bytes(bytes_to_read)
151
def _read_bytes(self, count):
152
raise NotImplementedError(self._read_bytes)
155
"""Read bytes from this request's response until a newline byte.
157
This isn't particularly efficient, so should only be used when the
158
expected size of the line is quite short.
160
:returns: a string of bytes ending in a newline (byte 0x0A).
162
line, excess = _get_line(self.read_bytes)
163
self._push_back(excess)
166
def _report_activity(self, bytes, direction):
167
"""Notify that this medium has activity.
169
Implementations should call this from all methods that actually do IO.
170
Be careful that it's not called twice, if one method is implemented on
173
:param bytes: Number of bytes read or written.
174
:param direction: 'read' or 'write' or None.
176
ui.ui_factory.report_transport_activity(self, bytes, direction)
179
class SmartServerStreamMedium(SmartMedium):
79
class SmartServerStreamMedium(object):
180
80
"""Handles smart commands coming over a stream.
182
82
The stream may be a pipe connected to sshd, or a tcp socket, or an
274
216
def _serve_one_request_unguarded(self, protocol):
275
217
while protocol.next_read_size():
276
# We can safely try to read large chunks. If there is less data
277
# than MAX_SOCKET_CHUNK ready, the socket will just return a
278
# short read immediately rather than block.
279
bytes = self.read_bytes(osutils.MAX_SOCKET_CHUNK)
218
bytes = self._get_bytes(4096)
281
220
self.finished = True
283
222
protocol.accept_bytes(bytes)
285
224
self._push_back(protocol.unused_data)
287
def _read_bytes(self, desired_count):
288
return osutils.read_bytes_from_socket(
289
self.socket, self._report_activity)
226
def _get_bytes(self, desired_count):
227
if self._push_back_buffer is not None:
228
return self._get_push_back_buffer()
229
# We ignore the desired_count because on sockets it's more efficient to
231
return self.socket.recv(4096)
291
233
def terminate_due_to_error(self):
292
# TODO: This should log to a server log file, but no such thing
293
# exists yet. Andrew Bennetts 2006-09-29.
294
234
self.socket.close()
295
235
self.finished = True
297
237
def _write_out(self, bytes):
298
tstart = osutils.timer_func()
299
osutils.send_all(self.socket, bytes, self._report_activity)
300
if 'hpss' in debug.debug_flags:
301
thread_id = thread.get_ident()
302
trace.mutter('%12s: [%s] %d bytes to the socket in %.3fs'
303
% ('wrote', thread_id, len(bytes),
304
osutils.timer_func() - tstart))
238
osutils.send_all(self.socket, bytes)
307
241
class SmartServerPipeStreamMedium(SmartServerStreamMedium):
462
395
return self._read_bytes(count)
464
397
def _read_bytes(self, count):
465
"""Helper for SmartClientMediumRequest.read_bytes.
398
"""Helper for read_bytes.
467
400
read_bytes checks the state of the request to determing if bytes
468
401
should be read. After that it hands off to _read_bytes to do the
471
By default this forwards to self._medium.read_bytes because we are
472
operating on the medium's stream.
474
return self._medium.read_bytes(count)
404
raise NotImplementedError(self._read_bytes)
476
406
def read_line(self):
477
line = self._read_line()
478
if not line.endswith('\n'):
479
# end of file encountered reading from server
480
raise errors.ConnectionReset(
481
"Unexpected end of message. Please check connectivity "
482
"and permissions, and report a bug if problems persist.")
407
"""Read bytes from this request's response until a newline byte.
409
This isn't particularly efficient, so should only be used when the
410
expected size of the line is quite short.
412
:returns: a string of bytes ending in a newline (byte 0x0A).
414
# XXX: this duplicates SmartClientRequestProtocolOne._recv_tuple
416
while not line or line[-1] != '\n':
417
new_char = self.read_bytes(1)
420
# end of file encountered reading from server
421
raise errors.ConnectionReset(
422
"please check connectivity and permissions",
423
"(and try -Dhpss if further diagnosis is required)")
485
def _read_line(self):
486
"""Helper for SmartClientMediumRequest.read_line.
488
By default this forwards to self._medium._get_line because we are
489
operating on the medium's stream.
491
return self._medium._get_line()
494
class _DebugCounter(object):
495
"""An object that counts the HPSS calls made to each client medium.
497
When a medium is garbage-collected, or failing that when atexit functions
498
are run, the total number of calls made on that medium are reported via
503
self.counts = weakref.WeakKeyDictionary()
504
client._SmartClient.hooks.install_named_hook(
505
'call', self.increment_call_count, 'hpss call counter')
506
atexit.register(self.flush_all)
508
def track(self, medium):
509
"""Start tracking calls made to a medium.
511
This only keeps a weakref to the medium, so shouldn't affect the
514
medium_repr = repr(medium)
515
# Add this medium to the WeakKeyDictionary
516
self.counts[medium] = dict(count=0, vfs_count=0,
517
medium_repr=medium_repr)
518
# Weakref callbacks are fired in reverse order of their association
519
# with the referenced object. So we add a weakref *after* adding to
520
# the WeakKeyDict so that we can report the value from it before the
521
# entry is removed by the WeakKeyDict's own callback.
522
ref = weakref.ref(medium, self.done)
524
def increment_call_count(self, params):
525
# Increment the count in the WeakKeyDictionary
526
value = self.counts[params.medium]
529
request_method = request.request_handlers.get(params.method)
531
# A method we don't know about doesn't count as a VFS method.
533
if issubclass(request_method, vfs.VfsRequest):
534
value['vfs_count'] += 1
537
value = self.counts[ref]
538
count, vfs_count, medium_repr = (
539
value['count'], value['vfs_count'], value['medium_repr'])
540
# In case this callback is invoked for the same ref twice (by the
541
# weakref callback and by the atexit function), set the call count back
542
# to 0 so this item won't be reported twice.
544
value['vfs_count'] = 0
546
trace.note('HPSS calls: %d (%d vfs) %s',
547
count, vfs_count, medium_repr)
550
for ref in list(self.counts.keys()):
553
_debug_counter = None
556
class SmartClientMedium(SmartMedium):
427
class SmartClientMedium(object):
557
428
"""Smart client is a medium for sending smart protocol requests over."""
559
def __init__(self, base):
560
431
super(SmartClientMedium, self).__init__()
562
432
self._protocol_version_error = None
563
433
self._protocol_version = None
564
434
self._done_hello = False
565
# Be optimistic: we assume the remote end can accept new remote
566
# requests until we get an error saying otherwise.
567
# _remote_version_is_before tracks the bzr version the remote side
568
# can be based on what we've seen so far.
569
self._remote_version_is_before = None
570
# Install debug hook function if debug flag is set.
571
if 'hpss' in debug.debug_flags:
572
global _debug_counter
573
if _debug_counter is None:
574
_debug_counter = _DebugCounter()
575
_debug_counter.track(self)
577
def _is_remote_before(self, version_tuple):
578
"""Is it possible the remote side supports RPCs for a given version?
582
needed_version = (1, 2)
583
if medium._is_remote_before(needed_version):
584
fallback_to_pre_1_2_rpc()
588
except UnknownSmartMethod:
589
medium._remember_remote_is_before(needed_version)
590
fallback_to_pre_1_2_rpc()
592
:seealso: _remember_remote_is_before
594
if self._remote_version_is_before is None:
595
# So far, the remote side seems to support everything
597
return version_tuple >= self._remote_version_is_before
599
def _remember_remote_is_before(self, version_tuple):
600
"""Tell this medium that the remote side is older the given version.
602
:seealso: _is_remote_before
604
if (self._remote_version_is_before is not None and
605
version_tuple > self._remote_version_is_before):
606
# We have been told that the remote side is older than some version
607
# which is newer than a previously supplied older-than version.
608
# This indicates that some smart verb call is not guarded
609
# appropriately (it should simply not have been tried).
611
"_remember_remote_is_before(%r) called, but "
612
"_remember_remote_is_before(%r) was called previously."
613
, version_tuple, self._remote_version_is_before)
614
if 'hpss' in debug.debug_flags:
615
ui.ui_factory.show_warning(
616
"_remember_remote_is_before(%r) called, but "
617
"_remember_remote_is_before(%r) was called previously."
618
% (version_tuple, self._remote_version_is_before))
620
self._remote_version_is_before = version_tuple
622
436
def protocol_version(self):
623
437
"""Find out if 'hello' smart request works."""
711
518
return SmartClientStreamMediumRequest(self)
520
def read_bytes(self, count):
521
return self._read_bytes(count)
714
524
class SmartSimplePipesClientMedium(SmartClientStreamMedium):
715
525
"""A client medium using simple pipes.
717
527
This client does not manage the pipes: it assumes they will always be open.
719
Note that if readable_pipe.read might raise IOError or OSError with errno
720
of EINTR, it must be safe to retry the read. Plain CPython fileobjects
721
(such as used for sys.stdin) are safe.
724
def __init__(self, readable_pipe, writeable_pipe, base):
725
SmartClientStreamMedium.__init__(self, base)
530
def __init__(self, readable_pipe, writeable_pipe):
531
SmartClientStreamMedium.__init__(self)
726
532
self._readable_pipe = readable_pipe
727
533
self._writeable_pipe = writeable_pipe
729
535
def _accept_bytes(self, bytes):
730
536
"""See SmartClientStreamMedium.accept_bytes."""
731
537
self._writeable_pipe.write(bytes)
732
self._report_activity(len(bytes), 'write')
734
539
def _flush(self):
735
540
"""See SmartClientStreamMedium._flush()."""
738
543
def _read_bytes(self, count):
739
544
"""See SmartClientStreamMedium._read_bytes."""
740
bytes = osutils.until_no_eintr(self._readable_pipe.read, count)
741
self._report_activity(len(bytes), 'read')
545
return self._readable_pipe.read(count)
745
548
class SmartSSHClientMedium(SmartClientStreamMedium):
746
549
"""A client medium using SSH."""
748
551
def __init__(self, host, port=None, username=None, password=None,
749
base=None, vendor=None, bzr_remote_path=None):
552
vendor=None, bzr_remote_path=None):
750
553
"""Creates a client that will connect on the first use.
752
555
:param vendor: An optional override for the ssh vendor to use. See
753
556
bzrlib.transport.ssh for details on ssh vendors.
558
SmartClientStreamMedium.__init__(self)
755
559
self._connected = False
756
560
self._host = host
757
561
self._password = password
758
562
self._port = port
759
563
self._username = username
760
# for the benefit of progress making a short description of this
762
self._scheme = 'bzr+ssh'
763
# SmartClientStreamMedium stores the repr of this object in its
764
# _DebugCounter so we have to store all the values used in our repr
765
# method before calling the super init.
766
SmartClientStreamMedium.__init__(self, base)
767
564
self._read_from = None
768
565
self._ssh_connection = None
769
566
self._vendor = vendor
770
567
self._write_to = None
771
568
self._bzr_remote_path = bzr_remote_path
774
if self._port is None:
777
maybe_port = ':%s' % self._port
778
return "%s(%s://%s@%s%s/)" % (
779
self.__class__.__name__,
569
if self._bzr_remote_path is None:
570
symbol_versioning.warn(
571
'bzr_remote_path is required as of bzr 0.92',
572
DeprecationWarning, stacklevel=2)
573
self._bzr_remote_path = os.environ.get('BZR_REMOTE_PATH', 'bzr')
785
575
def _accept_bytes(self, bytes):
786
576
"""See SmartClientStreamMedium.accept_bytes."""
787
577
self._ensure_connection()
788
578
self._write_to.write(bytes)
789
self._report_activity(len(bytes), 'write')
791
580
def disconnect(self):
792
581
"""See SmartClientMedium.disconnect()."""
860
646
"""Connect this medium if not already connected."""
861
647
if self._connected:
649
self._socket = socket.socket()
650
self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
863
651
if self._port is None:
864
652
port = BZR_DEFAULT_PORT
866
654
port = int(self._port)
868
sockaddrs = socket.getaddrinfo(self._host, port, socket.AF_UNSPEC,
869
socket.SOCK_STREAM, 0, 0)
870
except socket.gaierror, (err_num, err_msg):
871
raise errors.ConnectionError("failed to lookup %s:%d: %s" %
872
(self._host, port, err_msg))
873
# Initialize err in case there are no addresses returned:
874
err = socket.error("no address found for %s" % self._host)
875
for (family, socktype, proto, canonname, sockaddr) in sockaddrs:
877
self._socket = socket.socket(family, socktype, proto)
878
self._socket.setsockopt(socket.IPPROTO_TCP,
879
socket.TCP_NODELAY, 1)
880
self._socket.connect(sockaddr)
881
except socket.error, err:
882
if self._socket is not None:
887
if self._socket is None:
656
self._socket.connect((self._host, port))
657
except socket.error, err:
888
658
# socket errors either have a (string) or (errno, string) as their
890
660
if type(err.args) is str:
added
removed
bzrlib/smart/medium.py
