almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Check that the transaction process is still alive

Browse Source 
If it terminates really badly (e.g. with SIGSEGV), it doesn't report any error,
just doesn't put anything to the queue. So instead of just blindly waiting on
the queue forever, check that the process is still alive if we don't get any
message in long time interval.
This commit is contained in:
Vratislav Podzimek 2015-03-24 12:40:46 +01:00
parent 3148a2b215
commit d2c64b1b26
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/pylorax/ltmpl.py
View File

@ -40,6 +40,7 @@ import sys, traceback
import struct import struct
import dnf import dnf
import multiprocessing import multiprocessing
import Queue
class LoraxTemplate(object): class LoraxTemplate(object):
def __init__(self, directories=None): def __init__(self, directories=None):
@ -504,6 +505,25 @@ class LoraxTemplateRunner(object):
else: else:
logger.debug("removepkg %s: no files to remove!", p) logger.debug("removepkg %s: no files to remove!", p)
def get_token_checked(self, process, queue):
"""Try to get token from queue checking that process is still alive"""
try:
# wait at most a minute for the token
(token, msg) = queue.get(timeout=60)
except Queue.Empty:
if process.is_alive():
try:
# process still alive, give it 2 minutes more
(token, msg) = queue.get(timeout=120)
except Queue.Empty:
# waited for 3 minutes and got nothing
raise Exception("The transaction process got stuck somewhere (no message from it in 3 minutes)")
else:
raise Exception("The transaction process has ended abruptly")
return (token, msg)
def run_pkg_transaction(self): def run_pkg_transaction(self):
''' '''
run_pkg_transaction run_pkg_transaction
@ -543,12 +563,14 @@ class LoraxTemplateRunner(object):
msgout = output.LoraxOutput() msgout = output.LoraxOutput()
process = multiprocessing.Process(target=do_transaction, args=(self.dbo, queue)) process = multiprocessing.Process(target=do_transaction, args=(self.dbo, queue))
process.start() process.start()
(token, msg) = queue.get() (token, msg) = self.get_token_checked(process, queue)
while token not in ('post', 'quit'): while token not in ('post', 'quit'):
if token == 'install': if token == 'install':
logging.info("%s", msg) logging.info("%s", msg)
msgout.writeline(msg) msgout.writeline(msg)
(token, msg) = queue.get() (token, msg) = self.get_token_checked(process, queue)
if token == 'quit': if token == 'quit':
logger.error("Transaction failed.") logger.error("Transaction failed.")
raise Exception("Transaction failed") raise Exception("Transaction failed")