openstack/oslo.messaging
Code Issues Proposed changes

[simulator] Fix a message length generator usage

Browse Source 
Do initialization of the generator only for rpc/notify clients.
No needs to load messages_length.yaml and calculate distribution for servers.

Change-Id: Ib1ac30181bec20eacf6d29ccd5f76c0b6b1e96f8
This commit is contained in:
Kirill Bespalov 2016-10-18 14:34:14 +03:00
parent 874a69b0cd
commit 6eb57b4d5f
1 changed files with 2 additions and 4 deletions

6
tools/simulator.py

@ -38,7 +38,6 @@ from oslo_messaging import rpc # noqa
from oslo_utils import timeutils from oslo_utils import timeutils
LOG = logging.getLogger() LOG = logging.getLogger()
RANDOM_GENERATOR = None
CURRENT_PID = None CURRENT_PID = None
CURRENT_HOST = None CURRENT_HOST = None
CLIENTS = [] CLIENTS = []
@ -471,9 +470,9 @@ def generate_messages(messages_count):
if messages_count > MESSAGES_LIMIT: if messages_count > MESSAGES_LIMIT:
messages_count = MESSAGES_LIMIT messages_count = MESSAGES_LIMIT
LOG.info("Generating %d random messages", messages_count) LOG.info("Generating %d random messages", messages_count)
generator = init_random_generator()
for i in six.moves.range(messages_count): for i in six.moves.range(messages_count):
length = RANDOM_GENERATOR() length = generator()
msg = ''.join(random.choice( msg = ''.join(random.choice(
string.ascii_lowercase) for x in six.moves.range(length)) string.ascii_lowercase) for x in six.moves.range(length))
MESSAGES.append(msg) MESSAGES.append(msg)
@ -832,7 +831,6 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
RANDOM_GENERATOR = init_random_generator()
CURRENT_PID = os.getpid() CURRENT_PID = os.getpid()
CURRENT_HOST = socket.gethostname() CURRENT_HOST = socket.gethostname()
main() main()