Fixes for toastergui
cover Fixes for toastergui
Hi,
This patchset fixes creation of Target objects for command line builds and couple of usability fixes for toastergui module.
The following changes since commit 5a51fb28dbdfcae8ceb503a5290532dd38aeb09f:
bitbake: prserv/serv: Start/Stop daemon using ip instead of host (2015-09-24 17:55:05 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ed/toaster/target-task
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/target-task
Ed Bartosh (6):
event: add new property to BuildBase class
event: add new parameter to Build* event APIs
toaster: add task to the target_information
toaster: add get_target_objects API
toaster: ignore ReachableStamps event
toaster: use meaningful logging levels
bitbake/lib/bb/cooker.py | 8 ++++---- bitbake/lib/bb/event.py | 18 +++++++++++++----- bitbake/lib/bb/ui/buildinfohelper.py | 20 +++++++++++++++++++- bitbake/lib/bb/ui/toasterui.py | 11 ++++++----- 4 files changed, 42 insertions(+), 15 deletions(-)
Signature · 1 line
2.1.4
PATCH 1/6 event: add new property to BuildBase class
Added 'task' property to the base class of BuildStarted and BuildCompleted classes to store bitbake task if it's specified.
This is done as without task Build* events can't fully represent bitbake build. Task information is needed by UI classes to properly show or process Build* events.
--- bitbake/lib/bb/event.py | 8 ++++++++ 1 file changed, 8 insertions(+)
bitbake/lib/bb/event.py +8 -0
@@ -331,6 +331,7 @@ class BuildBase(Event): def __init__(self, n, p, failures = 0): self._name = n self._pkgs = p + self._task = None Event.__init__(self) self._failures = failures
@@ -352,6 +353,12 @@ class BuildBase(Event): def setCfg(self, cfg): self.data = cfg + def getTask(self): + return self._task + + def setTask(self, task): + self._task = task + def getFailures(self): """ Return the number of failed packages
@@ -361,6 +368,7 @@ class BuildBase(Event): pkgs = property(getPkgs, setPkgs, None, "pkgs property") name = property(getName, setName, None, "name property") cfg = property(getCfg, setCfg, None, "cfg property") + task = property(getTask, setTask, None, "task property")
Signature · 1 line
2.1.4
PATCH 2/6 event: add new parameter to Build* event APIs
In reply to Ed BartoshAdded 't'(task) parameter to BuildStarted and BuildCompleted event APIs. Modified existing calls of above mentioned APIs:
passed bitbake task name as a parameter.
--- bitbake/lib/bb/cooker.py | 8 ++++---- bitbake/lib/bb/event.py | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-)
bitbake/lib/bb/cooker.py +4 -4
@@ -1313,7 +1313,7 @@ class BBCooker: taskdata.add_provider(self.data, self.recipecache, item) buildname = self.data.getVar("BUILDNAME", True) - bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.expanded_data) + bb.event.fire(bb.event.BuildStarted(buildname, [item], task), self.expanded_data) # Execute the runqueue if not task.startswith("do_"):
@@ -1345,7 +1345,7 @@ class BBCooker: return False if not retval: - bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, failures, interrupted), self.expanded_data) + bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, item, task, failures, interrupted), self.expanded_data) self.command.finishAsyncCommand(msg) return False if retval is True:
@@ -1381,7 +1381,7 @@ class BBCooker: return False if not retval: - bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, failures, interrupted), self.data) + bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runq_fnid), buildname, targets, task, failures, interrupted), self.data) self.command.finishAsyncCommand(msg) return False if retval is True:
@@ -1394,7 +1394,7 @@ class BBCooker: taskdata, runlist, fulltargetlist = self.buildTaskData(targets, task, self.configuration.abort) buildname = self.data.getVar("BUILDNAME", False) - bb.event.fire(bb.event.BuildStarted(buildname, fulltargetlist), self.data) + bb.event.fire(bb.event.BuildStarted(buildname, fulltargetlist, task), self.data) rq = bb.runqueue.RunQueue(self, self.data, self.recipecache, taskdata, runlist) if 'universe' in targets:
bitbake/lib/bb/event.py +6 -6
@@ -328,10 +328,10 @@ class StampUpdate(Event): class BuildBase(Event): """Base class for bbmake run events""" - def __init__(self, n, p, failures = 0): + def __init__(self, n, p, t, failures = 0): self._name = n self._pkgs = p - self._task = None + self._task = t Event.__init__(self) self._failures = failures
@@ -376,19 +376,19 @@ class BuildBase(Event): class BuildStarted(BuildBase, OperationStarted): """bbmake build run started""" - def __init__(self, n, p, failures = 0): + def __init__(self, n, p, t, failures = 0): OperationStarted.__init__(self, "Building Started") - BuildBase.__init__(self, n, p, failures) + BuildBase.__init__(self, n, p, t, failures) class BuildCompleted(BuildBase, OperationCompleted): """bbmake build run completed""" - def __init__(self, total, n, p, failures=0, interrupted=0): + def __init__(self, total, n, p, t, failures=0, interrupted=0): if not failures: OperationCompleted.__init__(self, total, "Building Succeeded") else: OperationCompleted.__init__(self, total, "Building Failed") self._interrupted = interrupted - BuildBase.__init__(self, n, p, failures) + BuildBase.__init__(self, n, p, t, failures) class DiskFull(Event): """Disk full case build aborted"""
Signature · 1 line
2.1.4
PATCH 3/6 toaster: add task to the target_information
In reply to Ed BartoshAdded task information from BuildStarted event to the target_information structure.
--- bitbake/lib/bb/ui/buildinfohelper.py | 4 ++++ 1 file changed, 4 insertions(+)
bitbake/lib/bb/ui/buildinfohelper.py +4 -0
@@ -856,6 +856,10 @@ class BuildInfoHelper(object): target_information = {} target_information['targets'] = event._pkgs target_information['build'] = build_obj + task = getattr(event, 'task', '') + if task.startswith('do_'): + task = task[3:] + target_information['task'] = task self.internal_state['targets'] = Target.objects.filter(build=target_information['build'])
Signature · 1 line
2.1.4
PATCH 4/6 toaster: add get_target_objects API
In reply to Ed BartoshTarget objects are created before the build if build is started from UI in build mode. However, in analysis mode Target objects don't exist and need to be created using information from bitbake events.
Added new API call get_target_objects to retrive existing target objects or create them if they don't exist yet.
--- bitbake/lib/bb/ui/buildinfohelper.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
bitbake/lib/bb/ui/buildinfohelper.py +15 -1
@@ -181,6 +181,20 @@ class ORMWrapper(object): return build + @staticmethod + def get_target_objects(target_info): + result = [] + for target in target_info['targets']: + obj, created = Target.objects.get_or_create(build=target_info['build'], + target=target) + if created: + obj.is_image = False + if target_info['task']: + obj.task = target_info['task'] + obj.save() + result.append(obj) + return result + def update_build_object(self, build, errors, warnings, taskfailures): assert isinstance(build,Build) assert isinstance(errors, int)
@@ -861,7 +875,7 @@ class BuildInfoHelper(object): task = task[3:] target_information['task'] = task - self.internal_state['targets'] = Target.objects.filter(build=target_information['build']) + self.internal_state['targets'] = self.orm_wrapper.get_target_objects(target_information) # Save build configuration data = self.server.runCommand(["getAllKeysWithFlags", ["doc", "func"]])[0]
Signature · 1 line
2.1.4
Re: [PATCH 4/6] toaster: add get_target_objects API
Quoted 28 lines · Ed Bartosh
Target objects are created before the build if build is started from UI in build mode. However, in analysis mode Target objects don't exist and need to be created using information from bitbake events.
Added new API call
get_target_objectsto retrive existing target objects or create them if they don't exist yet.Signed-off-by Ed Bartosh <[email protected]>--- bitbake/lib/bb/ui/buildinfohelper.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)bitbake/lib/bb/ui/buildinfohelper.py +5
-0@@ -181,6 +181,20 @@ class ORMWrapper(object): return build + @staticmethod + def get_target_objects(target_info): + result = [] + for target in target_info['targets']: + obj, created = Target.objects.get_or_create(build=target_info['build'],
bitbake/lib/bb/ui/buildinfohelper.py class ORMWrapper(object): · line 199
Quoted 10 lines
bitbake/lib/bb/ui/buildinfohelper.py +9
-0+ target=target) + if created: + obj.is_image = False + if target_info['task']: + obj.task = target_info['task'] + obj.save() + result.append(obj) + return result +
I think we should call this get_or_create_target_objects(), for consistency with existing methods, and also to highlight that the method has potential database writes as a side effect.
Elliot
Quoted 24 lines
bitbake/lib/bb/ui/buildinfohelper.py +0
-0def update_build_object(self, build, errors, warnings, taskfailures):assert
isinstance(build,Build)
assertisinstance(errors, int)bitbake/lib/bb/ui/buildinfohelper.py +1
-1@@ -861,7 +875,7 @@ class BuildInfoHelper(object): task = task[3:] target_information['task'] = task - self.internal_state['targets'] = Target.objects.filter(build=target_information['build']) + self.internal_state['targets'] = self.orm_wrapper.get_target_objects(target_information)# Save build configuration
data = self.server.runCommand(["getAllKeysWithFlags", ["doc",
"func"]])[0]
--
2.1.4--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
Signature · 3 lines
Elliot Smith Software Engineer Intel Open Source Technology Centre
Re: [PATCH 4/6] toaster: add get_target_objects API
Quoted 4 lines · Elliot
I think we should call this
get_or_create_target_objects(), for consistency with existing methods, and also to highlight that the method has potential database writes as a side effect.
yep, agree. I'll send updated patchset for review soon.
--
Regards,
Ed
PATCH 5/6 toaster: ignore ReachableStamps event
In reply to Ed BartoshAdded ReachableStamps event to the list of known events to ignore. This should stop toaster throwing error message:
ERROR: Unknown event: <bb.event.ReachableStamps>
--- bitbake/lib/bb/ui/toasterui.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
bitbake/lib/bb/ui/toasterui.py +2 -1
@@ -308,7 +308,8 @@ def main(server, eventHandler, params ): bb.event.OperationProgress, bb.command.CommandFailed, bb.command.CommandExit, - bb.command.CommandCompleted)): + bb.command.CommandCompleted, + bb.event.ReachableStamps)): continue if isinstance(event, bb.event.DepTreeGenerated):
Signature · 1 line
2.1.4
PATCH 6/6 toaster: use meaningful logging levels
In reply to Ed BartoshChanged logging levels to more appropriate ones.
--- bitbake/lib/bb/ui/toasterui.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
bitbake/lib/bb/ui/toasterui.py +4 -4
@@ -130,14 +130,14 @@ def main(server, eventHandler, params ): if isinstance(event, (bb.build.TaskStarted, bb.build.TaskSucceeded, bb.build.TaskFailedSilent)): buildinfohelper.update_and_store_task(event) - logger.warn("Logfile for task %s", event.logfile) + logger.info("Logfile for task %s", event.logfile) continue if isinstance(event, bb.build.TaskBase): logger.info(event._message) if isinstance(event, bb.event.LogExecTTY): - logger.warn(event.msg) + logger.info(event.msg) continue if isinstance(event, logging.LogRecord):
@@ -316,7 +316,7 @@ def main(server, eventHandler, params ): buildinfohelper.store_dependency_information(event) continue - logger.error("Unknown event: %s", event) + logger.warn("Unknown event: %s", event) return_value += 1 except EnvironmentError as ioerror:
@@ -336,7 +336,7 @@ def main(server, eventHandler, params ): if tb is not None: curr = tb while curr is not None: - logger.warn("Error data dump %s\n%s\n" , traceback.format_tb(curr,1), pformat(curr.tb_frame.f_locals)) + logger.error("Error data dump %s\n%s\n" , traceback.format_tb(curr,1), pformat(curr.tb_frame.f_locals)) curr = curr.tb_next # save them to database, if possible; if it fails, we already logged to console.
Signature · 1 line
2.1.4
Quoted 3 lines · Ed Bartosh
This patchset fixes creation of Target objects for command line builds and couple of usability fixes for toastergui module.
I've tested this in analysis and managed mode, and it seems to be working fine.
The only thing I've noticed is that command line builds (shown in the "Latest builds" and "Project builds" areas) always show the task (e.g. "zlib:build"), while builds started from the UI don't show it (e.g. "zlib").
I think we should either always hide the suffix when it is ":build", or always show it, to be consistent.
Elliot
Quoted 36 lines
The following changes since commit
5a51fb28dbdfcae8ceb503a5290532dd38aeb09f:bitbake: prserv/serv: Start/Stop daemon using ip instead of host
(2015-09-24 17:55:05 +0100)are available in the git repository at:
git://git.yoctoproject.org/poky-contribed/toaster/target-taskhttp://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/target-task
Ed Bartosh (6):
event: add new property to BuildBase class
event: add new parameter to Build* event APIs
toaster: add task to thetarget_information
toaster: addget_target_objectsAPI
toaster: ignore ReachableStamps event
toaster: use meaningful logging levelsbitbake/lib/bb/cooker.py | 8 ++++---- bitbake/lib/bb/event.py | 18 +++++++++++++----- bitbake/lib/bb/ui/buildinfohelper.py | 20 +++++++++++++++++++- bitbake/lib/bb/ui/toasterui.py | 11 ++++++----- 4 files changed, 42 insertions(+), 15 deletions(-)--
2.1.4--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
Signature · 3 lines
Elliot Smith Software Engineer Intel Open Source Technology Centre
Quoted 13 lines · Elliot
On 28 September 2015 at 09:56, Ed Bartosh
<[email protected]> wrote:This patchset fixes creation of Target objects for command line builds and couple of usability fixes for toastergui module.
I've tested this in analysis and managed mode, and it seems to be working fine.
Quoted 8 lines
The only thing I've noticed is that command line builds (shown in the "Latest builds" and "Project builds" areas) always show the task (e.g. "zlib:build"), while builds started from the UI don't show it (e.g. "zlib").
I think we should either always hide the suffix when it is ":build", or always show it, to be consistent.
The 'build' task should not show: I suspect that would create more confusion than clarity.
Cheers
Belén
Quoted 59 lines
Elliot
The following changes since commit
5a51fb28dbdfcae8ceb503a5290532dd38aeb09f:bitbake: prserv/serv: Start/Stop daemon using ip instead of host
(2015-09-24 17:55:05 +0100)are available in the git repository at:
git://git.yoctoproject.org/poky-contrib
<http://git.yoctoproject.org/poky-contrib> ed/toaster/target-taskhttp://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/target
-task
<http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/toaster/targe
t-task>Ed Bartosh (6):
event: add new property to BuildBase class
event: add new parameter to Build* event APIs
toaster: add task to thetarget_information
toaster: addget_target_objectsAPI
toaster: ignore ReachableStamps event
toaster: use meaningful logging levelsbitbake/lib/bb/cooker.py | 8 ++++---- bitbake/lib/bb/event.py | 18 +++++++++++++----- bitbake/lib/bb/ui/buildinfohelper.py | 20 +++++++++++++++++++- bitbake/lib/bb/ui/toasterui.py | 11 ++++++----- 4 files changed, 42 insertions(+), 15 deletions(-)--
2.1.4--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toasterSignature · 3 lines
Elliot Smith Software Engineer Intel Open Source Technology Centre