diff options
| author |   Ross Burton <ross@burtonini.com> | 2021-05-03 22:35:53 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-04 23:10:51 +0100 |
| commit | 95cc877f3bf5ef2513d7af0ae424f78ec7c24f7d (patch) | |
| tree | f82ece9dcae2ba920027af75defd160bdd4ae78e | |
| parent | 7b7d7b02faedb603d81144a134e80027e4019ab0 (diff) | |
| download | bitbake-95cc877f3bf5ef2513d7af0ae424f78ec7c24f7d.tar.gz | |
bitbake-server: ensure server timeout is a float
bitbake-server is spawned by process.py and passes the arguments it is
given to ProcessServer. There's some type confusion here:
bitbake-server is called with a string representation of the timeout,
which may be None. If the timeout is not set, pass 0 instead of None.
Inside bitbake-server a ProcessServer is created which expects the
timeout to be a float not a string, so always float() the value.
[ YOCTO #14350 ]
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c93ae1f861208f6d39fd15c84fbcd0e2b54331f5)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | bin/bitbake-server | 2 | ||||
| -rw-r--r-- | lib/bb/server/process.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/bitbake-server b/bin/bitbake-server index ffbc7894e..65796be74 100755 --- a/bin/bitbake-server +++ b/bin/bitbake-server @@ -26,7 +26,7 @@ readypipeinfd = int(sys.argv[3]) logfile = sys.argv[4] lockname = sys.argv[5] sockname = sys.argv[6] -timeout = sys.argv[7] +timeout = float(sys.argv[7]) xmlrpcinterface = (sys.argv[8], int(sys.argv[9])) if xmlrpcinterface[0] == "None": xmlrpcinterface = (None, xmlrpcinterface[1]) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index b27b4aefe..3e99bcef8 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -509,7 +509,7 @@ class BitBakeServer(object): os.set_inheritable(self.bitbake_lock.fileno(), True) os.set_inheritable(self.readypipein, True) serverscript = os.path.realpath(os.path.dirname(__file__) + "/../../../bin/bitbake-server") - os.execl(sys.executable, "bitbake-server", serverscript, "decafbad", str(self.bitbake_lock.fileno()), str(self.readypipein), self.logfile, self.bitbake_lock.name, self.sockname, str(self.server_timeout), str(self.xmlrpcinterface[0]), str(self.xmlrpcinterface[1])) + os.execl(sys.executable, "bitbake-server", serverscript, "decafbad", str(self.bitbake_lock.fileno()), str(self.readypipein), self.logfile, self.bitbake_lock.name, self.sockname, str(self.server_timeout or 0), str(self.xmlrpcinterface[0]), str(self.xmlrpcinterface[1])) def execServer(lockfd, readypipeinfd, lockname, sockname, server_timeout, xmlrpcinterface): |