From 604b5d2998ce4d93dee3945cc458feada3602d44 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 31 Jul 2013 11:46:14 -0400 Subject: MultiprocessingCore: timing out GetConfig() calls can cause memory issues --- src/lib/Bcfg2/Server/MultiprocessingCore.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') 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) -- cgit v1.2.3-1-g7c22