From aba1518f487b4b65861eb30f553c4edb72ad972e Mon Sep 17 00:00:00 2001 From: Gulsum Atici Date: Mon, 15 May 2023 11:55:13 +0300 Subject: [PATCH] Fix VimAdminThread run method The run_coroutine_threadsafe() function is used to schedule a coroutine object from a different thread and returns a concurrent.futures.Future. run_coroutine_threadsafe is unnecessary to run the main task and replaced with asyncio.run(). Change-Id: I8ea31828a9798140d596165443bdf26659b4eef8 Signed-off-by: Gulsum Atici --- NG-RO/osm_ng_ro/vim_admin.py | 8 +++---- ...minthread_run_method-7bd0f7c32e932645.yaml | 22 +++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/fix_vim_adminthread_run_method-7bd0f7c32e932645.yaml diff --git a/NG-RO/osm_ng_ro/vim_admin.py b/NG-RO/osm_ng_ro/vim_admin.py index 21e62817..e34cce4a 100644 --- a/NG-RO/osm_ng_ro/vim_admin.py +++ b/NG-RO/osm_ng_ro/vim_admin.py @@ -380,7 +380,7 @@ class VimAdminThread(threading.Thread): self.logger.info("Starting") while not self.to_terminate: try: - asyncio.run_coroutine_threadsafe(self.main_task(), self.loop) + asyncio.run(self.main_task()) except Exception as e: if not self.to_terminate: self.logger.exception( @@ -458,12 +458,12 @@ class VimAdminThread(threading.Thread): self.lock_renew.to_terminate = True if self.aiomain_task_kafka: - self.aiomain_task_kafka.cancel() + self.loop.call_soon_threadsafe(self.aiomain_task_kafka.cancel()) if self.aiomain_task_vim: - self.aiomain_task_vim.cancel() + self.loop.call_soon_threadsafe(self.aiomain_task_vim.cancel()) if self.aiomain_task_renew_lock: - self.aiomain_task_renew_lock.cancel() + self.loop.call_soon_threadsafe(self.aiomain_task_renew_lock.cancel()) self.lock_renew.stop() diff --git a/releasenotes/notes/fix_vim_adminthread_run_method-7bd0f7c32e932645.yaml b/releasenotes/notes/fix_vim_adminthread_run_method-7bd0f7c32e932645.yaml new file mode 100644 index 00000000..2ce8bdcb --- /dev/null +++ b/releasenotes/notes/fix_vim_adminthread_run_method-7bd0f7c32e932645.yaml @@ -0,0 +1,22 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### +--- +fixes: + - | + The run_coroutine_threadsafe() function is used to schedule a coroutine object from a different thread and returns a concurrent.futures.Future. + run_coroutine_threadsafe is unnecessary to run the main task and replaced with asyncio.run(). + -- 2.25.1