Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2683)

Unified Diff: appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py

Issue 2593863002: Fix evil retry loop on poll errors. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py
diff --git a/appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py b/appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py
index 3ef861d0017d73dc99af579aa4cbc7c56ac65bf7..7393c415d9ade7b74117a7e3a9054f27eb1715fe 100644
--- a/appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py
+++ b/appengine/swarming/swarming_bot/bot_code/remote_client_grpc.py
@@ -12,6 +12,7 @@ import grpc
import google.protobuf.json_format
from proto_bot import swarming_bot_pb2
from remote_client_errors import InternalError
+from remote_client_errors import PollError
# How long to wait for a response from the server. Keeping the same as
@@ -112,7 +113,7 @@ class RemoteClientGrpc(object):
def poll(self, attributes):
request = swarming_bot_pb2.PollRequest()
self._attributes_json_to_proto(attributes, request.attributes)
- # TODO(aludwin): gRPC-specific exception handling
+ # TODO(aludwin): gRPC-specific exception handling (raise PollError).
response = self._stub.Poll(request, timeout=NET_CONNECTION_TIMEOUT_SEC)
if response.cmd == swarming_bot_pb2.PollResponse.UPDATE:
@@ -166,7 +167,7 @@ class RemoteClientGrpc(object):
self._log_is_asleep = False
return 'run', manifest
- raise ValueError('Unknown command in response: %s' % response)
+ raise PollError('Unknown command in response: %s' % response)
def get_bot_code(self, new_zip_fn, bot_version, _bot_id):
# TODO(aludwin): exception handling, pass bot_id

Powered by Google App Engine
This is Rietveld 408576698