Merge lp:~spiv/bzr/hpss-log-noise into lp:~bzr/bzr/trunk-old

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

The fix has two simple parts:

 * don't log UnknownSmartMethod exceptions from the request handler, as these
   are not exceptional (or particularly interesting) events for the server.

 * don't bother trying to invoke do_chunk or do_end if there is no live command
   in the request handler (e.g. because the request we are parsing is currently
   for an unknown method). Unknown requests should simply be consumed and
   discarded (after sending an UnknownMethod response, of course).

This fixes bug #338561.

-Andrew.

[Robert Collins (lifeless)]

 review +1

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-07-16 23:20:23 +0000
+++ NEWS	2009-07-17 05:35:14 +0000
@@ -40,6 +40,10 @@
   committed to will no longer corrupt the dirstate. This was caused by an
   bug in the dirstate update_minimal method. (Robert Collins, #395556)
 
+* Requests for unknown methods no longer cause the smart server to log
+  lots of backtraces about ``UnknownSmartMethod``, ``do_chunk`` or
+  ``do_end``.  (Andrew Bennetts, #338561)
+  
 * ``WorkingTree4.unversion`` will no longer fail to unversion ids which
   were present in a parent tree but renamed in the working tree.
   (Robert Collins, #187207)
 
=== modified file 'bzrlib/smart/protocol.py'
--- bzrlib/smart/protocol.py	2009-07-08 07:03:38 +0000
+++ bzrlib/smart/protocol.py	2009-07-17 05:35:14 +0000
@@ -897,7 +897,8 @@
             # We do *not* set self.decoding_failed here.  The message handler
             # has raised an error, but the decoder is still able to parse bytes
             # and determine when this message ends.
-            log_exception_quietly()
+            if not isinstance(exception.exc_value, errors.UnknownSmartMethod):
+                log_exception_quietly()
             self.message_handler.protocol_error(exception.exc_value)
             # The state machine is ready to continue decoding, but the
             # exception has interrupted the loop that runs the state machine.
 
=== modified file 'bzrlib/smart/request.py'
--- bzrlib/smart/request.py	2009-06-15 06:47:14 +0000
+++ bzrlib/smart/request.py	2009-07-17 05:35:14 +0000
@@ -281,6 +281,9 @@
 
     def accept_body(self, bytes):
         """Accept body data."""
+        if self._command is None:
+            # no active command object, so ignore the event.
+            return
         self._run_handler_code(self._command.do_chunk, (bytes,), {})
 
     def end_of_body(self):
@@ -344,6 +347,9 @@
         self._run_handler_code(self._command.execute, args, {})
 
     def end_received(self):
+        if self._command is None:
+            # no active command object, so ignore the event.
+            return
         self._run_handler_code(self._command.do_end, (), {})
 
     def post_body_error_received(self, error_args):