diff mbox

package/fakeroot: fix highly parallel uses

Message ID 20170813214834.24093-1-yann.morin.1998@free.fr
State Accepted
Headers show

Commit Message

Yann E. MORIN Aug. 13, 2017, 9:48 p.m. UTC
Although the issue can very well occur with low-paralle builds, or even
with non-parallel builds, the conditions are so strict that the ocasion
it breaks is extremely rare, to the point where a failure would go
unnoticed.

Fixes #10141.

Reported-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
---
 ...communicate-check-return-status-of-msgrcv.patch | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch

Comments

Arnout Vandecappelle Aug. 15, 2017, 4:18 p.m. UTC | #1
On 13-08-17 23:48, Yann E. MORIN wrote:
> Although the issue can very well occur with low-paralle builds, or even
> with non-parallel builds, the conditions are so strict that the ocasion
> it breaks is extremely rare, to the point where a failure would go
> unnoticed.
> 
> Fixes #10141.
> 
> Reported-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>

 As you noticed on IRC, applied to master, thanks.

 Clayton, for testing you can just use master.

 Regards,
 Arnout
Arnout Vandecappelle Aug. 15, 2017, 4:24 p.m. UTC | #2
On 15-08-17 18:18, Arnout Vandecappelle wrote:
> 
> On 13-08-17 23:48, Yann E. MORIN wrote:
>> Although the issue can very well occur with low-paralle builds, or even
>> with non-parallel builds, the conditions are so strict that the ocasion
>> it breaks is extremely rare, to the point where a failure would go
>> unnoticed.
>>
>> Fixes #10141.
>>
>> Reported-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
>> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>

>  As you noticed on IRC, applied to master, thanks.

 By the way, did you send the patch upstream in the end? I looked in
bugs.debian.org but couldn't find anything...

 Regards,
 Arnout
Yann E. MORIN Aug. 15, 2017, 4:30 p.m. UTC | #3
Arnout, All

On 2017-08-15 18:24 +0200, Arnout Vandecappelle spake thusly:
> On 15-08-17 18:18, Arnout Vandecappelle wrote:
> > 
> > On 13-08-17 23:48, Yann E. MORIN wrote:
> >> Although the issue can very well occur with low-paralle builds, or even
> >> with non-parallel builds, the conditions are so strict that the ocasion
> >> it breaks is extremely rare, to the point where a failure would go
> >> unnoticed.
> >>
> >> Fixes #10141.
> >>
> >> Reported-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
> >> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >> Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
> 
> >  As you noticed on IRC, applied to master, thanks.
> 
>  By the way, did you send the patch upstream in the end? I looked in
> bugs.debian.org but couldn't find anything...

I did not open a bug on b.d.o: as I see it, patches there can linger for
ages without action bein taken, so I don't really see the point... :-(

However, I did send the patch directly to the maintainer, yes, but have
had no feedback so far. But it has only be a day. If he insists so, I'll
open a bug on b.d.o, of course.

Regards,
Yann E. MORIN.
Peter Korsgaard Sept. 6, 2017, 9:07 a.m. UTC | #4
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 > Although the issue can very well occur with low-paralle builds, or even
 > with non-parallel builds, the conditions are so strict that the ocasion
 > it breaks is extremely rare, to the point where a failure would go
 > unnoticed.

 > Fixes #10141.

 > Reported-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
 > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 > Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>

Committed to 2017.02.x, thanks.
diff mbox

Patch

diff --git a/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch b/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
new file mode 100644
index 0000000000..3bb4f9701f
--- /dev/null
+++ b/package/fakeroot/0002-communicate-check-return-status-of-msgrcv.patch
@@ -0,0 +1,46 @@ 
+From a853f21633693f9eefc4949660253a5328d2d2f3 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 13 Aug 2017 23:21:54 +0200
+Subject: [PATCH 1/1] communicate: check return status of msgrcv()
+
+msgrcv can return with -1 to indicate an error condition.
+One such error is to have been interrupted by a signal.
+
+Being interrupted by a signal is very rare in this code, except in a
+very special condition: a highly-parallel (1000 jobs!) mksquashfs on
+a filesystem with extended attributes, where we see errors like (those
+are mksquashfs errors):
+    llistxattr for titi/603/883 failed in read_attrs, because Unknown
+    error 1716527536
+
+See: https://bugs.busybox.net/show_bug.cgi?id=10141
+
+In this case, we just have to retry the call to msgrcv().
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ communicate.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/communicate.c b/communicate.c
+index 293f404..787bb63 100644
+--- a/communicate.c
++++ b/communicate.c
+@@ -553,10 +553,13 @@ void send_get_fakem(struct fake_msg *buf)
+       l=msgrcv(msg_get,
+                (struct my_msgbuf*)buf,
+                sizeof(*buf)-sizeof(buf->mtype),0,0);
+-    while((buf->serial!=serial)||buf->pid!=pid);
++    while(((l==-1)&&(errno==EINTR))||(buf->serial!=serial)||buf->pid!=pid);
+ 
+     semaphore_down();
+ 
++    if(l==-1)
++      buf->xattr.flags_rc=errno;
++
+     /*
+     (nah, may be wrong, due to allignment)
+ 
+-- 
+2.11.0
+