Repository: cloudstack Updated Branches: refs/heads/master ffeca8bbd -> 93c64cd7f
CLOUDSTACK-7224: Fixed marvin code for async jobs Signed-off-by: Santhosh Edukulla <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93c64cd7 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93c64cd7 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93c64cd7 Branch: refs/heads/master Commit: 93c64cd7f210f4a666611b1e8b71f8cf7edcc8eb Parents: ffeca8b Author: Gaurav Aradhye <[email protected]> Authored: Fri Aug 1 08:48:40 2014 -0700 Committer: Santhosh Edukulla <[email protected]> Committed: Fri Aug 1 22:51:08 2014 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/asyncJobMgr.py | 5 ----- tools/marvin/marvin/cloudstackConnection.py | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c64cd7/tools/marvin/marvin/asyncJobMgr.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/asyncJobMgr.py b/tools/marvin/marvin/asyncJobMgr.py index 00e8c19..42fabad 100644 --- a/tools/marvin/marvin/asyncJobMgr.py +++ b/tools/marvin/marvin/asyncJobMgr.py @@ -127,9 +127,6 @@ class workThread(threading.Thread): self.output.put(jobstatus) self.inqueue.task_done() - '''release the resource''' - self.connection.close() - class jobThread(threading.Thread): @@ -143,8 +140,6 @@ class jobThread(threading.Thread): job = self.inqueue.get() try: job.run() - '''release the api connection''' - job.apiClient.connection.close() except: pass http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c64cd7/tools/marvin/marvin/cloudstackConnection.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index a8c35f6..aa7b18f 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -340,8 +340,7 @@ class CSConnection(object): ''' 1. Verify the Inputs Provided ''' - if (cmd is None or cmd == '')or \ - (response_type is None or response_type == ''): + if (cmd is None or cmd == ''): self.logger.exception("marvinRequest : Invalid Command Input") raise InvalidParameterException("Invalid Parameter")
