<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Hi David,</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Thanks for pointing this out, fixed both patches.</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
<br>
</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Regards,</div>
<div class="elementToProof" style="font-family: Aptos, Aptos_EmbeddedFont, Aptos_MSFontService, Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Xueming</div>
<div id="appendonsend"></div>
<hr style="display:inline-block;width:98%" tabindex="-1">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" style="font-size:11pt" color="#000000"><b>From:</b> David Marchand <david.marchand@redhat.com><br>
<b>Sent:</b> Saturday, July 13, 2024 9:38 PM<br>
<b>To:</b> Xueming Li <xuemingl@nvidia.com>; Luca Boccassi <bluca@debian.org>; Kevin Traynor <ktraynor@redhat.com><br>
<b>Cc:</b> Christian Ehrhardt <christian.ehrhardt@canonical.com>; Bruce Richardson <bruce.richardson@intel.com>; dpdk stable <stable@dpdk.org><br>
<b>Subject:</b> Re: patch 'telemetry: lower log level on socket error' has been queued to stable release 23.11.2</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt;">
<div class="PlainText">Hello LTS maintainers,<br>
<br>
On Fri, Jul 12, 2024 at 1:04 PM Xueming Li <xuemingl@nvidia.com> wrote:<br>
> diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c<br>
> index 88d6410980..551bc92e9d 100644<br>
> --- a/lib/telemetry/telemetry.c<br>
> +++ b/lib/telemetry/telemetry.c<br>
> @@ -381,7 +381,7 @@ client_handler(void *sock_id)<br>
> "{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",<br>
> telemetry_version, getpid(), MAX_OUTPUT_LEN);<br>
> if (write(s, info_str, strlen(info_str)) < 0) {<br>
> - TMTY_LOG(ERR, "Socket write base info to client failed\n");<br>
> + TMTY_LOG(DEBUG, "Socket write base info to client failed");<br>
<br>
Xueming:<br>
<br>
There is a similar issue to what I reported for EAL, for this backport.<br>
<br>
In the main branch, we have TMTY_LOG_LINE() that appends a \n to the<br>
format string.<br>
But TMTY_LOG() in older branches (and as you can see in the context of<br>
this hunk) will not do this.<br>
<br>
<br>
To all LTS maintainers:<br>
<br>
Many libraries have been updated with similar changes (making the \n<br>
added by the log macros) in the main branch.<br>
I introduced new macros every time possible when doing those changes.<br>
The intent was that backports would trigger small conflicts and make<br>
the person backporting raise an eyebrow :-).<br>
<br>
For such small conflicts, some simple rules:<br>
- if the commit from main branch uses <MACRO>_LINE(.*, format, args),<br>
then it becomes <MACRO>(.*, format "\n", args) in the LTS branches,<br>
- if the commit from main branch uses another macro that does not<br>
exist in the LTS branch, there is a good chance a "\n" is missing too,<br>
And in doubt, just look at logs in the same file. This gives a quick<br>
hint in general.<br>
<br>
Note: backporting those macros could be an option too, but this could<br>
be some work as I suspect there will be a lot of conflicts.<br>
<br>
I went and double checked the rest of the 23.11-staging branch and it<br>
seems okay.<br>
<br>
<br>
-- <br>
David Marchand<br>
<br>
</div>
</span></font></div>
</body>
</html>