From d33e8ba50bc529ef569e2bd4498194b74483f6ed Mon Sep 17 00:00:00 2001 From: kai ru <69238381+kairu-ms@users.noreply.github.com> Date: Fri, 28 Apr 2023 11:01:33 +0800 Subject: [PATCH 1/4] import LROPoller in main thread to resolve importlib deadlock in python 3.10.10 --- src/azure-cli-core/azure/cli/core/aaz/_poller.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/azure-cli-core/azure/cli/core/aaz/_poller.py b/src/azure-cli-core/azure/cli/core/aaz/_poller.py index ac9b33bf0ca..499358e6f64 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_poller.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_poller.py @@ -12,6 +12,10 @@ from azure.core.polling.base_polling import LROBasePolling from azure.core.tracing.common import with_current_context from azure.core.tracing.decorator import distributed_trace +# import LROPoller in main thread to resolve import deadlock between threads in python 3.10.10 +# reference https://github.com/psf/requests/issues/2925 and https://github.com/Azure/azure-cli/issues/26272 +from msrest.polling.poller import LROPoller # pylint: disable=unused-import + _LOGGER = logging.getLogger(__name__) From 29da6dae4c595777dcbec577014c6716cc060175 Mon Sep 17 00:00:00 2001 From: Kai Ru Date: Mon, 8 May 2023 17:06:51 +0800 Subject: [PATCH 2/4] use 'import requests' --- src/azure-cli-core/azure/cli/core/aaz/_poller.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/aaz/_poller.py b/src/azure-cli-core/azure/cli/core/aaz/_poller.py index 499358e6f64..00ba41bc1c4 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_poller.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_poller.py @@ -14,8 +14,7 @@ from azure.core.tracing.decorator import distributed_trace # import LROPoller in main thread to resolve import deadlock between threads in python 3.10.10 # reference https://github.com/psf/requests/issues/2925 and https://github.com/Azure/azure-cli/issues/26272 -from msrest.polling.poller import LROPoller # pylint: disable=unused-import - +import requests _LOGGER = logging.getLogger(__name__) From 15fdc87c778bfce86957ea90fd8508d79317aaee Mon Sep 17 00:00:00 2001 From: Kai Ru Date: Mon, 8 May 2023 17:07:59 +0800 Subject: [PATCH 3/4] fix style issue --- src/azure-cli-core/azure/cli/core/aaz/_poller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/aaz/_poller.py b/src/azure-cli-core/azure/cli/core/aaz/_poller.py index 00ba41bc1c4..877fafc8046 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_poller.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_poller.py @@ -14,7 +14,7 @@ from azure.core.tracing.decorator import distributed_trace # import LROPoller in main thread to resolve import deadlock between threads in python 3.10.10 # reference https://github.com/psf/requests/issues/2925 and https://github.com/Azure/azure-cli/issues/26272 -import requests +import requests # pylint: disable=unused-import _LOGGER = logging.getLogger(__name__) From 5d37633ece0a0e6acc9f06c1a3fa06791c3c2609 Mon Sep 17 00:00:00 2001 From: Kai Ru Date: Mon, 8 May 2023 17:09:21 +0800 Subject: [PATCH 4/4] update comments --- src/azure-cli-core/azure/cli/core/aaz/_poller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azure-cli-core/azure/cli/core/aaz/_poller.py b/src/azure-cli-core/azure/cli/core/aaz/_poller.py index 877fafc8046..095241e5cce 100644 --- a/src/azure-cli-core/azure/cli/core/aaz/_poller.py +++ b/src/azure-cli-core/azure/cli/core/aaz/_poller.py @@ -12,7 +12,7 @@ from azure.core.polling.base_polling import LROBasePolling from azure.core.tracing.common import with_current_context from azure.core.tracing.decorator import distributed_trace -# import LROPoller in main thread to resolve import deadlock between threads in python 3.10.10 +# import requests in main thread to resolve import deadlock between threads in python # reference https://github.com/psf/requests/issues/2925 and https://github.com/Azure/azure-cli/issues/26272 import requests # pylint: disable=unused-import