From c90e4a8058f79dec4bb460a2bb28757bfcc2dcab Mon Sep 17 00:00:00 2001 From: hmiao <739025250@qq.com> Date: Fri, 30 Sep 2022 18:00:57 +0800 Subject: [PATCH 1/2] bug fix: clear runner context when finish --- delta_node/runner/hlr/manager.py | 6 +++--- delta_node/runner/horizontal/manager.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/delta_node/runner/hlr/manager.py b/delta_node/runner/hlr/manager.py index 09eacaf..5d1c336 100644 --- a/delta_node/runner/hlr/manager.py +++ b/delta_node/runner/hlr/manager.py @@ -124,6 +124,9 @@ async def finish(self, success: bool): if success and self.task_entity.enable_verify: await self.verify() + await pool.run_in_io(self.ctx.clear) + await pool.run_in_io(self.client.close) + async def verify(self): # upload data commitment data = self.ctx.get_data() @@ -215,8 +218,5 @@ async def run(self): await self.finish(False) raise - await pool.run_in_io(self.ctx.clear) - await pool.run_in_io(self.client.close) - async def recv_event(self, event: entity.TaskEvent): await self.event_box.recv_event(event) diff --git a/delta_node/runner/horizontal/manager.py b/delta_node/runner/horizontal/manager.py index 2d5677d..9fad235 100644 --- a/delta_node/runner/horizontal/manager.py +++ b/delta_node/runner/horizontal/manager.py @@ -121,6 +121,9 @@ async def finish(self, success: bool): if self.running_fut is not None: self.running_fut.cancel() + await pool.run_in_io(self.ctx.clear) + await pool.run_in_io(self.client.close) + async def run(self): while True: try: @@ -135,8 +138,5 @@ async def run(self): await self.finish(False) raise - await pool.run_in_io(self.ctx.clear) - await pool.run_in_io(self.client.close) - async def recv_event(self, event: entity.TaskEvent): await self.event_box.recv_event(event) From 308eb76c81b94a7d7bd3f3caf3b53d143954f161 Mon Sep 17 00:00:00 2001 From: hmiao <739025250@qq.com> Date: Fri, 30 Sep 2022 18:01:39 +0800 Subject: [PATCH 2/2] update version to 0.8.0 --- requirements.txt | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8e67e6d..1dad2e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ aiosqlite==0.17.0 async_lru==1.0.2 cryptography==3.4.7 -delta-task==0.7.0rc1 +delta-task==0.8.0 fastapi==0.70.1 grpclib==0.4.2 httpx==0.23.0 diff --git a/setup.py b/setup.py index 20fa1ad..65dcb0a 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def run_tests(self): setup( name="delta_node", - version="0.7.0rc2", + version="0.8.0", packages=find_packages(), package_data={"delta_node": ["dataset/examples/*.csv"]}, include_package_data=True, @@ -39,7 +39,7 @@ def run_tests(self): "aiosqlite==0.17.0", "async_lru==1.0.2", "cryptography==3.4.7", - "delta-task==0.7.0rc1", + "delta-task==0.8.0", "fastapi==0.70.1", "grpclib==0.4.2", "httpx==0.23.0",