Treat protocolError and timeoutError for backoff approach

Raise exception to stop advertising for other exceptions

Author: Junchao Wu

tchannel/messages/error.py

@@ -60,6 +60,7 @@ class ErrorMessage(BaseMessage):
         ErrorCode.unexpected: 'unexpected',
         ErrorCode.bad_request: 'bad request',
         ErrorCode.network_error: 'network error',
+        ErrorCode.unhealthy: 'unhealthy error',
         ErrorCode.fatal: 'fatal protocol error'
     }
 

tchannel/tornado/hyperbahn.py

@@ -23,6 +23,9 @@
 import json
 import logging
 
+from ..errors import ProtocolError
+from ..errors import TimeoutError
+
 import tornado.gen
 import tornado.ioloop
 
@@ -86,7 +89,7 @@ def _register(attempt_counter=0):
                 headers={'as': 'json'},
                 attempt_times=1,
             )
-        except Exception as e:
+        except (ProtocolError, TimeoutError) as e:
             attempt_counter += 1
             log.error('Failed to register with Hyperbahn: %s', e)
         else:
@@ -95,14 +98,14 @@ def _register(attempt_counter=0):
                 log.error('Failed to register with Hyperbahn: %s', response)
             else:
                 attempt_counter = 0
-        finally:
-            delay_time = DEFAULT_ERROR_RETRY_TIMES[
-                min(attempt_counter, len(DEFAULT_ERROR_RETRY_TIMES) - 1)
-            ]
-            tornado.ioloop.IOLoop.current().call_later(
-                delay=delay_time,
-                callback=lambda: _register(attempt_counter),
-            )
+
+        delay_time = DEFAULT_ERROR_RETRY_TIMES[
+            min(attempt_counter, len(DEFAULT_ERROR_RETRY_TIMES) - 1)
+        ]
+        tornado.ioloop.IOLoop.current().call_later(
+            delay=delay_time,
+            callback=lambda: _register(attempt_counter),
+        )
 
     return _register()
 

tests/tornado/test_hyperbahn.py

@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-from mock import patch
 import pytest
 
 from tchannel.errors import ConnectionClosedError
@@ -61,6 +60,5 @@ def test_request():
 def test_register():
     channel = TChannel(name='test')
 
-    with patch('tchannel.tornado.hyperbahn.log') as mock_logger:
+    with pytest.raises(ConnectionClosedError):
         yield hyperbahn.advertise(channel, 'foo', ['127.0.0.1:23000'])
-    assert mock_logger.error.called