valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wait for kill in ProcessManager should be greater in main process than in subprocess.

Browse Source 
Or it would kill subprocess before it killed his children.
This commit is contained in:
Dmitry Kuzmenko 2016-09-24 17:10:56 +03:00
parent c9c45a5d79
commit 6ad2998715
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/master.py
View File

@ -533,7 +533,8 @@ class Master(SMaster):
'reload': salt.crypt.Crypticle.generate_key_string 'reload': salt.crypt.Crypticle.generate_key_string
} }
log.info('Creating master process manager') log.info('Creating master process manager')
self.process_manager = salt.utils.process.ProcessManager() # Since there are children having their own ProcessManager we should wait for kill more time.
self.process_manager = salt.utils.process.ProcessManager(wait_for_kill=5)
pub_channels = [] pub_channels = []
log.info('Creating master publisher process') log.info('Creating master publisher process')
for transport, opts in iter_transport_opts(self.opts): for transport, opts in iter_transport_opts(self.opts):
@ -687,7 +688,9 @@ class ReqServer(SignalHandlingMultiprocessingProcess):
except os.error: except os.error:
pass pass
self.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager') # Wait for kill should be less then parent's ProcessManager.
self.process_manager = salt.utils.process.ProcessManager(name='ReqServer_ProcessManager',
wait_for_kill=1)
req_channels = [] req_channels = []
tcp_only = True tcp_only = True