rpm: add a patch to help with Docker performance issues

(From OE-Core rev: 6f1822e5f1eaafd8bc46e999de730c1fcca77f3a)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2018-02-01 20:01:53 +02:00
committed by Richard Purdie
parent 4a6b872bd4
commit b7b552bd06
2 changed files with 50 additions and 0 deletions

View File

@@ -0,0 +1,49 @@
From 982e47df7b82c5ffe3c414cf5641f08dba0f0e64 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 26 Jan 2018 16:32:04 +0200
Subject: [PATCH] Revert "Set FD_CLOEXEC on opened files before exec from lua
script is called"
This reverts commit 7a7c31f551ff167f8718aea6d5048f6288d60205.
The reason is that when _SC_OPEN_MAX is much higher than the usual 1024
(for example inside docker), the performance drops sharply.
Upstream has been notified:
https://bugzilla.redhat.com/show_bug.cgi?id=1537564
Upstream-Status: Inappropriate [upstream needs to come up with a better fix]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
luaext/lposix.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/luaext/lposix.c b/luaext/lposix.c
index 0a7c26c71..c578c5a11 100644
--- a/luaext/lposix.c
+++ b/luaext/lposix.c
@@ -335,22 +335,10 @@ static int Pexec(lua_State *L) /** exec(path,[args]) */
const char *path = luaL_checkstring(L, 1);
int i,n=lua_gettop(L);
char **argv;
- int flag, fdno, open_max;
if (!have_forked)
return luaL_error(L, "exec not permitted in this context");
- open_max = sysconf(_SC_OPEN_MAX);
- if (open_max == -1) {
- open_max = 1024;
- }
- for (fdno = 3; fdno < open_max; fdno++) {
- flag = fcntl(fdno, F_GETFD);
- if (flag == -1 || (flag & FD_CLOEXEC))
- continue;
- fcntl(fdno, F_SETFD, FD_CLOEXEC);
- }
-
argv = malloc((n+1)*sizeof(char*));
if (argv==NULL) return luaL_error(L,"not enough memory");
argv[0] = (char*)path;
--
2.15.1

View File

@@ -39,6 +39,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \
file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \
file://0001-perl-disable-auto-reqs.patch \
file://0001-Revert-Set-FD_CLOEXEC-on-opened-files-before-exec-fr.patch \
"
PE = "1"