From 317153a46463fea95c7914f0087374d8e39e6caa Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Mon, 1 Feb 2016 17:06:22 -0500 Subject: [PATCH] Revert "Fix socket descriptor leak" Several commands take much longer to complete after that commit. Therefore, we should revert that specific commit first, and investigate root cause before merging it back. This reverts commit 873214b6e2d8f206ba4a2750e911998c2000745a. Closes-Bug: #1540646 Change-Id: I0eb12f76e93fb1675c78bf60367db534061aceb1 --- magnum/api/hooks.py | 3 --- magnum/common/rpc_service.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/magnum/api/hooks.py b/magnum/api/hooks.py index 52e5d9e3c3..ca907ef2f0 100644 --- a/magnum/api/hooks.py +++ b/magnum/api/hooks.py @@ -81,9 +81,6 @@ class RPCHook(hooks.PecanHook): def before(self, state): state.request.rpcapi = conductor_api.API(context=state.request.context) - def after(self, state): - state.request.rpcapi = None - class NoExceptionTracebackHook(hooks.PecanHook): """Workaround rpc.common: deserialize_remote_exception. diff --git a/magnum/common/rpc_service.py b/magnum/common/rpc_service.py index 0dc8898f9f..152f51b78b 100644 --- a/magnum/common/rpc_service.py +++ b/magnum/common/rpc_service.py @@ -106,9 +106,6 @@ class API(object): serializer=serializer, timeout=timeout) - def __del__(self): - self._client.transport.cleanup() - def _call(self, method, *args, **kwargs): return self._client.call(self._context, method, *args, **kwargs)