diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-31 11:46:14 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-31 15:42:28 -0400 |
| commit | 604b5d2998ce4d93dee3945cc458feada3602d44 (patch) | |
| tree | a5f812a48870335f574d102e6e151d7f325ce566 /src/lib | |
| parent | 04c8ed7554f711c718b1952ea5ea83eac99c85bc (diff) | |
| download | bcfg2-604b5d2998ce4d93dee3945cc458feada3602d44.tar.gz bcfg2-604b5d2998ce4d93dee3945cc458feada3602d44.tar.bz2 bcfg2-604b5d2998ce4d93dee3945cc458feada3602d44.zip | |
MultiprocessingCore: timing out GetConfig() calls can cause memory issues
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Bcfg2/Server/MultiprocessingCore.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/MultiprocessingCore.py b/src/lib/Bcfg2/Server/MultiprocessingCore.py index 882ff4fb8..03394edf9 100644 --- a/src/lib/Bcfg2/Server/MultiprocessingCore.py +++ b/src/lib/Bcfg2/Server/MultiprocessingCore.py @@ -511,9 +511,4 @@ class Core(BuiltinCore): key = ThreadSafePipeDispatcher.genkey(client) pipe = self.pipes[childname] pipe.send(key, ("GetConfig", [client], dict())) - if pipe.poll(key, timeout=self.setup['client_timeout']): - return pipe.recv(key) - else: - self.logger.error("Building configuration for %s on %s timed out" % - (client, childname)) - return None + return pipe.recv(key) |