* [PATCH] report-error: make it catch ParseError error
@ 2023-04-14 2:08 mingli.yu
2023-04-14 9:31 ` [OE-core] " Luca Ceresoli
0 siblings, 1 reply; 3+ messages in thread
From: mingli.yu @ 2023-04-14 2:08 UTC (permalink / raw)
To: openembedded-core
From: Mingli Yu <mingli.yu@windriver.com>
Make the report-error catch ParseError error as below and then
we can check it directly via error report web.
ParseError at /build/layers/oe-core/meta/recipes-support/curl/curl_7.88.1.bb:32: unparsed line: 'PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
meta/classes/report-error.bbclass | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
index 2b2ad56514..041db44941 100644
--- a/meta/classes/report-error.bbclass
+++ b/meta/classes/report-error.bbclass
@@ -132,6 +132,30 @@ python errorreport_handler () {
errorreport_savedata(e, data, "error-report.txt")
bb.utils.unlockfile(lock)
+ elif isinstance(e, bb.event.ParseError):
+ bb.utils.mkdirhier(logpath)
+ data = {}
+ machine = e.data.getVar("MACHINE")
+ data['machine'] = machine
+ data['build_sys'] = e.data.getVar("BUILD_SYS")
+ data['nativelsb'] = nativelsb()
+ data['distro'] = e.data.getVar("DISTRO")
+ data['target_sys'] = e.data.getVar("TARGET_SYS")
+ data['failures'] = []
+ data['component'] = "parse"
+ data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data))
+ data['bitbake_version'] = e.data.getVar("BB_VERSION")
+ data['layer_version'] = get_layers_branch_rev(e.data)
+ data['local_conf'] = get_conf_data(e, 'local.conf')
+ data['auto_conf'] = get_conf_data(e, 'auto.conf')
+ taskdata={}
+ taskdata['log'] = str(e._msg)
+ taskdata['task'] = str(e._msg)
+ data['failures'].append(taskdata)
+ lock = bb.utils.lockfile(datafile + '.lock')
+ errorreport_savedata(e, data, "error-report.txt")
+ bb.utils.unlockfile(lock)
+
elif isinstance(e, bb.event.BuildCompleted):
lock = bb.utils.lockfile(datafile + '.lock')
jsondata = json.loads(errorreport_getdata(e))
@@ -145,4 +169,4 @@ python errorreport_handler () {
}
addhandler errorreport_handler
-errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider"
+errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider bb.event.ParseError"
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] report-error: make it catch ParseError error
2023-04-14 2:08 [PATCH] report-error: make it catch ParseError error mingli.yu
@ 2023-04-14 9:31 ` Luca Ceresoli
2023-04-19 5:30 ` [PATCH v2] " mingli.yu
0 siblings, 1 reply; 3+ messages in thread
From: Luca Ceresoli @ 2023-04-14 9:31 UTC (permalink / raw)
To: Yu, Mingli; +Cc: openembedded-core
Hi Mingli,
I'm taking this patch for AB testing, however I have a couple remarks
that might turn into a new version of your patch or in a follow-up
cleanup patch, see below.
On Fri, 14 Apr 2023 10:08:38 +0800
"Yu, Mingli" <mingli.yu@eng.windriver.com> wrote:
> From: Mingli Yu <mingli.yu@windriver.com>
>
> Make the report-error catch ParseError error as below and then
> we can check it directly via error report web.
>
> ParseError at /build/layers/oe-core/meta/recipes-support/curl/curl_7.88.1.bb:32: unparsed line: 'PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver'
>
> Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
> ---
> meta/classes/report-error.bbclass | 26 +++++++++++++++++++++++++-
> 1 file changed, 25 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
> index 2b2ad56514..041db44941 100644
> --- a/meta/classes/report-error.bbclass
> +++ b/meta/classes/report-error.bbclass
> @@ -132,6 +132,30 @@ python errorreport_handler () {
> errorreport_savedata(e, data, "error-report.txt")
> bb.utils.unlockfile(lock)
>
> + elif isinstance(e, bb.event.ParseError):
> + bb.utils.mkdirhier(logpath)
> + data = {}
> + machine = e.data.getVar("MACHINE")
> + data['machine'] = machine
These two lines could become one line, removing the 'machine' variable:
data['machine'] = e.data.getVar("MACHINE")
I see you used the same pattern as other if/elif branches in the
surrounding code, so they could also be simplified.
> + data['build_sys'] = e.data.getVar("BUILD_SYS")
> + data['nativelsb'] = nativelsb()
> + data['distro'] = e.data.getVar("DISTRO")
> + data['target_sys'] = e.data.getVar("TARGET_SYS")
> + data['failures'] = []
> + data['component'] = "parse"
> + data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data))
> + data['bitbake_version'] = e.data.getVar("BB_VERSION")
> + data['layer_version'] = get_layers_branch_rev(e.data)
> + data['local_conf'] = get_conf_data(e, 'local.conf')
> + data['auto_conf'] = get_conf_data(e, 'auto.conf')
> + taskdata={}
> + taskdata['log'] = str(e._msg)
> + taskdata['task'] = str(e._msg)
> + data['failures'].append(taskdata)
> + lock = bb.utils.lockfile(datafile + '.lock')
> + errorreport_savedata(e, data, "error-report.txt")
> + bb.utils.unlockfile(lock)
Most of this code is already duplicated in two branches already, and
with your patch there will be three copies. Can the common lines be
moved to a helper function?
Best regards,
Luca
--
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] report-error: make it catch ParseError error
2023-04-14 9:31 ` [OE-core] " Luca Ceresoli
@ 2023-04-19 5:30 ` mingli.yu
0 siblings, 0 replies; 3+ messages in thread
From: mingli.yu @ 2023-04-19 5:30 UTC (permalink / raw)
To: openembedded-core, luca.ceresoli
From: Mingli Yu <mingli.yu@windriver.com>
Make the report-error catch ParseError error as below and then
we can check it directly via error report web.
ParseError at /build/layers/oe-core/meta/recipes-support/curl/curl_7.88.1.bb:32: unparsed line: 'PACKAGECONFIG[ares] = "--enable-ares,--disable-ares,c-ares,,,threaded-resolver'
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
meta/classes/report-error.bbclass | 52 ++++++++++++++++++-------------
1 file changed, 31 insertions(+), 21 deletions(-)
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
index 2b2ad56514..1452513a66 100644
--- a/meta/classes/report-error.bbclass
+++ b/meta/classes/report-error.bbclass
@@ -39,6 +39,19 @@ def get_conf_data(e, filename):
jsonstring=jsonstring + line
return jsonstring
+def get_common_data(e):
+ data = {}
+ data['machine'] = e.data.getVar("MACHINE")
+ data['build_sys'] = e.data.getVar("BUILD_SYS")
+ data['distro'] = e.data.getVar("DISTRO")
+ data['target_sys'] = e.data.getVar("TARGET_SYS")
+ data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data))
+ data['bitbake_version'] = e.data.getVar("BB_VERSION")
+ data['layer_version'] = get_layers_branch_rev(e.data)
+ data['local_conf'] = get_conf_data(e, 'local.conf')
+ data['auto_conf'] = get_conf_data(e, 'auto.conf')
+ return data
+
python errorreport_handler () {
import json
import codecs
@@ -56,19 +69,10 @@ python errorreport_handler () {
if isinstance(e, bb.event.BuildStarted):
bb.utils.mkdirhier(logpath)
data = {}
- machine = e.data.getVar("MACHINE")
- data['machine'] = machine
- data['build_sys'] = e.data.getVar("BUILD_SYS")
+ data = get_common_data(e)
data['nativelsb'] = nativelsb()
- data['distro'] = e.data.getVar("DISTRO")
- data['target_sys'] = e.data.getVar("TARGET_SYS")
data['failures'] = []
data['component'] = " ".join(e.getPkgs())
- data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data))
- data['bitbake_version'] = e.data.getVar("BB_VERSION")
- data['layer_version'] = get_layers_branch_rev(e.data)
- data['local_conf'] = get_conf_data(e, 'local.conf')
- data['auto_conf'] = get_conf_data(e, 'auto.conf')
lock = bb.utils.lockfile(datafile + '.lock')
errorreport_savedata(e, data, "error-report.txt")
bb.utils.unlockfile(lock)
@@ -110,19 +114,10 @@ python errorreport_handler () {
elif isinstance(e, bb.event.NoProvider):
bb.utils.mkdirhier(logpath)
data = {}
- machine = e.data.getVar("MACHINE")
- data['machine'] = machine
- data['build_sys'] = e.data.getVar("BUILD_SYS")
+ data = get_common_data(e)
data['nativelsb'] = nativelsb()
- data['distro'] = e.data.getVar("DISTRO")
- data['target_sys'] = e.data.getVar("TARGET_SYS")
data['failures'] = []
data['component'] = str(e._item)
- data['branch_commit'] = str(oe.buildcfg.detect_branch(e.data)) + ": " + str(oe.buildcfg.detect_revision(e.data))
- data['bitbake_version'] = e.data.getVar("BB_VERSION")
- data['layer_version'] = get_layers_branch_rev(e.data)
- data['local_conf'] = get_conf_data(e, 'local.conf')
- data['auto_conf'] = get_conf_data(e, 'auto.conf')
taskdata={}
taskdata['log'] = str(e)
taskdata['package'] = str(e._item)
@@ -132,6 +127,21 @@ python errorreport_handler () {
errorreport_savedata(e, data, "error-report.txt")
bb.utils.unlockfile(lock)
+ elif isinstance(e, bb.event.ParseError):
+ bb.utils.mkdirhier(logpath)
+ data = {}
+ data = get_common_data(e)
+ data['nativelsb'] = nativelsb()
+ data['failures'] = []
+ data['component'] = "parse"
+ taskdata={}
+ taskdata['log'] = str(e._msg)
+ taskdata['task'] = str(e._msg)
+ data['failures'].append(taskdata)
+ lock = bb.utils.lockfile(datafile + '.lock')
+ errorreport_savedata(e, data, "error-report.txt")
+ bb.utils.unlockfile(lock)
+
elif isinstance(e, bb.event.BuildCompleted):
lock = bb.utils.lockfile(datafile + '.lock')
jsondata = json.loads(errorreport_getdata(e))
@@ -145,4 +155,4 @@ python errorreport_handler () {
}
addhandler errorreport_handler
-errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider"
+errorreport_handler[eventmask] = "bb.event.BuildStarted bb.event.BuildCompleted bb.build.TaskFailed bb.event.NoProvider bb.event.ParseError"
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-19 5:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-14 2:08 [PATCH] report-error: make it catch ParseError error mingli.yu
2023-04-14 9:31 ` [OE-core] " Luca Ceresoli
2023-04-19 5:30 ` [PATCH v2] " mingli.yu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox