From: Eunice Lee <eunl@microsoft.com>
Date: Fri, 1 Oct 2021 22:11:28 +0000 (-0700)
Subject: mgr/volumes/fs: fix flake8 issues
X-Git-Tag: v17.1.0~756^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=add94f1e48913d1170f7ae36f395a08a66ef5554;p=ceph-ci.git

mgr/volumes/fs: fix flake8 issues

Fixes: https://tracker.ceph.com/issues/51381

Signed-off-by: Eunice Lee <eunice337@gmail.com>
---

diff --git a/src/pybind/mgr/volumes/fs/async_job.py b/src/pybind/mgr/volumes/fs/async_job.py
index dca95ff2286..a91764e76fe 100644
--- a/src/pybind/mgr/volumes/fs/async_job.py
+++ b/src/pybind/mgr/volumes/fs/async_job.py
@@ -10,6 +10,7 @@ from .exception import NotImplementedException
 
 log = logging.getLogger(__name__)
 
+
 class JobThread(threading.Thread):
     # this is "not" configurable and there is no need for it to be
     # configurable. if a thread encounters an exception, we retry
@@ -55,7 +56,7 @@ class JobThread(threading.Thread):
                 # unless the jobs fetching and execution routines are not implemented
                 # retry till we hit cap limit.
                 retries += 1
-                log.warning("thread [{0}] encountered fatal error: (attempt#" \
+                log.warning("thread [{0}] encountered fatal error: (attempt#"
                             " {1}/{2})".format(thread_name, retries, JobThread.MAX_RETRIES_ON_EXCEPTION))
                 exc_type, exc_value, exc_traceback = sys.exc_info()
                 log.warning("traceback: {0}".format("".join(
@@ -84,6 +85,7 @@ class JobThread(threading.Thread):
     def reset_cancel(self):
         self.cancel_event.clear()
 
+
 class AsyncJobs(threading.Thread):
     """
     Class providing asynchronous execution of jobs via worker threads.
@@ -107,7 +109,7 @@ class AsyncJobs(threading.Thread):
         threading.Thread.__init__(self, name="{0}.tick".format(name_pfx))
         self.vc = volume_client
         # queue of volumes for starting async jobs
-        self.q = deque() # type: deque
+        self.q = deque()  # type: deque
         # volume => job tracking
         self.jobs = {}
         # lock, cv for kickstarting jobs
@@ -215,7 +217,7 @@ class AsyncJobs(threading.Thread):
         """
         log.info("queuing job for volume '{0}'".format(volname))
         with lock_timeout_log(self.lock):
-            if not volname in self.q:
+            if volname not in self.q:
                 self.q.append(volname)
                 self.jobs[volname] = []
             self.cv.notifyAll()
@@ -228,7 +230,7 @@ class AsyncJobs(threading.Thread):
         """
         log.info("cancelling jobs for volume '{0}'".format(volname))
         try:
-            if not volname in self.q and not volname in self.jobs:
+            if volname not in self.q and volname not in self.jobs:
                 return
             self.q.remove(volname)
             # cancel in-progress operation and wait until complete
@@ -236,7 +238,7 @@ class AsyncJobs(threading.Thread):
                 j[1].cancel_job()
             # wait for cancellation to complete
             while self.jobs[volname]:
-                log.debug("waiting for {0} in-progress jobs for volume '{1}' to " \
+                log.debug("waiting for {0} in-progress jobs for volume '{1}' to "
                           "cancel".format(len(self.jobs[volname]), volname))
                 self.cancel_cv.wait()
             self.jobs.pop(volname)
@@ -252,7 +254,7 @@ class AsyncJobs(threading.Thread):
         log.info("canceling job {0} for volume {1}".format(job, volname))
         try:
             vol_jobs = [j[0] for j in self.jobs.get(volname, [])]
-            if not volname in self.q and not job in vol_jobs:
+            if volname not in self.q and job not in vol_jobs:
                 return canceled
             for j in self.jobs[volname]:
                 if j[0] == job:
@@ -299,4 +301,3 @@ class AsyncJobs(threading.Thread):
         hours and do all kinds of synchronous work. called outside `self.lock`.
         """
         raise NotImplementedException()
-