p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Agent: Join on pba_thread to ensure it completes before simulation ends

This commit is contained in:
Mike Salvatore 2021-12-03 08:06:46 -05:00
parent fc88fb948c
commit 7516505623
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monkey/infection_monkey/master/automated_master.py
View File

@ -99,7 +99,9 @@ class AutomatedMaster(IMaster):
pba_thread.start() pba_thread.start()
# Future stages of the simulation require the output of the system info collectors. Nothing # Future stages of the simulation require the output of the system info collectors. Nothing
# requires the output of PBAs, so we don't need to join on that thread. # requires the output of PBAs, so we don't need to join on that thread here. We will join on
# the PBA thread later in this function to prevent the simulation from ending while PBAs are
# still running.
system_info_collector_thread.join() system_info_collector_thread.join()
if self._can_propagate(): if self._can_propagate():
@ -115,6 +117,8 @@ class AutomatedMaster(IMaster):
payload_thread.start() payload_thread.start()
payload_thread.join() payload_thread.join()
pba_thread.join()
# TODO: This code is just for testing in development. Remove when # TODO: This code is just for testing in development. Remove when
# implementation of AutomatedMaster is finished. # implementation of AutomatedMaster is finished.
while True: while True: