From 4e53676b2a4f8e97b8c2412436813d890b67672f Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 26 Apr 2021 19:00:58 +0200 Subject: [PATCH] Fix pylint errors New pylint release catches 'consider-using-with' errors on some class members. This new checker looks interesting for future errors but it is not justified for the detected issues. Change-Id: Iacf485f8d7ac61e79c3bc9073b40d0813c006745 --- octavia/amphorae/backends/utils/network_namespace.py | 1 + octavia/amphorae/drivers/health/heartbeat_udp.py | 2 ++ octavia/common/base_taskflow.py | 1 + octavia/controller/healthmanager/health_manager.py | 1 + 4 files changed, 5 insertions(+) diff --git a/octavia/amphorae/backends/utils/network_namespace.py b/octavia/amphorae/backends/utils/network_namespace.py index 91f048c74e..cdead01a7a 100644 --- a/octavia/amphorae/backends/utils/network_namespace.py +++ b/octavia/amphorae/backends/utils/network_namespace.py @@ -40,6 +40,7 @@ class NetworkNamespace(object): def __enter__(self): # Save the current network namespace + # pylint: disable=consider-using-with self.current_netns_fd = open(self.current_netns) with open(self.target_netns) as fd: self.set_netns(fd.fileno(), self.CLONE_NEWNET) diff --git a/octavia/amphorae/drivers/health/heartbeat_udp.py b/octavia/amphorae/drivers/health/heartbeat_udp.py index 4ca3051990..40e5b6adb8 100644 --- a/octavia/amphorae/drivers/health/heartbeat_udp.py +++ b/octavia/amphorae/drivers/health/heartbeat_udp.py @@ -53,8 +53,10 @@ class UDPStatusGetter(object): self.sock = None self.update(self.key, self.ip, self.port) + # pylint: disable=consider-using-with self.health_executor = futures.ProcessPoolExecutor( max_workers=CONF.health_manager.health_update_threads) + # pylint: disable=consider-using-with self.stats_executor = futures.ProcessPoolExecutor( max_workers=CONF.health_manager.stats_update_threads) self.health_updater = UpdateHealthDb() diff --git a/octavia/common/base_taskflow.py b/octavia/common/base_taskflow.py index b519ae2c7c..711adb9190 100644 --- a/octavia/common/base_taskflow.py +++ b/octavia/common/base_taskflow.py @@ -57,6 +57,7 @@ class BaseTaskFlowEngine(object): def __init__(self): # work around for https://bugs.python.org/issue7980 datetime.datetime.strptime('2014-06-19 22:47:16', '%Y-%m-%d %H:%M:%S') + # pylint: disable=consider-using-with self.executor = concurrent.futures.ThreadPoolExecutor( max_workers=CONF.task_flow.max_workers) diff --git a/octavia/controller/healthmanager/health_manager.py b/octavia/controller/healthmanager/health_manager.py index 1770e02038..4c50f7b232 100644 --- a/octavia/controller/healthmanager/health_manager.py +++ b/octavia/controller/healthmanager/health_manager.py @@ -63,6 +63,7 @@ class HealthManager(object): else: self.cw = cw1.ControllerWorker() self.threads = CONF.health_manager.failover_threads + # pylint: disable=consider-using-with self.executor = futures.ThreadPoolExecutor(max_workers=self.threads) self.amp_repo = repo.AmphoraRepository() self.amp_health_repo = repo.AmphoraHealthRepository()