diff options
author | Ben Shelton <ben.shelton@ni.com> | 2014-10-27 12:27:23 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-28 15:00:39 +0000 |
commit | cf82c6756bad8f7a5edc92ce513e02816b88efb3 (patch) | |
tree | a354f97b4e038ef0af88f60651a9a56926e3143e /bitbake/lib/prserv/serv.py | |
parent | 2794f916ff4f13f71ecd829c2f0a838634d35352 (diff) | |
download | poky-cf82c6756bad8f7a5edc92ce513e02816b88efb3.tar.gz |
bitbake: prserv: don't wait until exit to sync
In the commit 'prserv: Ensure data is committed', the PR server moved to
only committing transactions to the database when the PR server is
stopped. This improves performance, but it means that if the machine
running the PR server loses power unexpectedly or if the PR server
process gets SIGKILL, the uncommitted package revision data is lost.
To fix this issue, sync the database periodically, once per 30 seconds
by default, if it has been marked as dirty. To be safe, continue to
sync the database at exit regardless of its status.
(Bitbake rev: 424df64f2e9679043f0ce2b4f7dfc59c3d404304)
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/prserv/serv.py')
-rw-r--r-- | bitbake/lib/prserv/serv.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/prserv/serv.py b/bitbake/lib/prserv/serv.py index 1b08d59130..6ab10972e7 100644 --- a/bitbake/lib/prserv/serv.py +++ b/bitbake/lib/prserv/serv.py | |||
@@ -122,6 +122,10 @@ class PRServer(SimpleXMLRPCServer): | |||
122 | def work_forever(self,): | 122 | def work_forever(self,): |
123 | self.quit = False | 123 | self.quit = False |
124 | self.timeout = 0.5 | 124 | self.timeout = 0.5 |
125 | iter_count = 1 | ||
126 | # With 60 iterations between syncs and a 0.5 second timeout between | ||
127 | # iterations, this will sync if dirty every ~30 seconds. | ||
128 | iterations_between_sync = 60 | ||
125 | 129 | ||
126 | logger.info("Started PRServer with DBfile: %s, IP: %s, PORT: %s, PID: %s" % | 130 | logger.info("Started PRServer with DBfile: %s, IP: %s, PORT: %s, PID: %s" % |
127 | (self.dbfile, self.host, self.port, str(os.getpid()))) | 131 | (self.dbfile, self.host, self.port, str(os.getpid()))) |
@@ -129,6 +133,9 @@ class PRServer(SimpleXMLRPCServer): | |||
129 | self.handlerthread.start() | 133 | self.handlerthread.start() |
130 | while not self.quit: | 134 | while not self.quit: |
131 | self.handle_request() | 135 | self.handle_request() |
136 | iter_count = (iter_count + 1) % iterations_between_sync | ||
137 | if iter_count == 0: | ||
138 | self.table.sync_if_dirty() | ||
132 | 139 | ||
133 | self.table.sync() | 140 | self.table.sync() |
134 | logger.info("PRServer: stopping...") | 141 | logger.info("PRServer: stopping...") |