external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3381 from citusdata/mitm-threadsafe 

mitmscripts/fluent.py: use atomic increment
pull/3261/head
Philip Dubé 2020-01-14 06:32:31 +00:00 committed by GitHub
parent b6975c7dcf 62524d152d
commit 5ec644c691
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/regress/mitmscripts/fluent.py
View File

@ -1,4 +1,5 @@
from collections import defaultdict from collections import defaultdict
from itertools import count
import logging import logging
import re import re
import os import os
@ -282,7 +283,7 @@ def build_handler(spec):
handler = None # the current handler used to process packets handler = None # the current handler used to process packets
command_thread = None # sits on the fifo and waits for new commands to come in command_thread = None # sits on the fifo and waits for new commands to come in
captured_messages = queue.Queue() # where we store messages used for recorder.dump() captured_messages = queue.Queue() # where we store messages used for recorder.dump()
connection_count = 0 # so we can give connections ids in recorder.dump() connection_count = count() # so we can give connections ids in recorder.dump()
def listen_for_commands(fifoname): def listen_for_commands(fifoname):
@ -338,7 +339,7 @@ def listen_for_commands(fifoname):
if recorder.command is 'reset': if recorder.command is 'reset':
result = '' result = ''
connection_count = 0 connection_count = count()
elif recorder.command is not 'dump': elif recorder.command is not 'dump':
# this should never happen # this should never happen
raise Exception('Unrecognized command: {}'.format(recorder.command)) raise Exception('Unrecognized command: {}'.format(recorder.command))
@ -446,8 +447,7 @@ def tcp_message(flow):
# Keep track of all the different connections, assign a unique id to each # Keep track of all the different connections, assign a unique id to each
if not hasattr(flow, 'connection_id'): if not hasattr(flow, 'connection_id'):
flow.connection_id = connection_count flow.connection_id = next(connection_count)
connection_count += 1 # this is not thread safe but I think that's fine
tcp_msg.connection_id = flow.connection_id tcp_msg.connection_id = flow.connection_id
# The first packet the frontend sends shounld be parsed differently # The first packet the frontend sends shounld be parsed differently