Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add retry in zmqrpc #973

Merged
merged 1 commit into from
Mar 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions locust/rpc/zmqrpc.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
import zmq.green as zmq

from .protocol import Message

from locust.util.exception_handler import retry

class BaseSocket(object):
def __init__(self, sock_type):
context = zmq.Context()
self.socket = context.socket(sock_type)


@retry()
def send(self, msg):
self.socket.send(msg.serialize())

@retry()
def send_to_client(self, msg):
self.socket.send_multipart([msg.node_id.encode(), msg.serialize()])

@retry()
def recv(self):
data = self.socket.recv()
msg = Message.unserialize(data)
return msg

@retry()
def recv_from_client(self):
data = self.socket.recv_multipart()
addr = data[0]
Expand Down
23 changes: 23 additions & 0 deletions locust/util/exception_handler.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import time
import logging

logger = logging.getLogger(__name__)

def retry(delays=(1, 3, 5),
exception=Exception):
def decorator(function):
def wrapper(*args, **kwargs):
cnt = 0
for delay in delays + (None,):
try:
return function(*args, **kwargs)
except exception:
if delay is None:
logger.info("Retry failed after %d times." % ( cnt ) )
raise
else:
cnt += 1
logger.info("Exception found on retry %d: -- retry after %ds" % ( cnt, delay ) )
time.sleep(delay)
return wrapper
return decorator