From 2bc0e646162956cc5a8c0e9dff73b948ebe5ba5b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 30 May 2019 15:50:38 +0300 Subject: controller: Fix -recursive stats have previously included running jobs. Remove them. --- crocoite/controller.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crocoite/controller.py b/crocoite/controller.py index d84878a..b531491 100644 --- a/crocoite/controller.py +++ b/crocoite/controller.py @@ -400,9 +400,11 @@ class RecursiveController: async def run (self): def log (): + # self.have includes running jobs self.logger.info ('recursing', uuid='5b8498e4-868d-413c-a67e-004516b8452c', - pending=len (self.pending), have=len (self.have), + pending=len (self.pending), + have=len (self.have)-len(self.running), running=len (self.running)) try: @@ -428,7 +430,8 @@ class RecursiveController: except asyncio.CancelledError: self.logger.info ('cancel', uuid='d58154c8-ec27-40f2-ab9e-e25c1b21cd88', - pending=len (self.pending), have=len (self.have), + pending=len (self.pending), + have=len (self.have)-len (self.running), running=len (self.running)) finally: done = await asyncio.gather (*self.running, -- cgit v1.2.3