[bitbake-devel] [PATCH 1/1] bitbake: runqueue: catch HashValidateFailure errors in RunQueueExecuteScenequeue
Richard Purdie
richard.purdie at linuxfoundation.org
Wed Aug 27 12:51:38 UTC 2014
On Wed, 2014-08-27 at 19:54 +0800, Hongxu Jia wrote:
> We need to catch the failure of self.rq.hashvalidate which invoked
> in RunQueueExecuteScenequeue, and exit in a normal build.
>
> So we add exception HashValidateFailure for this specific error.
>
> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> ---
> bitbake/lib/bb/runqueue.py | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
> index e13dc57..b48b02b 100644
> --- a/bitbake/lib/bb/runqueue.py
> +++ b/bitbake/lib/bb/runqueue.py
> @@ -1046,7 +1046,15 @@ class RunQueue:
> self.state = runQueueComplete
> else:
> self.start_worker()
> - self.rqexe = RunQueueExecuteScenequeue(self)
> + try:
> + self.rqexe = RunQueueExecuteScenequeue(self)
> + except bb.runqueue.HashValidateFailure:
> + # While HashValidateFailure, we need exit the normal build.
> + logger.error("Hash validatation failed in RunQueueExecuteScenequeue")
> + self.state = runQueueComplete
> + except:
> + logger.error("RunQueueExecuteScenequeue init failed")
> + raise
>
> if self.state in [runQueueSceneRun, runQueueRunning, runQueueCleanUp]:
> self.dm.check(self)
> @@ -1821,7 +1829,10 @@ class RunQueueExecuteScenequeue(RunQueueExecute):
> sq_task.append(task)
> call = self.rq.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
> locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.data }
> - valid = bb.utils.better_eval(call, locs)
> + try:
> + valid = bb.utils.better_eval(call, locs)
> + except:
> + raise bb.runqueue.HashValidateFailure()
How about:
except Exception as e:
logger.error("Hash validation failed in RunQueueExecuteScenequeue %s" % str(e))
raise BBHandledException
Raising the HandledException error should shut down the system
gracefully from there. Adding a custom exception here doesn't help much
other than warning about the exact point of failure as we can do that in
the logger.error message.
I think if you made this:
except Exception as e:
logger.critial("Hash validation failed in RunQueueExecuteScenequeue %s" % str(e))
then we'd not even need to BBHandledException as logger.critical does
that internally but I could be wrong, I'm going from memory.
Cheers,
Richard
> valid_new = stamppresent
> for v in valid:
> @@ -2003,6 +2014,8 @@ class TaskFailure(Exception):
> def __init__(self, x):
> self.args = x
>
> +# Exception raised for a hash validation error
> +class HashValidateFailure(Exception): pass
>
> class runQueueExitWait(bb.event.Event):
> """
More information about the bitbake-devel
mailing list