paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 08:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

populate_db: Fix duplicate test data when run multithreaded.

Browse Source 
The previous implementation resulted in each of the 10 threads using
the same random seed and thus same messages.

Fixes #6028.
This commit is contained in:
Tim Abbott
2017-08-05 11:10:11 -07:00
parent 4bf8ac2498
commit 27b79e7189
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
zilencer/management/commands/populate_db.py
View File

@@ -240,13 +240,16 @@ class Command(BaseCommand):
personals_pairs = [random.sample(user_profiles_ids, 2) personals_pairs = [random.sample(user_profiles_ids, 2)
for i in range(options["num_personals"])] for i in range(options["num_personals"])]
# Generate a new set of test data.
create_test_data()
threads = options["threads"] threads = options["threads"]
jobs = [] # type: List[Tuple[int, List[List[int]], Dict[str, Any], Callable[[str], int]]] jobs = [] # type: List[Tuple[int, List[List[int]], Dict[str, Any], Callable[[str], int], int]]
for i in range(threads): for i in range(threads):
count = options["num_messages"] // threads count = options["num_messages"] // threads
if i < options["num_messages"] % threads: if i < options["num_messages"] % threads:
count += 1 count += 1
jobs.append((count, personals_pairs, options, self.stdout.write)) jobs.append((count, personals_pairs, options, self.stdout.write, random.randint(0, 10**10)))
for job in jobs: for job in jobs:
send_messages(job) send_messages(job)
@@ -402,15 +405,14 @@ def get_recipient_by_id(rid):
# - multiple messages per subject # - multiple messages per subject
# - both single and multi-line content # - both single and multi-line content
def send_messages(data): def send_messages(data):
# type: (Tuple[int, Sequence[Sequence[int]], Mapping[str, Any], Callable[[str], Any]]) -> int # type: (Tuple[int, Sequence[Sequence[int]], Mapping[str, Any], Callable[[str], Any], int]) -> int
(tot_messages, personals_pairs, options, output) = data (tot_messages, personals_pairs, options, output, random_seed) = data
random.seed(os.getpid()) print(random_seed)
random.seed(random_seed)
# Generate a new set of test data.
create_test_data()
with open("var/test_messages.json", "r") as infile: with open("var/test_messages.json", "r") as infile:
dialog = ujson.load(infile) dialog = ujson.load(infile)
random.shuffle(dialog)
texts = itertools.cycle(dialog) texts = itertools.cycle(dialog)
recipient_streams = [klass.id for klass in recipient_streams = [klass.id for klass in